JS: truncate js/unknown-directive message content

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 8f635e6493bf · 2018-10-26T15:21:16.000+02:00
diff --git a/javascript/ql/src/Expressions/UnknownDirective.ql b/javascript/ql/src/Expressions/UnknownDirective.ql
@@ -14,4 +14,4 @@ from Directive d
 where not d instanceof KnownDirective and
       // but exclude attribute top-levels: `<a href="javascript:'some-attribute-string'">`
       not (d.getParent() instanceof CodeInAttribute)
-select d, "Unknown directive: '" + d.getDirectiveText() + "'."
+select d, "Unknown directive: '" + truncate(d.getDirectiveText(), 20, " ... (truncated)")  + "'."
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.expected
@@ -11,3 +11,5 @@
 | UnknownDirective.js:12:5:12:17 | "use struct;" | Unknown directive: 'use struct;'. |
 | UnknownDirective.js:13:5:13:17 | "Use Strict"; | Unknown directive: 'Use Strict'. |
 | UnknownDirective.js:14:5:14:14 | "use bar"; | Unknown directive: 'use bar'. |
+| UnknownDirective.js:38:5:38:17 | "[0, 0, 0];"; | Unknown directive: '[0, 0, 0];'. |
+| UnknownDirective.js:39:5:39:65 | "[0, 0, ... , 0];"; | Unknown directive: '[0, 0, 0, 0, 0, 0, 0 ... (truncated)'. |
diff --git a/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js b/javascript/ql/test/query-tests/Expressions/UnknownDirective/UnknownDirective.js
@@ -33,3 +33,8 @@ function good() {
     "deps foo"; // OK
     "deps bar"; // OK
 }
+
+function data() {
+    "[0, 0, 0];"; // NOT OK
+    "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];"; // NOT OK
+}

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,8 @@ function good() {`
`33`	`33`	`"deps foo"; // OK`
`34`	`34`	`"deps bar"; // OK`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+function data() {`
	`38`	`+ "[0, 0, 0];"; // NOT OK`
	`39`	`+ "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];"; // NOT OK`
	`40`	`+}`