Skip to content

Commit fac638f

Browse files
author
Esben Sparre Andreasen
committed
JS: improve alert location of js/angular/unused-dependency
1 parent b5bbf99 commit fac638f

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

javascript/ql/src/AngularJS/UnusedAngularDependency.ql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import javascript
1313
import Declarations.UnusedParameter
14+
import semmle.javascript.RestrictedLocations
1415

1516
predicate isUnusedParameter(Function f, string msg, Parameter parameter) {
1617
exists(Variable pv |
@@ -36,4 +37,4 @@ predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNod
3637

3738
from AngularJS::InjectableFunction f, string message, ASTNode location
3839
where isUnusedParameter(f.asFunction(), message, location) or isMissingParameter(f, message, location)
39-
select location, message
40+
select (FirstLineOf)location, message

javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/UnusedAngularDependency.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
| unused-angular-dependency.js:14:14:14:39 | ["unuse ... n() {}] | This function has 0 parameters, but 1 dependency is injected into it. |
33
| unused-angular-dependency.js:16:14:16:53 | ["used2 ... d2) {}] | This function has 1 parameter, but 2 dependencies are injected into it. |
44
| unused-angular-dependency.js:17:14:17:52 | ["unuse ... n() {}] | This function has 0 parameters, but 2 dependencies are injected into it. |
5+
| unused-angular-dependency.js:18:14:18:105 | ["used2 ... }] | This function has 1 parameter, but 2 dependencies are injected into it. |

javascript/ql/test/query-tests/AngularJS/UnusedAngularDependency/unused-angular-dependency.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
.run(f2)
1616
.run(["used2", "unused9", function(used2) {}]) // NOT OK
1717
.run(["unused10", "unused11", function() {}]) // NOT OK
18+
.run(["used2", "unused12", function(used2) { // NOT OK (alert formatting for multi-line function)
19+
}])
1820
;
1921
})();
2022
angular.module('app2')

0 commit comments

Comments
 (0)