update tests and queries that used getId()

erik-krogh · erik-krogh · commit f1dc36244c47 · 2020-08-05T14:32:09.000Z
diff --git a/javascript/ql/src/Declarations/ConflictingFunctions.ql b/javascript/ql/src/Declarations/ConflictingFunctions.ql
@@ -24,5 +24,6 @@ where
   // ignore ambient, abstract, and overloaded declarations in TypeScript
   f.hasBody() and
   g.hasBody()
-select f.getId(), "Declaration of " + f.describe() + " conflicts with $@ in the same scope.",
-  g.getId(), "another declaration"
+select f.getIdentifier(),
+  "Declaration of " + f.describe() + " conflicts with $@ in the same scope.", g.getIdentifier(),
+  "another declaration"
diff --git a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
@@ -42,11 +42,11 @@ where
     access.isAmbient()
   ) and
   // don't flag function expressions
-  not exists(FunctionExpr fe | dead = fe.getId()) and
+  not exists(FunctionExpr fe | dead = fe.getIdentifier()) and
   // don't flag function declarations nested inside blocks or other compound statements;
   // their meaning is only partially specified by the standard
   not exists(FunctionDeclStmt fd, StmtContainer outer |
-    dead = fd.getId() and outer = fd.getEnclosingContainer()
+    dead = fd.getIdentifier() and outer = fd.getEnclosingContainer()
   |
     not fd = outer.getBody().(BlockStmt).getAStmt()
   ) and
diff --git a/javascript/ql/src/Declarations/RedeclaredVariable.ql b/javascript/ql/src/Declarations/RedeclaredVariable.ql
@@ -22,6 +22,6 @@ where
   not decl.isAmbient() and
   not redecl.isAmbient() and
   // Redeclaring a namespace extends the previous definition.
-  not decl = any(NamespaceDeclaration ns).getId() and
-  not redecl = any(NamespaceDeclaration ns).getId()
+  not decl = any(NamespaceDeclaration ns).getIdentifier() and
+  not redecl = any(NamespaceDeclaration ns).getIdentifier()
 select redecl, "This variable has already been declared $@.", decl, "here"
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -93,7 +93,7 @@ predicate isEnumMember(VarDecl decl) { decl = any(EnumMember member).getIdentifi
  * "function f", "variable v" or "class c".
  */
 string describeVarDecl(VarDecl vd) {
-  if vd = any(Function f).getId()
+  if vd = any(Function f).getIdentifier()
   then result = "function " + vd.getName()
   else
     if vd = any(ClassDefinition c).getIdentifier()
@@ -115,7 +115,7 @@ class ImportVarDeclProvider extends Stmt {
    */
   VarDecl getAVarDecl() {
     result = this.(ImportDeclaration).getASpecifier().getLocal() or
-    result = this.(ImportEqualsDeclaration).getId()
+    result = this.(ImportEqualsDeclaration).getIdentifier()
   }
 
   /**
diff --git a/javascript/ql/src/Expressions/SuspiciousPropAccess.ql b/javascript/ql/src/Expressions/SuspiciousPropAccess.ql
@@ -23,7 +23,7 @@ private import semmle.javascript.dataflow.InferredTypes
  * if it is part of a const enum access, so we conservatively silence the alert in that case.
  */
 predicate namespaceOrConstEnumAccess(VarAccess e) {
-  exists(NamespaceDeclaration decl | e.getVariable().getADeclaration() = decl.getId())
+  exists(NamespaceDeclaration decl | e.getVariable().getADeclaration() = decl.getIdentifier())
   or
   exists(EnumDeclaration decl | e.getVariable().getADeclaration() = decl.getIdentifier() |
     decl.isConst()
diff --git a/javascript/ql/src/semmle/javascript/DefUse.qll b/javascript/ql/src/semmle/javascript/DefUse.qll
@@ -38,7 +38,9 @@ private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {
   or
   exists(EnumDeclaration ed | def = ed.getIdentifier() | lhs = def and rhs = ed)
   or
-  exists(ImportEqualsDeclaration i | def = i | lhs = i.getIdentifier() and rhs = i.getImportedEntity())
+  exists(ImportEqualsDeclaration i | def = i |
+    lhs = i.getIdentifier() and rhs = i.getImportedEntity()
+  )
   or
   exists(ImportSpecifier i | def = i | lhs = i.getLocal() and rhs = i)
   or
diff --git a/javascript/ql/src/semmle/javascript/Variables.qll b/javascript/ql/src/semmle/javascript/Variables.qll
@@ -313,7 +313,10 @@ class LocalVariable extends Variable {
     or
     exists(VarDecl d | d = getADeclaration() |
       if d = any(FunctionDeclStmt fds).getIdentifier()
-      then exists(FunctionDeclStmt fds | d = fds.getIdentifier() | result = fds.getEnclosingContainer())
+      then
+        exists(FunctionDeclStmt fds | d = fds.getIdentifier() |
+          result = fds.getEnclosingContainer()
+        )
       else result = d.getContainer()
     )
   }
diff --git a/javascript/ql/test/library-tests/Functions/getId.qll b/javascript/ql/test/library-tests/Functions/getId.qll
@@ -1,5 +1,5 @@
 import javascript
 
 query predicate test_getId(Function f, VarDecl res0, string res1) {
-  res0 = f.getId() and res1 = f.getName()
+  res0 = f.getIdentifier() and res1 = f.getName()
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/Namespaces/CheckBindings.ql b/javascript/ql/test/library-tests/TypeScript/Namespaces/CheckBindings.ql
@@ -10,7 +10,7 @@ class ResolveCall extends CallExpr {
   string getDeclaredValue() {
     result = getVariable().getAnAssignedExpr().getStringValue()
     or
-    exists(NamespaceDeclaration decl | decl.getId() = getVariable().getADeclaration() |
+    exists(NamespaceDeclaration decl | decl.getIdentifier() = getVariable().getADeclaration() |
       result = getNamespaceName(decl)
     )
   }
@@ -21,7 +21,8 @@ string getNamespaceName(NamespaceDeclaration decl) {
   or
   not decl.getStmt(0).(ExprStmt).getExpr() instanceof ConstantString and
   result =
-    "Namespace " + decl.getId() + " on line " + decl.getFirstToken().getLocation().getStartLine()
+    "Namespace " + decl.getIdentifier() + " on line " +
+      decl.getFirstToken().getLocation().getStartLine()
 }
 
 from ResolveCall resolve

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,10 @@ class LocalVariable extends Variable {`
`313`	`313`	`or`
`314`	`314`	`exists(VarDecl d \| d = getADeclaration() \|`
`315`	`315`	`if d = any(FunctionDeclStmt fds).getIdentifier()`
`316`		`- then exists(FunctionDeclStmt fds \| d = fds.getIdentifier() \| result = fds.getEnclosingContainer())`
	`316`	`+ then`
	`317`	`+ exists(FunctionDeclStmt fds \| d = fds.getIdentifier() \|`
	`318`	`+ result = fds.getEnclosingContainer()`
	`319`	`+ )`
`317`	`320`	`else result = d.getContainer()`
`318`	`321`	`)`
`319`	`322`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import javascript`
`2`	`2`
`3`	`3`	`query predicate test_getId(Function f, VarDecl res0, string res1) {`
`4`		`- res0 = f.getId() and res1 = f.getName()`
	`4`	`+ res0 = f.getIdentifier() and res1 = f.getName()`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class ResolveCall extends CallExpr {`
`10`	`10`	`string getDeclaredValue() {`
`11`	`11`	`result = getVariable().getAnAssignedExpr().getStringValue()`
`12`	`12`	`or`
`13`		`- exists(NamespaceDeclaration decl \| decl.getId() = getVariable().getADeclaration() \|`
	`13`	`+ exists(NamespaceDeclaration decl \| decl.getIdentifier() = getVariable().getADeclaration() \|`
`14`	`14`	`result = getNamespaceName(decl)`
`15`	`15`	`)`
`16`	`16`	`}`
`@@ -21,7 +21,8 @@ string getNamespaceName(NamespaceDeclaration decl) {`
`21`	`21`	`or`
`22`	`22`	`not decl.getStmt(0).(ExprStmt).getExpr() instanceof ConstantString and`
`23`	`23`	`result =`
`24`		`- "Namespace " + decl.getId() + " on line " + decl.getFirstToken().getLocation().getStartLine()`
	`24`	`+ "Namespace " + decl.getIdentifier() + " on line " +`
	`25`	`+ decl.getFirstToken().getLocation().getStartLine()`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`from ResolveCall resolve`