Skip to content

Commit 2186ca7

Browse files
committed
JS: address non-semantic review feedback
1 parent 27e5fce commit 2186ca7

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

javascript/ql/src/experimental/poi/PoI.qll

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
* override predicate shown(DataFlow::Node n) { n.getFile().getBaseName() = "server-core.js" }
3737
* }
3838
*
39-
* class RouteHandlerPoI extends DefaultEnabledPoI {
39+
* class RouteHandlerPoI extends ActivePoI {
4040
* RouteHandlerPoI() { this = "RouteHandlerPoI" }
4141
* override predicate is(DataFlow::Node l0) { l0 instanceof Express::RouteHandler }
4242
* }
4343
*
44-
* class RouteSetupAndRouteHandlerPoI extends DefaultEnabledPoI {
44+
* class RouteSetupAndRouteHandlerPoI extends ActivePoI {
4545
* RouteSetupAndRouteHandlerPoI() { this = "RouteSetupAndRouteHandlerPoI" }
4646
*
4747
* override predicate is(DataFlow::Node l0, DataFlow::Node l1, string t1) {
@@ -62,11 +62,11 @@ private import semmle.javascript.RestrictedLocations
6262
* Provides often used points of interest.
6363
*
6464
* Note that these points of interest should not extend
65-
* `DefaultEnabledPoI`, and that they can be enabled by default on
65+
* `ActivePoI`, and that they can be enabled on
6666
* demand like this:
6767
*
6868
* ```
69-
* class MyPoI extends ServerRelatedPoI, DefaultEnabledPoI {}
69+
* class MyPoI extends ServerRelatedPoI, ActivePoI {}
7070
* ```
7171
*/
7272
private module StandardPoIs {
@@ -172,11 +172,11 @@ private module StandardPoIs {
172172
}
173173

174174
/**
175-
* Provides groups of often used point of interest.
175+
* Provides groups of often used points of interest.
176176
*/
177177
module StandardPoIGroups {
178178
/**
179-
* A server-related points of interest.
179+
* A server-related point of interest.
180180
*/
181181
class ServerRelatedPoI extends PoI {
182182
ServerRelatedPoI() {
@@ -187,7 +187,7 @@ private module StandardPoIs {
187187
}
188188

189189
/**
190-
* A configuration-related points of interest.
190+
* A configuration-related point of interest.
191191
*/
192192
class DataFlowConfigurationPoI extends PoI {
193193
DataFlowConfigurationPoI() {
@@ -207,13 +207,13 @@ import StandardPoIs
207207
* enabled in the absence of an explicit
208208
* `PoIConfiguration::enabled/1`.
209209
*/
210-
abstract class DefaultEnabledPoI extends PoI {
210+
abstract class ActivePoI extends PoI {
211211
bindingset[this]
212-
DefaultEnabledPoI() { any() }
212+
ActivePoI() { any() }
213213
}
214214

215215
private module PoIConfigDefaults {
216-
predicate enabled(PoI poi) { poi instanceof DefaultEnabledPoI }
216+
predicate enabled(PoI poi) { poi instanceof ActivePoI }
217217

218218
predicate shown(Node n) { not classify(n.getFile(), _) }
219219
}

javascript/ql/test/experimental/PoI/ServerPoIs.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
import javascript
66
import experimental.poi.PoI
77

8-
class MyServerRelatedPoI extends ServerRelatedPoI, DefaultEnabledPoI {}
8+
class MyServerRelatedPoI extends ServerRelatedPoI, ActivePoI {}
99

1010
query predicate problems = alertQuery/6;

javascript/ql/test/experimental/PoI/TestCustomPoIs.ql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import javascript
66
import experimental.poi.PoI
77
import DataFlow
88

9-
class RouteHandlerPoI extends DefaultEnabledPoI {
9+
class RouteHandlerPoI extends ActivePoI {
1010
RouteHandlerPoI() { this = "RouteHandlerPoI" }
1111

1212
override predicate is(Node l0) { l0 instanceof Express::RouteHandler }
1313
}
1414

15-
class RouteHandlerAndSetupPoI extends DefaultEnabledPoI {
15+
class RouteHandlerAndSetupPoI extends ActivePoI {
1616
RouteHandlerAndSetupPoI() { this = "RouteHandlerAndSetupPoI" }
1717

1818
override predicate is(Node l0, Node l1, string t1) {
1919
l1.asExpr().(Express::RouteSetup).getARouteHandler() = l0 and t1 = "setup"
2020
}
2121
}
2222

23-
class RouteSetupAndRouterAndRouteHandlerPoI extends DefaultEnabledPoI {
23+
class RouteSetupAndRouterAndRouteHandlerPoI extends ActivePoI {
2424
RouteSetupAndRouterAndRouteHandlerPoI() { this = "RouteSetupAndRouterAndRouteHandlerPoI" }
2525

2626
override predicate is(Node l0, Node l1, string t1, Node l2, string t2) {
@@ -31,4 +31,4 @@ class RouteSetupAndRouterAndRouteHandlerPoI extends DefaultEnabledPoI {
3131
}
3232
}
3333

34-
query predicate problems = alertQuery/6;
34+
query predicate problems = alertQuery/6;

0 commit comments

Comments
 (0)