JS: support require in isReactImportForJSX

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 54e2215db46c · 2018-11-28T13:16:55.000+01:00
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -71,6 +71,10 @@ predicate isReactImportForJSX(UnusedLocal v) {
     )
     |
     v.getADeclaration() = any(ImportDeclaration imp).getASpecifier().getLocal()
+    or
+    exists(VariableDeclarator vd | vd.getBindingPattern() = v.getADeclaration() |
+      vd.getInit() instanceof Require
+    )
   )
 }
 
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected b/javascript/ql/test/query-tests/Declarations/UnusedVariable/UnusedVariable.expected
@@ -7,6 +7,7 @@
 | importWithoutPragma.jsx:1:1:1:27 | import  ... react'; | Unused import h. |
 | multi-imports.js:1:1:1:29 | import  ... om 'x'; | Unused imports a, b, d. |
 | multi-imports.js:2:1:2:42 | import  ... om 'x'; | Unused imports alphabetically, ordered. |
+| require-react-3.js:1:7:1:11 | React | Unused variable React. |
 | typeoftype.ts:9:7:9:7 | y | Unused variable y. |
 | unusedShadowed.ts:1:1:1:26 | import  ... where'; | Unused import T. |
 | unusedShadowed.ts:2:1:2:31 | import  ... where'; | Unused import object. |
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-1.js
@@ -0,0 +1,2 @@
+var React = require("probably-react"); // OK
+(<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-2.js
@@ -0,0 +1,2 @@
+var { React } = { React: require("probably-react") }; // OK
+(<e/>);
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js b/javascript/ql/test/query-tests/Declarations/UnusedVariable/require-react-3.js
@@ -0,0 +1,2 @@
+var { React } = require("probably-react"); // OK, but not yet supported
+(<e/>);

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ predicate isReactImportForJSX(UnusedLocal v) {`
`71`	`71`	`)`
`72`	`72`	`\|`
`73`	`73`	`v.getADeclaration() = any(ImportDeclaration imp).getASpecifier().getLocal()`
	`74`	`+ or`
	`75`	`+ exists(VariableDeclarator vd \| vd.getBindingPattern() = v.getADeclaration() \|`
	`76`	`+ vd.getInit() instanceof Require`
	`77`	`+ )`
`74`	`78`	`)`
`75`	`79`	`}`
`76`	`80`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var React = require("probably-react"); // OK`
	`2`	`+(<e/>);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var { React } = { React: require("probably-react") }; // OK`
	`2`	`+(<e/>);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var { React } = require("probably-react"); // OK, but not yet supported`
	`2`	`+(<e/>);`