Merge pull request #4419 from erik-krogh/jsxFactory

codeql-ci · web-flow · commit 4e116ba0dbc5 · 2020-10-06T06:13:21.000-07:00
Approved by asgerf
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -58,6 +58,16 @@ predicate isReactForJSX(UnusedLocal v) {
         plugin.getJsxFactoryVariableName() = v.getName()
       )
     )
+    or
+    exists(JSONObject tsconfig |
+      tsconfig.isTopLevel() and tsconfig.getFile().getBaseName() = "tsconfig.json"
+    |
+      v.getName() =
+        tsconfig
+            .getPropValue("compilerOptions")
+            .(JSONObject)
+            .getPropStringValue(["jsxFactory", "jsxFragmentFactory"])
+    )
   )
 }
 
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/ts/tsconfig.json b/javascript/ql/test/query-tests/Declarations/UnusedVariable/ts/tsconfig.json
@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+        "jsx": "react",
+        "jsxFactory": "m"
+    }
+}
diff --git a/javascript/ql/test/query-tests/Declarations/UnusedVariable/ts/usesreact.tsx b/javascript/ql/test/query-tests/Declarations/UnusedVariable/ts/usesreact.tsx
@@ -0,0 +1,5 @@
+import {m} from 'some-react-library';
+
+export default function doAThing() {
+    return <span>foo</span>;
+}

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,16 @@ predicate isReactForJSX(UnusedLocal v) {`
`58`	`58`	`plugin.getJsxFactoryVariableName() = v.getName()`
`59`	`59`	`)`
`60`	`60`	`)`
	`61`	`+ or`
	`62`	`+ exists(JSONObject tsconfig \|`
	`63`	`+ tsconfig.isTopLevel() and tsconfig.getFile().getBaseName() = "tsconfig.json"`
	`64`	`+ \|`
	`65`	`+ v.getName() =`
	`66`	`+ tsconfig`
	`67`	`+ .getPropValue("compilerOptions")`
	`68`	`+ .(JSONObject)`
	`69`	`+ .getPropStringValue(["jsxFactory", "jsxFragmentFactory"])`
	`70`	`+ )`
`61`	`71`	`)`
`62`	`72`	`}`
`63`	`73`