Merge pull request #539 from xdjinnx/fix-di-unused-not-working-with-function-names

Add scope type check to fix problem with function names for di-unused.

Author: EmmanuelDemey

rules/di-unused.js

@@ -23,7 +23,7 @@ module.exports = {
  // Keeps track of visited scopes in the collectAngularScopes function to prevent infinite recursion on circular references.
  var visitedScopes = [];
 
- // This collects the variable scopes for the injectible functions which have been collected.
+ // This collects the variable scopes for the injectable functions which have been collected.
  function collectAngularScopes(scope) {
  if (visitedScopes.indexOf(scope) === -1) {
  visitedScopes.push(scope);
@@ -41,6 +41,11 @@ module.exports = {
  if (scope.block !== fn) {
  return;
  }
+
+ if (scope.type === 'function-expression-name') {
+ return;
+ }
+
  scope.variables.forEach(function(variable) {
  if (variable.name === 'arguments') {
  return;
@@ -71,7 +76,6 @@ module.exports = {
  reportUnusedVariables(null, $get);
  },
 
- // Actually find and report unused injected variables.
  'Program:exit': function() {
  var globalScope = context.getScope();
  collectAngularScopes(globalScope);

test/di-unused.js

@@ -16,26 +16,36 @@ var eslintTester = new RuleTester();
 eslintTester.run('di-unused', rule, {
  valid: [
  'angular.module("").controller("", function($q) {return $q;});',
+ 'angular.module("").controller("", function controller($q) {return $q;});',
  'angular.module("").controller("", ["$q", function($q) {return $q;}]);',
  'angular.module("").animation("", function($q) {return $q;});',
+ 'angular.module("").animation("", function animation($q) {return $q;});',
  'angular.module("").animation("", ["$q", function($q) {return $q;}]);',
  'angular.module("").directive("", function($q) {return $q;});',
+ 'angular.module("").directive("", function directive($q) {return $q;});',
  'angular.module("").directive("", ["$q", function($q) {return $q;}]);',
  'angular.module("").factory("", function($q) {return $q;});',
+ 'angular.module("").factory("", function factory($q) {return $q;});',
  'angular.module("").factory("", ["$q", function($q) {return $q;}]);',
  'angular.module("").factory("", function($q) {return function() {return $q;};});',
  'angular.module("").factory("", function() {var myVar;});',
  'angular.module("").filter("", function($q) {return $q;});',
+ 'angular.module("").filter("", function filter($q) {return $q;});',
  'angular.module("").filter("", ["$q", function($q) {return $q;}]);',
  'angular.module("").provider("", function($httpProvider) {return $httpProvider;});',
+ 'angular.module("").provider("", function provider($httpProvider) {return $httpProvider;});',
  'angular.module("").provider("", ["$$httpProvider", function($$httpProvider) {return $$httpProvider;}]);',
  'angular.module("").service("", function($q) {return $q;});',
+ 'angular.module("").service("", function service($q) {return $q;});',
  'angular.module("").service("", ["$q", function($q) {return $q;}]);',
  'angular.module("").config(function($httpProvider) {$httpProvider.defaults.headers.post.answer="42"})',
+ 'angular.module("").config(function config($httpProvider) {$httpProvider.defaults.headers.post.answer="42"})',
  'angular.module("").config(["$httpProvider", function($httpProvider) {$httpProvider.defaults.headers.post.answer="42"}]);',
  'angular.module("").run(function($q) {$q()})',
+ 'angular.module("").run(function run($q) {$q()})',
  'angular.module("").run(["$q", function($q) {return $q;}]);',
  'inject(function($q) {_$q_ = $q;});',
+ 'inject(function inject($q) {_$q_ = $q;});',
  'angular.module("").provider("", function() {this.$get = function($q) {return $q};});',
  'angular.module("").provider("", function() {this.$get = ["$q", function($q) {return $q}];});',
  // Potential crashes
@@ -54,6 +64,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").animation("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").animation("", function animation($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").animation("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -68,6 +81,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").controller("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").controller("", function controller($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").controller("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -92,6 +108,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").directive("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").directive("", function directive($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").directive("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -107,6 +126,10 @@ eslintTester.run('di-unused', rule, {
  code: 'angular.module("").factory("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
  },
+ {
+ code: 'angular.module("").factory("", function factory($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
+ },
  {
  code: 'angular.module("").factory("", $q => {});',
  errors: [{message: 'Unused injected value $q'}],
@@ -145,6 +168,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").filter("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").filter("", function filter($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").filter("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -159,6 +185,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").provider("", function($httpProvider) {});',
  errors: [{message: 'Unused injected value $httpProvider'}]
+ }, {
+ code: 'angular.module("").provider("", function provider($httpProvider) {});',
+ errors: [{message: 'Unused injected value $httpProvider'}]
  }, {
  code: 'angular.module("").provider("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -173,6 +202,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").service("", function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").service("", function service($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").service("", ["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -187,6 +219,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").config(function($httpProvider) {})',
  errors: [{message: 'Unused injected value $httpProvider'}]
+ }, {
+ code: 'angular.module("").config(function config($httpProvider) {})',
+ errors: [{message: 'Unused injected value $httpProvider'}]
  }, {
  code: 'angular.module("").config(["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -201,6 +236,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'angular.module("").run(function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'angular.module("").run(function run($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'angular.module("").run(["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]
@@ -215,6 +253,9 @@ eslintTester.run('di-unused', rule, {
  {
  code: 'inject(function($q) {});',
  errors: [{message: 'Unused injected value $q'}]
+ }, {
+ code: 'inject(function inject($q) {});',
+ errors: [{message: 'Unused injected value $q'}]
  }, {
  code: 'inject(["q", function($q) {}]);',
  errors: [{message: 'Unused injected value $q'}]