JS: address review comments

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 01ad9ed8bc17 · 2018-11-21T09:19:20.000+01:00
diff --git a/javascript/ql/src/Declarations/MissingThisQualifier.ql b/javascript/ql/src/Declarations/MissingThisQualifier.ql
@@ -56,6 +56,7 @@ where maybeMissingThis(call, intendedTarget, gv)
           intendedTarget.getBody() = self and
           call.getEnclosingFunction() = self and
           call.flow().(DataFlow::CallNode).getNumArgument() > self.getNumParameter() and
+          not self.hasRestParameter() and
           not self.usesArgumentsObject()
         )
       )
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/MissingThisQualifier.expected
@@ -1,4 +1,5 @@
 | abstract-missing.ts:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | abstract-missing.ts:6:3:6:32 | abstrac ... ties(); | setAudioProperties |
+| indirection.js:7:9:7:20 | m("default") | This call refers to a global function, and not the local method $@. | indirection.js:2:5:4:5 | m() {\\n  ... K\\n    } | m |
 | missing1.js:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | missing1.js:6:3:7:3 | setAudi ... (){\\n  } | setAudioProperties |
 | missing2.js:3:5:3:24 | setAudioProperties() | This call refers to a global function, and not the local method $@. | missing2.js:7:3:8:3 | static  ... (){\\n  } | setAudioProperties |
 | namespaces-uses.ts:3:5:3:20 | globalFunction() | This call refers to a global function, and not the local method $@. | namespaces-uses.ts:2:3:4:3 | globalF ...  OK\\n  } | globalFunction |
diff --git a/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js b/javascript/ql/test/query-tests/Declarations/MissingThisQualifier/indirection.js
@@ -2,4 +2,8 @@ class X {
     m() {
         m("default"); // OK
     }
+
+    resty(...x) {
+        m("default"); // NOT OK
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ where maybeMissingThis(call, intendedTarget, gv)`
`56`	`56`	`intendedTarget.getBody() = self and`
`57`	`57`	`call.getEnclosingFunction() = self and`
`58`	`58`	`call.flow().(DataFlow::CallNode).getNumArgument() > self.getNumParameter() and`
	`59`	`+ not self.hasRestParameter() and`
`59`	`60`	`not self.usesArgumentsObject()`
`60`	`61`	`)`
`61`	`62`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`\| abstract-missing.ts:3:5:3:24 \| setAudioProperties() \| This call refers to a global function, and not the local method $@. \| abstract-missing.ts:6:3:6:32 \| abstrac ... ties(); \| setAudioProperties \|`
	`2`	`+\| indirection.js:7:9:7:20 \| m("default") \| This call refers to a global function, and not the local method $@. \| indirection.js:2:5:4:5 \| m() {\\n ... K\\n } \| m \|`
`2`	`3`	`\| missing1.js:3:5:3:24 \| setAudioProperties() \| This call refers to a global function, and not the local method $@. \| missing1.js:6:3:7:3 \| setAudi ... (){\\n } \| setAudioProperties \|`
`3`	`4`	`\| missing2.js:3:5:3:24 \| setAudioProperties() \| This call refers to a global function, and not the local method $@. \| missing2.js:7:3:8:3 \| static ... (){\\n } \| setAudioProperties \|`
`4`	`5`	`\| namespaces-uses.ts:3:5:3:20 \| globalFunction() \| This call refers to a global function, and not the local method $@. \| namespaces-uses.ts:2:3:4:3 \| globalF ... OK\\n } \| globalFunction \|`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,8 @@ class X {`
`2`	`2`	`m() {`
`3`	`3`	`m("default"); // OK`
`4`	`4`	`}`
	`5`	`+`
	`6`	`+ resty(...x) {`
	`7`	`+ m("default"); // NOT OK`
	`8`	`+ }`
`5`	`9`	`}`