Merge pull request #4486 from erik-krogh/lessTokens

codeql-ci · web-flow · commit 9faf675f1f3d · 2020-10-21T02:56:38.000-07:00
Approved by asgerf
diff --git a/javascript/ql/src/Declarations/UnstableCyclicImport.ql b/javascript/ql/src/Declarations/UnstableCyclicImport.ql
@@ -77,7 +77,7 @@ VarAccess getFirstCandidateAccess(ImportDeclaration decl) {
   result =
     min(decl.getASpecifier().getLocal().getVariable().getAnAccess().(CandidateVarAccess) as p
       order by
-        p.getFirstToken().getIndex()
+        p.getLocation().getStartLine(), p.getLocation().getStartColumn()
     )
 }
 
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -1609,7 +1609,9 @@ private string getConcatenatedString(Expr add) {
     strictconcat(Expr leaf |
       leaf = getAnAddOperand*(add)
     |
-      getConstantString(leaf) order by leaf.getFirstToken().getIndex()
+      getConstantString(leaf)
+      order by
+        leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()
     ) and
   result.length() < 1000 * 1000
 }
diff --git a/javascript/ql/src/semmle/javascript/StringOps.qll b/javascript/ql/src/semmle/javascript/StringOps.qll
@@ -576,7 +576,9 @@ module StringOps {
         strictconcat(StringLiteralLike leaf |
           leaf = getALeaf().asExpr()
         |
-          leaf.getStringValue() order by leaf.getFirstToken().getIndex()
+          leaf.getStringValue()
+          order by
+            leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()
         )
     }
   }
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -466,7 +466,11 @@ class LocalTypeName extends @local_type_name, LexicalName {
    * Gets the first declaration of this type name.
    */
   TypeDecl getFirstDeclaration() {
-    result = min(getADeclaration() as decl order by decl.getFirstToken().getIndex())
+    result =
+      min(getADeclaration() as decl
+        order by
+          decl.getLocation().getStartLine(), decl.getLocation().getStartColumn()
+      )
   }
 
   /** Gets a use of this type name in a type annotation. */
@@ -526,7 +530,11 @@ class LocalNamespaceName extends @local_namespace_name, LexicalName {
    * Gets the first declaration of this namespace name.
    */
   LocalNamespaceDecl getFirstDeclaration() {
-    result = min(getADeclaration() as decl order by decl.getFirstToken().getIndex())
+    result =
+      min(getADeclaration() as decl
+        order by
+          decl.getLocation().getStartLine(), decl.getLocation().getStartColumn()
+      )
   }
 
   /** Gets a use of this namespace name in a type annotation. */
diff --git a/javascript/ql/src/semmle/javascript/security/UselessUseOfCat.qll b/javascript/ql/src/semmle/javascript/security/UselessUseOfCat.qll
@@ -239,7 +239,9 @@ module PrettyPrintCatCall {
       concat(Expr leaf |
         leaf = root.getALeaf().asExpr()
       |
-        createLeafRepresentation(leaf), " + " order by leaf.getFirstToken().getIndex()
+        createLeafRepresentation(leaf), " + "
+        order by
+          leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()
       )
     or
     // Template string

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ VarAccess getFirstCandidateAccess(ImportDeclaration decl) {`
`77`	`77`	`result =`
`78`	`78`	`min(decl.getASpecifier().getLocal().getVariable().getAnAccess().(CandidateVarAccess) as p`
`79`	`79`	`order by`
`80`		`- p.getFirstToken().getIndex()`
	`80`	`+ p.getLocation().getStartLine(), p.getLocation().getStartColumn()`
`81`	`81`	`)`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -1609,7 +1609,9 @@ private string getConcatenatedString(Expr add) {`
`1609`	`1609`	`strictconcat(Expr leaf \|`
`1610`	`1610`	`leaf = getAnAddOperand*(add)`
`1611`	`1611`	`\|`
`1612`		`- getConstantString(leaf) order by leaf.getFirstToken().getIndex()`
	`1612`	`+ getConstantString(leaf)`
	`1613`	`+ order by`
	`1614`	`+ leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()`
`1613`	`1615`	`) and`
`1614`	`1616`	`result.length() < 1000 * 1000`
`1615`	`1617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,9 @@ module StringOps {`
`576`	`576`	`strictconcat(StringLiteralLike leaf \|`
`577`	`577`	`leaf = getALeaf().asExpr()`
`578`	`578`	`\|`
`579`		`- leaf.getStringValue() order by leaf.getFirstToken().getIndex()`
	`579`	`+ leaf.getStringValue()`
	`580`	`+ order by`
	`581`	`+ leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()`
`580`	`582`	`)`
`581`	`583`	`}`
`582`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,9 @@ module PrettyPrintCatCall {`
`239`	`239`	`concat(Expr leaf \|`
`240`	`240`	`leaf = root.getALeaf().asExpr()`
`241`	`241`	`\|`
`242`		`- createLeafRepresentation(leaf), " + " order by leaf.getFirstToken().getIndex()`
	`242`	`+ createLeafRepresentation(leaf), " + "`
	`243`	`+ order by`
	`244`	`+ leaf.getLocation().getStartLine(), leaf.getLocation().getStartColumn()`
`243`	`245`	`)`
`244`	`246`	`or`
`245`	`247`	`// Template string`