JS: support AutoRest classification

Esben Sparre Andreasen · Esben Sparre Andreasen · commit a295dfd2c5c6 · 2018-12-11T08:54:19.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/GeneratedCode.qll b/javascript/ql/src/semmle/javascript/GeneratedCode.qll
@@ -42,8 +42,8 @@ class CodeGeneratorMarkerComment extends GeneratedCodeMarkerComment {
  */
 private predicate codeGeneratorMarkerComment(Comment c, string tool) {
   exists (string toolPattern |
-    toolPattern = "js_of_ocaml|CoffeeScript|LiveScript|dart2js|ANTLR|PEG\\.js|Opal|JSX|jison(?:-lex)?" and
-    tool = c.getText().regexpCapture("(?s)[\\s*]*(?:parser )?[gG]eneratedy? (?:from .*)?by (" + toolPattern + ")\\b.*", 1)
+    toolPattern = "js_of_ocaml|CoffeeScript|LiveScript|dart2js|ANTLR|PEG\\.js|Opal|JSX|jison(?:-lex)?|(?:Microsoft \\(R\\) AutoRest Code Generator)" and
+    tool = c.getText().regexpCapture("(?s)[\\s*]*(?:parser |Code )?[gG]eneratedy? (?:from .*)?by (" + toolPattern + ")\\b.*", 1)
   )
 }
 
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/AutoRest.js b/javascript/ql/test/query-tests/filters/ClassifyFiles/AutoRest.js
@@ -0,0 +1,5 @@
+/*
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected b/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected
@@ -1,3 +1,4 @@
+| AutoRest.js:0:0:0:0 | AutoRest.js | generated |
 | ai.1.2.3-build0123.js:0:0:0:0 | ai.1.2.3-build0123.js | library |
 | bundle-directive.js:0:0:0:0 | bundle-directive.js | generated |
 | data.js:0:0:0:0 | data.js | generated |
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/CodeGenerator.expected b/javascript/ql/test/query-tests/filters/ClassifyFiles/CodeGenerator.expected
@@ -1,3 +1,4 @@
+| AutoRest.js:1:1:5:3 | /*\\n * C ... ed.\\n */ | Microsoft (R) AutoRest Code Generator |
 | jison-lex.js:1:1:1:34 | /* gene ... .2.1 */ | jison-lex |
 | jison.js:1:1:1:38 | /* pars ... 4.13 */ | jison |
 | jsx-old.js:1:1:1:106 | // gene ... 977102) | JSX |

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ class CodeGeneratorMarkerComment extends GeneratedCodeMarkerComment {`
`42`	`42`	`*/`
`43`	`43`	`private predicate codeGeneratorMarkerComment(Comment c, string tool) {`
`44`	`44`	`exists (string toolPattern \|`
`45`		`- toolPattern = "js_of_ocaml\|CoffeeScript\|LiveScript\|dart2js\|ANTLR\|PEG\\.js\|Opal\|JSX\|jison(?:-lex)?" and`
`46`		`- tool = c.getText().regexpCapture("(?s)[\\s](?:parser )?[gG]eneratedy? (?:from .)?by (" + toolPattern + ")\\b.", 1)`
	`45`	`+ toolPattern = "js_of_ocaml\|CoffeeScript\|LiveScript\|dart2js\|ANTLR\|PEG\\.js\|Opal\|JSX\|jison(?:-lex)?\|(?:Microsoft \\(R\\) AutoRest Code Generator)" and`
	`46`	`+ tool = c.getText().regexpCapture("(?s)[\\s](?:parser \|Code )?[gG]eneratedy? (?:from .)?by (" + toolPattern + ")\\b.", 1)`
`47`	`47`	`)`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+\| AutoRest.js:0:0:0:0 \| AutoRest.js \| generated \|`
`1`	`2`	`\| ai.1.2.3-build0123.js:0:0:0:0 \| ai.1.2.3-build0123.js \| library \|`
`2`	`3`	`\| bundle-directive.js:0:0:0:0 \| bundle-directive.js \| generated \|`
`3`	`4`	`\| data.js:0:0:0:0 \| data.js \| generated \|`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+\| AutoRest.js:1:1:5:3 \| /\\n C ... ed.\\n */ \| Microsoft (R) AutoRest Code Generator \|`
`1`	`2`	`\| jison-lex.js:1:1:1:34 \| /* gene ... .2.1 */ \| jison-lex \|`
`2`	`3`	`\| jison.js:1:1:1:38 \| /* pars ... 4.13 */ \| jison \|`
`3`	`4`	`\| jsx-old.js:1:1:1:106 \| // gene ... 977102) \| JSX \|`