Merge pull request #2267 from max-schaefer/js/qltest-extractor-options

Approved by asger-semmle

Author: semmle-qlci

javascript/ql/test/library-tests/CFG/CFG.expected

@@ -546,7 +546,7 @@
 | classes | 39 | static x = 5; | 39 | t = cla ... () {} } |
 | classes | 39 | t | 39 | A |
 | classes | 39 | t = cla ... () {} } | 39 | t |
-| classes | 39 | t = cla ... () {} } | 42 | exit node of <toplevel> |
+| classes | 39 | t = cla ... () {} } | 40 | exit node of <toplevel> |
 | classes | 39 | x | 39 | 5 |
 | classes | 39 | {} | 39 | exit node of () {} |
 | decorated_parameter | 1 | C | 2 | foo |
@@ -625,7 +625,7 @@
 | fields | 8 | {} | 8 | exit node of () {} |
 | fields | 11 | A | 12 | constructor |
 | fields | 11 | B | 11 | A |
-| fields | 11 | class B ... \\n  z;\\n} | 21 | exit node of <toplevel> |
+| fields | 11 | class B ... \\n  z;\\n} | 19 | exit node of <toplevel> |
 | fields | 12 | constru ... er;\\n  } | 11 | class B ... \\n  z;\\n} |
 | fields | 12 | constructor | 12 | function in constru ... er;\\n  } |
 | fields | 12 | entry node of () {\\n   ... er;\\n  } | 12 | {\\n    b ... er;\\n  } |
@@ -680,7 +680,7 @@
 | globals | 19 | h | 20 | {\\n} |
 | globals | 20 | {\\n} | 21 | exit node of function\\n h()\\n{\\n} |
 | mixedMembers | 1 | Mixed | 3 | constructor |
-| mixedMembers | 1 | class M ... z) {}\\n} | 7 | exit node of <toplevel> |
+| mixedMembers | 1 | class M ... z) {}\\n} | 6 | exit node of <toplevel> |
 | mixedMembers | 1 | entry node of <toplevel> | 1 | Mixed |
 | mixedMembers | 2 | 3 | 2 | x = 3 |
 | mixedMembers | 2 | x | 2 | 3 |
@@ -746,7 +746,7 @@
 | staticFields | 2 | C | 2 | new C() |
 | staticFields | 2 | instance | 2 | C |
 | staticFields | 2 | new C() | 2 | static  ... ew C(); |
-| staticFields | 2 | static  ... ew C(); | 7 | exit node of <toplevel> |
+| staticFields | 2 | static  ... ew C(); | 4 | exit node of <toplevel> |
 | staticFieldsTS | 1 | C | 1 | constructor |
 | staticFieldsTS | 1 | class C ...  C();\\n} | 2 | instance |
 | staticFieldsTS | 1 | constructor | 1 | function in constructor() {} |

javascript/ql/test/library-tests/CFG/classes.js

@@ -37,5 +37,3 @@ t = class extends A { f() {} }
 t = class extends A { x = 5; f() {} }
 t = class extends A { static x = 5; f() {} }
 t = class extends A { static x = 5; f() {} constructor() {} }
-
-// semmle-extractor-options: --experimental

javascript/ql/test/library-tests/CFG/fields.js

@@ -16,5 +16,3 @@ class B extends A {
   }
   z;
 }
-
-// semmle-extractor-options: --experimental

javascript/ql/test/library-tests/CFG/mixedMembers.js

@@ -3,5 +3,3 @@ class Mixed {
   constructor(y) {}
   method(z) {}
 }
-
-// semmle-extractor-options: --experimental

javascript/ql/test/library-tests/CFG/options

@@ -0,0 +1 @@
+semmle-extractor-options: --experimental

javascript/ql/test/library-tests/CFG/staticFields.js

@@ -1,6 +1,3 @@
 class C {
   static instance = new C();
 }
-
-// semmle-extractor-options: --experimental
-

javascript/ql/test/library-tests/Classes/fields.js

@@ -2,5 +2,3 @@ class C {
   x;
   y = 42
 }
-
-// semmle-extractor-options: --experimental

javascript/ql/test/library-tests/Classes/options

@@ -0,0 +1 @@
+semmle-extractor-options: --experimental

javascript/ql/test/library-tests/Comprehensions/comprehensions.js

@@ -8,5 +8,3 @@ year;
 year;
 (for (i of numbers) for (j of letters) i+j);
 (for (i of numbers) for (j of letters) if (i<j) i+j);
-
-//semmle-extractor-options: --experimental

javascript/ql/test/library-tests/Comprehensions/options

@@ -0,0 +1 @@
+semmle-extractor-options: --experimental