JavaScript: Move --tolerate-parse-errors extractor options into options file.

Max Schaefer · Max Schaefer · commit 6b817203fdcc · 2019-11-06T13:01:28.000Z
diff --git a/javascript/ql/test/library-tests/Errors/options b/javascript/ql/test/library-tests/Errors/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/Errors/setters.js b/javascript/ql/test/library-tests/Errors/setters.js
@@ -8,5 +8,3 @@ var o = {
   set y(...ys) {},
   set z(z, ...zs) {}
 };
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/Errors/tst.js b/javascript/ql/test/library-tests/Errors/tst.js
@@ -1,4 +1,2 @@
   while
 }
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/JSON/JSONError.expected b/javascript/ql/test/library-tests/JSON/JSONError.expected
@@ -1,2 +1 @@
 | invalid.json:3:1:3:1 | Error: Comments are not legal in JSON. |
-| invalid.json:4:1:4:1 | Error: Comments are not legal in JSON. |
diff --git a/javascript/ql/test/library-tests/JSON/invalid.json b/javascript/ql/test/library-tests/JSON/invalid.json
@@ -1,4 +1,3 @@
 "hi"
 
 // JSON doesn't have comments
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/JSON/options b/javascript/ql/test/library-tests/JSON/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/jsdocTypes.ts b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/jsdocTypes.ts
@@ -23,5 +23,3 @@ var nns: Array<?number>;
 var dns: Array<!number>;
 var anys: Array<*>;
 var vars: Array<...number>;
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/options b/javascript/ql/test/library-tests/TypeScript/SyntaxErrors/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/YAML/YAMLError.expected b/javascript/ql/test/library-tests/YAML/YAMLError.expected
@@ -1 +1 @@
-| err.yaml:4:1:4:1 | found unexpected end of stream |
+| err.yaml:3:1:3:1 | found unexpected end of stream |
diff --git a/javascript/ql/test/library-tests/YAML/err.yaml b/javascript/ql/test/library-tests/YAML/err.yaml
@@ -1,3 +1,2 @@
 "unterminated string
-# semmle-extractor-options: --tolerate-parse-errors
 
diff --git a/javascript/ql/test/library-tests/YAML/options b/javascript/ql/test/library-tests/YAML/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/frameworks/Express/options b/javascript/ql/test/library-tests/frameworks/Express/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/AngularJS/DuplicateDependency/options b/javascript/ql/test/query-tests/AngularJS/DuplicateDependency/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/options b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js b/javascript/ql/test/query-tests/Declarations/UniqueParameterNames/tst.js
@@ -12,5 +12,3 @@ this.addPropertyListener(prop.name, function(_, _, _, a) {
 function f(x, y, x) {
   'use strict';
 }
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/options b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/SyntaxError/tst.js
@@ -1,4 +1,2 @@
 function findBox() {
   return $("box.important
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/nonbmp.js b/javascript/ql/test/query-tests/filters/ClassifyFiles/nonbmp.js
@@ -1,3 +1 @@
 😼😼
-
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/options b/javascript/ql/test/query-tests/filters/ClassifyFiles/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/some-template.html b/javascript/ql/test/query-tests/filters/ClassifyFiles/some-template.html
@@ -1,4 +1,3 @@
 <script type="text/javascript">
 %some made-up template syntax
 </script>
-semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/templ.js b/javascript/ql/test/query-tests/filters/ClassifyFiles/templ.js
@@ -3,4 +3,3 @@ common.autofocus('#id_password');
 {% else %}
 common.autofocus('#id_username');
 {% endif %}
-// semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/tmpl.html b/javascript/ql/test/query-tests/filters/ClassifyFiles/tmpl.html
@@ -5,4 +5,3 @@
 common.autofocus('#id_username');
 {% endif %}
 </script>
-semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/tmpl2.html b/javascript/ql/test/query-tests/filters/ClassifyFiles/tmpl2.html
@@ -5,4 +5,3 @@
     {{/config}}
   }
 </script>
-semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/options b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+semmle-extractor-options: --tolerate-parse-errors`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,2 @@`
`1`	`1`	`while`
`2`	`2`	`}`
`3`		`-`
`4`		`-// semmle-extractor-options: --tolerate-parse-errors`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`\| invalid.json:3:1:3:1 \| Error: Comments are not legal in JSON. \|`
`2`		`-\| invalid.json:4:1:4:1 \| Error: Comments are not legal in JSON. \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`"hi"`
`2`	`2`
`3`	`3`	`// JSON doesn't have comments`
`4`		`-// semmle-extractor-options: --tolerate-parse-errors`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| err.yaml:4:1:4:1 \| found unexpected end of stream \|`
	`1`	`+\| err.yaml:3:1:3:1 \| found unexpected end of stream \|`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`"unterminated string`
`2`		`-# semmle-extractor-options: --tolerate-parse-errors`
`3`	`2`