JS: Accept some trivial alerts in old queries

asgerf · asgerf · commit ae9e9e01b376 · 2025-02-25T17:29:54.000+01:00
diff --git a/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js b/javascript/ql/test/query-tests/Statements/DanglingElse/tst.js
@@ -2,7 +2,7 @@ function bad1() {
 	if (cond1())
 		if (cond2())
 			return 23;
-	else
+	else // $ Alert
 		return 42;
 }
 
@@ -18,7 +18,7 @@ function bad2() {
 	if (cond1()) {
 		if (cond2()) {
 			return 23;
-	} else {
+	} else { // $ Alert
 		return 42;
 	}}
 }
@@ -37,7 +37,7 @@ function bad3() {
 	else if (cond2())
 		if (cond2())
 			return 42;
-	else
+	else // $ Alert
 		return 42;
 }
 
diff --git a/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js b/javascript/ql/test/query-tests/Statements/InconsistentReturn/tst.js
@@ -1,5 +1,5 @@
 function f() {
 	if (someCond())
-		return;
+		return; // $ Alert
 	return 42;
 }
diff --git a/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js b/javascript/ql/test/query-tests/Statements/LabelInCase/nonCaseLabelInSwitch.js
@@ -1,7 +1,7 @@
 switch (a) {
   case 0:
   case 1:
-  case2:
+  case2: // $ Alert
     f();
     break;
   default:
diff --git a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.html
@@ -4,7 +4,7 @@
     <script>
       if (x > 0)
         x--;
-        x--;
+        x--; // $ Alert
     </script>
   </head>
   <body>
diff --git a/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js b/javascript/ql/test/query-tests/Statements/MisleadingIndentationAfterControlStmt/tst.js
@@ -1,7 +1,7 @@
 function bad1() {
 	if (cond())
 		f();
-		g();
+		g(); // $ Alert
 }
 
 function good1() {
@@ -22,7 +22,7 @@ function bad2() {
 		f();
 	else
 		g();
-		h();
+		h(); // $ Alert
 }
 
 function good3() {
@@ -34,7 +34,7 @@ function good3() {
 function wbad1() {
 	while (cond())
 		f();
-		g();
+		g(); // $ Alert
 }
 
 function wgood1() {
diff --git a/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html b/javascript/ql/test/query-tests/Statements/ReturnOutsideFunction/tst.html
@@ -6,7 +6,7 @@
     </script>
 </head>
 <body>
-<form name="f" onSubmit="validateForm(this);" action="javascript:return false;" method="post" enctype="multipart/form-data">
+<form name="f" onSubmit="validateForm(this);" action="javascript:return false;" method="post" enctype="multipart/form-data"> <!-- $ Alert -->
 </form>
 <form name="g" onsubmit="return validateForm(this);" method="post">
 </form>
diff --git a/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js b/javascript/ql/test/query-tests/Statements/SuspiciousUnusedLoopIterationVariable/tst.js
@@ -146,4 +146,4 @@ for (const [key, key2, key3, value] of array) {
 }
 
 for (const [key, key2, key3, value] of array) {} // $ Alert
-for (let i of [1, 2]) {}
+for (let i of [1, 2]) {} // $ Alert
diff --git a/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js b/javascript/ql/test/query-tests/Statements/UnreachableStatement/tst.js
@@ -2,7 +2,7 @@
 
 function f() {
 	return 23;
-	var a = 42;
+	var a = 42; // $ Alert
 }
 
 function g(x) {
@@ -35,7 +35,7 @@ function k() {
 }
 
 throw new Error();
-f();
+f(); // $ Alert
 
 function l(x) {
 	switch(x) {
@@ -60,7 +60,7 @@ function m(x) {
 if (true)
 	x;
 else
-	y;
+	y; // $ Alert
 
 function f(){
 	if (x) {
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/example.js
@@ -5,7 +5,7 @@ function findValue(values, x, start, end) {
         return i;
     }
   }
-  if (i < end) {
+  if (i < end) { // $ Alert
     return i;
   }
   return -1;
diff --git a/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js b/javascript/ql/test/query-tests/Statements/UselessComparisonTest/tst.js
@@ -5,6 +5,6 @@
 });
 
 (function(){
-	(function (i) { if (i == 100000) return; })(1);
-	(function f(i) { if (i == 100000) return; f(i+1); })(1);
+	(function (i) { if (i == 100000) return; })(1); // $ Alert
+	(function f(i) { if (i == 100000) return; f(i+1); })(1); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js b/javascript/ql/test/query-tests/WrongExtensionJSON/tst1.js
@@ -1,3 +1,3 @@
 {
   "x": 42
-}
+} // $ Alert

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`function f() {`
`2`	`2`	`if (someCond())`
`3`		`- return;`
	`3`	`+ return; // $ Alert`
`4`	`4`	`return 42;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,4 @@ for (const [key, key2, key3, value] of array) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`for (const [key, key2, key3, value] of array) {} // $ Alert`
`149`		`-for (let i of [1, 2]) {}`
	`149`	`+for (let i of [1, 2]) {} // $ Alert`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ function findValue(values, x, start, end) {`
`5`	`5`	`return i;`
`6`	`6`	`}`
`7`	`7`	`}`
`8`		`- if (i < end) {`
	`8`	`+ if (i < end) { // $ Alert`
`9`	`9`	`return i;`
`10`	`10`	`}`
`11`	`11`	`return -1;`