Merge master

Author: EmmanuelDemey

README.md

@@ -81,8 +81,7 @@ We provide also three samples :
 | 'ng_deferred':0                                              | When you want to create a new promise, you should not use the $q.deferred anymore. Prefer the new syntax : $q(function(resolve, reject){})
 | 'ng_definedundefined': 2                                     | You should use the angular.isUndefined or angular.isDefined methods instead of using the keyword undefined. We also check the use of !angular.isUndefined and !angular.isDefined (should prefer the reverse function)|
 | 'ng_di': [2, 'function']                                     | All your DI should use the same syntax : the Array or function syntaxes ("ng_di":  [2, "function or array"])|
-| 'ng_di_order': 0                                             | Injected dependencies should be sorted alphabetically. |
-| 'ng_di_unused': 0                                            | Unused dependencies should not be injected. |
+| 'ng_di_order': [0, true]                                     | Injected dependencies should be sorted alphabetically. If the second parameter is set to false, values which start and end with an underscore those underscores are stripped. This means for example that `_$httpBackend_` goes before `_$http_`. |
 | 'ng_directive_name': 0                                       | All your directives should have a name starting with the parameter you can define in your config object. The second parameter can be a Regexp wrapped in quotes. You can not prefix your directives by "ng" (reserved keyword for AngularJS directives) ("ng_directive_name":  [2, "ng"]) [Y073](https://github.com/johnpapa/angular-styleguide#style-y073), [Y126](https://github.com/johnpapa/angular-styleguide#style-y126) |
 | 'ng_document_service': 2                                     | Instead of the default document object, you should prefer the AngularJS wrapper service $document. [Y180](https://github.com/johnpapa/angular-styleguide#style-y180) |
 | 'ng_empty_controller': 0                                     | If you have one empty controller, maybe you have linked it in your Router configuration or in one of your views. You can remove this declaration because this controller is useless |

rules/ng_di_order.js

@@ -18,7 +18,13 @@ module.exports = function(context) {
     ];
 
     function checkOrder(fn) {
+        if(!fn || !fn.params) {
+            return;
+        }
         var args = fn.params.map(function(arg) {
+            if(context.options[0] !== false) {
+                return arg.name.replace(/^_(.+)_$/, '$1')
+            }
             return arg.name;
         });
         var sortedArgs = args.slice().sort();

test/ng_di_order.js

@@ -24,6 +24,12 @@ eslintTester.run('ng_di_order', rule, {
         'inject(function($http, $q){});',
         'it(inject(function($http, $q){}));',
         'this.$get = function($http, $q){};',
+        'this.$get = get;',
+        'it(inject(function(_$http_, _$httpBackend_){}));',
+        {
+            code: 'it(inject(function(_$httpBackend_, _$http_){}));',
+            options: [false],
+        }
     ],
     invalid: [{
         code: 'app.controller("", function($q, $http){});',
@@ -55,6 +61,13 @@ eslintTester.run('ng_di_order', rule, {
     }, {
         code: 'it(inject(function($q, $http){}));',
         errors: [{message: 'Injected values should be sorted alphabetically'}]
+    }, {
+        code: 'it(inject(function(_$http_, _$httpBackend_){}));',
+        options: [false],
+        errors: [{message: 'Injected values should be sorted alphabetically'}]
+    }, {
+        code: 'it(inject(function(_$httpBackend_, _$http_){}));',
+        errors: [{message: 'Injected values should be sorted alphabetically'}]
     }, {
         code: 'this.$get = function($q, $http){};',
         errors: [{message: 'Injected values should be sorted alphabetically'}]