hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

JavaScript: Move --extract-program-text extractor options into options files.

Browse Source
This commit is contained in:
Max Schaefer
2019-11-05 16:44:57 +00:00
parent 6b817203fd
commit 3ad5af7cef
15 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
javascript/ql/test/library-tests/Lines/Lines.expected
View File

@@ -1,4 +1,4 @@
| tst1.js:1:1:1:55 | abc // semmle-extractor-options: --extract-program-text | abc // semmle-extractor-options: --extract-program-text | \n |
| tst1.js:1:1:1:3 | abc | abc | \n |
| tst1.js:2:1:2:3 | def | def | \r |
| tst1.js:3:1:3:3 | ghi | ghi | \r\n |
| tst1.js:4:1:4:3 | jkl | jkl | \n |
@@ -6,13 +6,13 @@
| tst1.js:6:1:6:3 | mno | mno | \u2028 |
| tst1.js:7:1:7:0 | | | \n |
| tst1.js:8:1:8:3 | pqr | pqr | \u2029 |
| tst1.js:9:1:9:3 | stu | stu | |
| tst2.js:1:1:1:63 | first_line // semmle-extractor-options: --extract-program-text | first_line // semmle-extractor-options: --extract-program-text | \n |
| tst3.js:1:1:1:56 | 42; // semmle-extractor-options: --extract-program-text | 42; // semmle-extractor-options: --extract-program-text | \n |
| tst1.js:9:1:9:3 | stu | stu | \n |
| tst2.js:1:1:1:10 | first_line | first_line | \n |
| tst3.js:1:1:1:3 | 42; | 42; | \n |
| tst3.js:2:1:2:4 | \t42; | \t42; | \n |
| tst3.js:3:1:3:5 | \t\t42; | \t\t42; | \n |
| tst3.js:4:1:4:6 | \t\t\t42; | \t\t\t42; | \n |
| tst3.js:5:1:5:6 | \t\t 42; | \t\t 42; | \n |
| tst3.js:6:1:6:6 | \t \t42; | \t \t42; | \n |
| tst3.js:7:1:7:7 | 42; | 42; | \n |
| tst3.js:8:1:8:5 | 42; | 42; | |
| tst3.js:8:1:8:5 | 42; | 42; | \n |

1
javascript/ql/test/library-tests/Lines/options Normal file
View File

@@ -0,0 +1 @@
semmle-extractor-options: --extract-program-text

4
javascript/ql/test/library-tests/Lines/tst1.js
View File

@@ -1,5 +1,5 @@
abc // semmle-extractor-options: --extract-program-text
abc
def
ghi
jkl

2
javascript/ql/test/library-tests/Lines/tst2.js
View File

@@ -1 +1 @@
first_line // semmle-extractor-options: --extract-program-text
first_line

4
javascript/ql/test/library-tests/Lines/tst3.js
View File

@@ -1,8 +1,8 @@
42; // semmle-extractor-options: --extract-program-text
42;
42;
42;
42;
42;
42;
42;
42;
42;

1
javascript/ql/test/library-tests/TypeScript/Modifiers/options Normal file
View File

@@ -0,0 +1 @@
semmle-extractor-options: --extract-program-text

2
javascript/ql/test/library-tests/TypeScript/Modifiers/tst.ts
View File

@@ -113,5 +113,3 @@ interface InterfaceFields {
z?: number;
readonly w?: number;
}
// semmle-extractor-options: --extract-program-text

2
javascript/ql/test/library-tests/stmts/conditionals.js
View File

@@ -1,4 +1,4 @@
if (true) // semmle-extractor-options: --extract-program-text
if (true)
;
if (b)
;

2
javascript/ql/test/library-tests/stmts/es2015.js
View File

@@ -1,2 +1,2 @@
for (var x of [1, 2, 3]) // semmle-extractor-options: --extract-program-text
for (var x of [1, 2, 3])
console.log(x);

2
javascript/ql/test/library-tests/stmts/functions.js
View File

@@ -1,4 +1,4 @@
function g(x, y) { // semmle-extractor-options: --extract-program-text
function g(x, y) {
return x+y;
}

2
javascript/ql/test/library-tests/stmts/loops.js
View File

@@ -1,4 +1,4 @@
while(true) // semmle-extractor-options: --extract-program-text
while(true)
;
outer: for(a; b; c) {
for(;;)

2
javascript/ql/test/library-tests/stmts/options
View File

@@ -1 +1 @@
semmle-extractor-options: --experimental
semmle-extractor-options: --experimental --extract-program-text

2
javascript/ql/test/library-tests/stmts/others.js
View File

@@ -1,4 +1,4 @@
with(a) { // semmle-extractor-options: --extract-program-text
with(a) {
}
debugger;
var x = 23, y;

51
javascript/ql/test/library-tests/stmts/tests.expected
View File

@@ -4,14 +4,11 @@ test_LetStmt
test_LineTerminators
| conditionals.js:12:1:12:1 | } |
| functions.js:9:1:9:1 | } |
| guardedCatch.js:11:1:11:65 | //semmle-extractor-options: --experimental --extract-program-text |
| jscript.js:5:1:5:65 | //semmle-extractor-options: --experimental --extract-program-text |
| legacyletstmt.js:5:1:5:65 | //semmle-extractor-options: --experimental --extract-program-text |
| loops.js:22:1:22:18 | for (x = 0 in xs); |
| others.js:4:1:4:14 | var x = 23, y; |
| try.js:5:1:5:29 | try {} catch(x) {} finally {} |
test_EnclosingStmt
| conditionals.js:1:5:1:8 | true | conditionals.js:1:1:2:5 | if (tru ... t\\n ; |
| conditionals.js:1:5:1:8 | true | conditionals.js:1:1:2:5 | if (true)\\n ; |
| conditionals.js:3:5:3:5 | b | conditionals.js:3:1:6:5 | if (b)\\n ... e\\n ; |
| conditionals.js:7:9:7:9 | b | conditionals.js:7:1:12:1 | switch ... ault:\\n} |
| conditionals.js:8:6:8:7 | 23 | conditionals.js:8:1:8:8 | case 23: |
@@ -96,7 +93,7 @@ test_EnclosingStmt
| legacyletstmt.js:2:15:2:15 | x | legacyletstmt.js:2:3:2:21 | console.log(x + y); |
| legacyletstmt.js:2:15:2:19 | x + y | legacyletstmt.js:2:3:2:21 | console.log(x + y); |
| legacyletstmt.js:2:19:2:19 | y | legacyletstmt.js:2:3:2:21 | console.log(x + y); |
| loops.js:1:7:1:10 | true | loops.js:1:1:2:5 | while(t ... t\\n ; |
| loops.js:1:7:1:10 | true | loops.js:1:1:2:5 | while(true)\\n ; |
| loops.js:3:1:3:5 | outer | loops.js:3:1:11:1 | outer: ... inue;\\n} |
| loops.js:3:12:3:12 | a | loops.js:3:8:11:1 | for(a; ... inue;\\n} |
| loops.js:3:15:3:15 | b | loops.js:3:8:11:1 | for(a; ... inue;\\n} |
@@ -129,7 +126,7 @@ test_EnclosingStmt
| loops.js:22:6:22:6 | x | loops.js:22:1:22:18 | for (x = 0 in xs); |
| loops.js:22:10:22:10 | 0 | loops.js:22:1:22:18 | for (x = 0 in xs); |
| loops.js:22:15:22:16 | xs | loops.js:22:1:22:18 | for (x = 0 in xs); |
| others.js:1:6:1:6 | a | others.js:1:1:2:1 | with(a) ... -text\\n} |
| others.js:1:6:1:6 | a | others.js:1:1:2:1 | with(a) {\\n} |
| others.js:4:5:4:5 | x | others.js:4:1:4:14 | var x = 23, y; |
| others.js:4:5:4:10 | x = 23 | others.js:4:1:4:14 | var x = 23, y; |
| others.js:4:9:4:10 | 23 | others.js:4:1:4:14 | var x = 23, y; |
@@ -140,7 +137,7 @@ test_EnclosingStmt
| try.js:5:14:5:14 | x | try.js:5:8:5:18 | catch(x) {} |
test_NumCatchClauses
| guardedCatch.js:2:2:8:2 | try {\\n\\t ... !");\\n\\t} | 2 |
| try.js:1:1:3:16 | try { / ... ) { ; } | 1 |
| try.js:1:1:3:16 | try {\\n ... ) { ; } | 1 |
| try.js:4:1:4:20 | try {} finally { ; } | 0 |
| try.js:5:1:5:29 | try {} ... ally {} | 1 |
test_DoubleColonMethods
@@ -151,7 +148,7 @@ test_SemicolonInsertion
test_getGuard
| guardedCatch.js:4:4:6:2 | catch ( ... !");\\n\\t} | guardedCatch.js:4:16:4:33 | e instanceof Error |
test_Containers
| conditionals.js:1:1:2:5 | if (tru ... t\\n ; | conditionals.js:1:1:12:1 | <toplevel> |
| conditionals.js:1:1:2:5 | if (true)\\n ; | conditionals.js:1:1:12:1 | <toplevel> |
| conditionals.js:2:5:2:5 | ; | conditionals.js:1:1:12:1 | <toplevel> |
| conditionals.js:3:1:6:5 | if (b)\\n ... e\\n ; | conditionals.js:1:1:12:1 | <toplevel> |
| conditionals.js:4:5:4:5 | ; | conditionals.js:1:1:12:1 | <toplevel> |
@@ -164,22 +161,22 @@ test_Containers
| es2015.js:1:1:2:16 | for (va ... log(x); | es2015.js:1:1:3:0 | <toplevel> |
| es2015.js:1:6:1:10 | var x | es2015.js:1:1:3:0 | <toplevel> |
| es2015.js:2:2:2:16 | console.log(x); | es2015.js:1:1:3:0 | <toplevel> |
| foreach.js:1:1:1:12 | var sum = 0; | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:2:1:2:42 | var obj ... p3: 8}; | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:4:1:6:1 | for eac ... item;\\n} | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:4:11:4:18 | var item | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:4:28:6:1 | {\\n sum += item;\\n} | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:5:3:5:14 | sum += item; | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:8:1:8:17 | console.log(sum); | foreach.js:1:1:11:0 | <toplevel> |
| foreach.js:1:1:1:12 | var sum = 0; | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:2:1:2:42 | var obj ... p3: 8}; | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:4:1:6:1 | for eac ... item;\\n} | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:4:11:4:18 | var item | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:4:28:6:1 | {\\n sum += item;\\n} | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:5:3:5:14 | sum += item; | foreach.js:1:1:9:0 | <toplevel> |
| foreach.js:8:1:8:17 | console.log(sum); | foreach.js:1:1:9:0 | <toplevel> |
| functions.js:1:1:3:1 | functio ... x+y;\\n} | functions.js:1:1:9:1 | <toplevel> |
| functions.js:1:18:3:1 | { // se ... x+y;\\n} | functions.js:1:1:3:1 | functio ... x+y;\\n} |
| functions.js:1:18:3:1 | {\\n return x+y;\\n} | functions.js:1:1:3:1 | functio ... x+y;\\n} |
| functions.js:2:5:2:15 | return x+y; | functions.js:1:1:3:1 | functio ... x+y;\\n} |
| functions.js:5:1:5:15 | function h() {} | functions.js:1:1:9:1 | <toplevel> |
| functions.js:5:14:5:15 | {} | functions.js:5:1:5:15 | function h() {} |
| functions.js:7:1:9:1 | k = fun ... turn;\\n} | functions.js:1:1:9:1 | <toplevel> |
| functions.js:7:16:9:1 | {\\n return;\\n} | functions.js:7:5:9:1 | functio ... turn;\\n} |
| functions.js:8:5:8:11 | return; | functions.js:7:5:9:1 | functio ... turn;\\n} |
| guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} | guardedCatch.js:1:1:11:65 | <toplevel> |
| guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} | guardedCatch.js:1:1:10:0 | <toplevel> |
| guardedCatch.js:1:15:9:1 | {\\n\\ttry ... );\\n\\t}\\n} | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
| guardedCatch.js:2:2:8:2 | try {\\n\\t ... !");\\n\\t} | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
| guardedCatch.js:2:6:4:2 | {\\n\\t\\tg();\\n\\t} | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
@@ -190,14 +187,14 @@ test_Containers
| guardedCatch.js:6:4:8:2 | catch ( ... !");\\n\\t} | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
| guardedCatch.js:6:14:8:2 | {\\n\\t\\tcon ... !");\\n\\t} | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
| guardedCatch.js:7:3:7:33 | console ... lse!"); | guardedCatch.js:1:1:9:1 | functio ... );\\n\\t}\\n} |
| jscript.js:1:1:1:28 | functio ... ad() {} | jscript.js:1:1:5:65 | <toplevel> |
| jscript.js:1:1:1:28 | functio ... ad() {} | jscript.js:1:1:4:0 | <toplevel> |
| jscript.js:1:27:1:28 | {} | jscript.js:1:1:1:28 | functio ... ad() {} |
| jscript.js:3:1:3:36 | window. ... ad() {} | jscript.js:1:1:5:65 | <toplevel> |
| jscript.js:3:1:3:36 | window. ... ad() {} | jscript.js:1:1:4:0 | <toplevel> |
| jscript.js:3:35:3:36 | {} | jscript.js:3:17:3:36 | function onload() {} |
| legacyletstmt.js:1:1:3:1 | let (x ... + y);\\n} | legacyletstmt.js:1:1:5:65 | <toplevel> |
| legacyletstmt.js:1:22:3:1 | {\\n con ... + y);\\n} | legacyletstmt.js:1:1:5:65 | <toplevel> |
| legacyletstmt.js:2:3:2:21 | console.log(x + y); | legacyletstmt.js:1:1:5:65 | <toplevel> |
| loops.js:1:1:2:5 | while(t ... t\\n ; | loops.js:1:1:22:18 | <toplevel> |
| legacyletstmt.js:1:1:3:1 | let (x ... + y);\\n} | legacyletstmt.js:1:1:4:0 | <toplevel> |
| legacyletstmt.js:1:22:3:1 | {\\n con ... + y);\\n} | legacyletstmt.js:1:1:4:0 | <toplevel> |
| legacyletstmt.js:2:3:2:21 | console.log(x + y); | legacyletstmt.js:1:1:4:0 | <toplevel> |
| loops.js:1:1:2:5 | while(true)\\n ; | loops.js:1:1:22:18 | <toplevel> |
| loops.js:2:5:2:5 | ; | loops.js:1:1:22:18 | <toplevel> |
| loops.js:3:1:11:1 | outer: ... inue;\\n} | loops.js:1:1:22:18 | <toplevel> |
| loops.js:3:8:11:1 | for(a; ... inue;\\n} | loops.js:1:1:22:18 | <toplevel> |
@@ -223,12 +220,12 @@ test_Containers
| loops.js:21:16:21:16 | ; | loops.js:1:1:22:18 | <toplevel> |
| loops.js:22:1:22:18 | for (x = 0 in xs); | loops.js:1:1:22:18 | <toplevel> |
| loops.js:22:18:22:18 | ; | loops.js:1:1:22:18 | <toplevel> |
| others.js:1:1:2:1 | with(a) ... -text\\n} | others.js:1:1:4:14 | <toplevel> |
| others.js:1:9:2:1 | { // se ... -text\\n} | others.js:1:1:4:14 | <toplevel> |
| others.js:1:1:2:1 | with(a) {\\n} | others.js:1:1:4:14 | <toplevel> |
| others.js:1:9:2:1 | {\\n} | others.js:1:1:4:14 | <toplevel> |
| others.js:3:1:3:9 | debugger; | others.js:1:1:4:14 | <toplevel> |
| others.js:4:1:4:14 | var x = 23, y; | others.js:1:1:4:14 | <toplevel> |
| try.js:1:1:3:16 | try { / ... ) { ; } | try.js:1:1:5:29 | <toplevel> |
| try.js:1:5:3:1 | { // se ... "!";\\n} | try.js:1:1:5:29 | <toplevel> |
| try.js:1:1:3:16 | try {\\n ... ) { ; } | try.js:1:1:5:29 | <toplevel> |
| try.js:1:5:3:1 | {\\n throw "!";\\n} | try.js:1:1:5:29 | <toplevel> |
| try.js:2:5:2:14 | throw "!"; | try.js:1:1:5:29 | <toplevel> |
| try.js:3:3:3:16 | catch(x) { ; } | try.js:1:1:5:29 | <toplevel> |
| try.js:3:12:3:16 | { ; } | try.js:1:1:5:29 | <toplevel> |

2
javascript/ql/test/library-tests/stmts/try.js
View File

@@ -1,4 +1,4 @@
try { // semmle-extractor-options: --extract-program-text
try {
throw "!";
} catch(x) { ; }
try {} finally { ; }