Third pass

owen-mc · owen-mc · commit a375e186eda5 · 2026-06-11T21:53:22.000+02:00
diff --git a/java/ql/integration-tests/kotlin/all-platforms/gradle_kotlinx_serialization/ConstantExpAppearsNonConstant.qlref b/java/ql/integration-tests/kotlin/all-platforms/gradle_kotlinx_serialization/ConstantExpAppearsNonConstant.qlref
@@ -1 +1,2 @@
-Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
+query: Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref b/java/ql/test-kotlin1/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
+query: Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/AutoBoxing/AutoBoxing.qlref b/java/ql/test-kotlin1/query-tests/AutoBoxing/AutoBoxing.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/legacy/AutoBoxing.ql
+query: Violations of Best Practice/legacy/AutoBoxing.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/CloseReader/CloseReader.qlref b/java/ql/test-kotlin1/query-tests/CloseReader/CloseReader.qlref
@@ -1 +1,2 @@
-Likely Bugs/Resource Leaks/CloseReader.ql
+query: Likely Bugs/Resource Leaks/CloseReader.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/CloseWriter/CloseWriter.qlref b/java/ql/test-kotlin1/query-tests/CloseWriter/CloseWriter.qlref
@@ -1 +1,2 @@
-Likely Bugs/Resource Leaks/CloseWriter.ql
+query: Likely Bugs/Resource Leaks/CloseWriter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/ConfusingOverloading/ConfusingOverloading.qlref b/java/ql/test-kotlin1/query-tests/ConfusingOverloading/ConfusingOverloading.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+query: Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/ConstantLoopCondition/A.kt b/java/ql/test-kotlin1/query-tests/ConstantLoopCondition/A.kt
@@ -2,21 +2,21 @@ fun fn0(f: Function0<Unit>) = f()
 
 fun fn1() {
     var c = true
-    while (c) { // TODO: false positive
+    while (c) { // $ SPURIOUS: Alert // TODO: false positive
         fn0 {
             c = false
         }
     }
 
     var d = true
-    while (d) {
+    while (d) { // $ Alert
         fn0 {
             println(d)
         }
     }
 
     val e = true
-    while (e) {
+    while (e) { // $ Alert
         fn0 {
             println(e)
         }
diff --git a/java/ql/test-kotlin1/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref b/java/ql/test-kotlin1/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref
@@ -1 +1,2 @@
-Likely Bugs/Termination/ConstantLoopCondition.ql
+query: Likely Bugs/Termination/ConstantLoopCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/DeadCode/DeadClass.qlref b/java/ql/test-kotlin1/query-tests/DeadCode/DeadClass.qlref
@@ -1 +1,2 @@
-DeadCode/DeadClass.ql
+query: DeadCode/DeadClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/DeadCode/DeadMethod.qlref b/java/ql/test-kotlin1/query-tests/DeadCode/DeadMethod.qlref
@@ -1 +1,2 @@
-DeadCode/DeadMethod.ql
+query: DeadCode/DeadMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/DeadRefTypes/DeadRefTypes.qlref b/java/ql/test-kotlin1/query-tests/DeadRefTypes/DeadRefTypes.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Dead Code/DeadRefTypes.ql
+query: Violations of Best Practice/Dead Code/DeadRefTypes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/DeadRefTypes/test.kt b/java/ql/test-kotlin1/query-tests/DeadRefTypes/test.kt
@@ -1,4 +1,4 @@
-private class C1 { }
+private class C1 { } // $ Alert
 
 private class C2 { }
 
diff --git a/java/ql/test-kotlin1/query-tests/EmptyBlock/EmptyBlock.qlref b/java/ql/test-kotlin1/query-tests/EmptyBlock/EmptyBlock.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/EmptyBlock.ql
+query: Likely Bugs/Statements/EmptyBlock.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/ExposeRepresentation/ExposeRepresentation.qlref b/java/ql/test-kotlin1/query-tests/ExposeRepresentation/ExposeRepresentation.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+query: Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref b/java/ql/test-kotlin1/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref
@@ -1 +1,2 @@
-Performance/InnerClassCouldBeStatic.ql
+query: Performance/InnerClassCouldBeStatic.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref b/java/ql/test-kotlin1/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref
@@ -1 +1,2 @@
-Likely Bugs/Comparison/MissingInstanceofInEquals.ql
+query: Likely Bugs/Comparison/MissingInstanceofInEquals.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref b/java/ql/test-kotlin1/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref
@@ -1 +1,2 @@
-Advisory/Declarations/MissingOverrideAnnotation.ql
+query: Advisory/Declarations/MissingOverrideAnnotation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/MutualDependency/MutualDependency.qlref b/java/ql/test-kotlin1/query-tests/MutualDependency/MutualDependency.qlref
@@ -1 +1,2 @@
-Architecture/Dependencies/MutualDependency.ql
+query: Architecture/Dependencies/MutualDependency.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref b/java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref
@@ -1 +1,2 @@
-Advisory/Naming/NamingConventionsRefTypes.ql
+query: Advisory/Naming/NamingConventionsRefTypes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/Test.kt b/java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/Test.kt
@@ -9,4 +9,4 @@ class Foo {
     }
 }
 
-class aaaa {}
+class aaaa {} // $ Alert
diff --git a/java/ql/test-kotlin1/query-tests/NonSerializableField/NonSerializableField.qlref b/java/ql/test-kotlin1/query-tests/NonSerializableField/NonSerializableField.qlref
@@ -1 +1,2 @@
-Likely Bugs/Serialization/NonSerializableField.ql
+query: Likely Bugs/Serialization/NonSerializableField.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref b/java/ql/test-kotlin1/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref
@@ -1 +1,2 @@
-Likely Bugs/Serialization/NonSerializableInnerClass.ql
+query: Likely Bugs/Serialization/NonSerializableInnerClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/NullMaybe/NullMaybe.qlref b/java/ql/test-kotlin1/query-tests/NullMaybe/NullMaybe.qlref
@@ -1 +1,2 @@
-Likely Bugs/Nullness/NullMaybe.ql
+query: Likely Bugs/Nullness/NullMaybe.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/OneStatementPerLine/OneStatementPerLine.qlref b/java/ql/test-kotlin1/query-tests/OneStatementPerLine/OneStatementPerLine.qlref
@@ -1 +1,2 @@
-Advisory/Statements/OneStatementPerLine.ql
+query: Advisory/Statements/OneStatementPerLine.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref b/java/ql/test-kotlin1/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/PartiallyMaskedCatch.ql
+query: Likely Bugs/Statements/PartiallyMaskedCatch.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref b/java/ql/test-kotlin1/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/ReturnValueIgnored.ql
+query: Likely Bugs/Statements/ReturnValueIgnored.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref b/java/ql/test-kotlin1/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
+query: Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref b/java/ql/test-kotlin1/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref
@@ -1 +1,2 @@
-Compatibility/JDK9/UnderscoreIdentifier.ql
+query: Compatibility/JDK9/UnderscoreIdentifier.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/UnreadLocal/UnreadLocal.qlref b/java/ql/test-kotlin1/query-tests/UnreadLocal/UnreadLocal.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Dead Code/UnreadLocal.ql
+query: Violations of Best Practice/Dead Code/UnreadLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/UnreadLocal/test.kt b/java/ql/test-kotlin1/query-tests/UnreadLocal/test.kt
@@ -5,13 +5,13 @@ fun fn0(size: Int) {
 }
 
 fun fn1(a: Array<Int>) {
-    for (e in a) {
+    for (e in a) { // $ Alert
         println()
     }
 }
 
 fun fn2(a: Array<Int>) {
-    for ((idx, e) in a.withIndex()) {
+    for ((idx, e) in a.withIndex()) { // $ Alert
         println()
     }
 }
diff --git a/java/ql/test-kotlin1/query-tests/UselessNullCheck/Test.kt b/java/ql/test-kotlin1/query-tests/UselessNullCheck/Test.kt
@@ -13,6 +13,6 @@ fun fn(x:Any?, y: Any?) {
 fun fn0(o: Any?) {
     if (o != null) {
         o?.toString()
-        o.toString()
+        o.toString() // $ Alert
     }
 }
diff --git a/java/ql/test-kotlin1/query-tests/UselessNullCheck/UselessNullCheck.qlref b/java/ql/test-kotlin1/query-tests/UselessNullCheck/UselessNullCheck.qlref
@@ -1 +1,2 @@
-Language Abuse/UselessNullCheck.ql
+query: Language Abuse/UselessNullCheck.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/UselessParameter/UselessParameter.qlref b/java/ql/test-kotlin1/query-tests/UselessParameter/UselessParameter.qlref
@@ -1 +1,2 @@
-DeadCode/UselessParameter.ql
+query: DeadCode/UselessParameter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin1/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref b/java/ql/test-kotlin1/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref
@@ -1 +1,2 @@
-Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+query: Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref b/java/ql/test-kotlin2/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
+query: Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/AutoBoxing/AutoBoxing.qlref b/java/ql/test-kotlin2/query-tests/AutoBoxing/AutoBoxing.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/legacy/AutoBoxing.ql
+query: Violations of Best Practice/legacy/AutoBoxing.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/CloseReader/CloseReader.qlref b/java/ql/test-kotlin2/query-tests/CloseReader/CloseReader.qlref
@@ -1 +1,2 @@
-Likely Bugs/Resource Leaks/CloseReader.ql
+query: Likely Bugs/Resource Leaks/CloseReader.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/CloseWriter/CloseWriter.qlref b/java/ql/test-kotlin2/query-tests/CloseWriter/CloseWriter.qlref
@@ -1 +1,2 @@
-Likely Bugs/Resource Leaks/CloseWriter.ql
+query: Likely Bugs/Resource Leaks/CloseWriter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/ConfusingOverloading/ConfusingOverloading.qlref b/java/ql/test-kotlin2/query-tests/ConfusingOverloading/ConfusingOverloading.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+query: Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/ConstantLoopCondition/A.kt b/java/ql/test-kotlin2/query-tests/ConstantLoopCondition/A.kt
@@ -2,21 +2,21 @@ fun fn0(f: Function0<Unit>) = f()
 
 fun fn1() {
     var c = true
-    while (c) { // TODO: false positive
+    while (c) { // $ SPURIOUS: Alert // TODO: false positive
         fn0 {
             c = false
         }
     }
 
     var d = true
-    while (d) {
+    while (d) { // $ Alert
         fn0 {
             println(d)
         }
     }
 
     val e = true
-    while (e) {
+    while (e) { // $ Alert
         fn0 {
             println(e)
         }
diff --git a/java/ql/test-kotlin2/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref b/java/ql/test-kotlin2/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref
@@ -1 +1,2 @@
-Likely Bugs/Termination/ConstantLoopCondition.ql
+query: Likely Bugs/Termination/ConstantLoopCondition.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/DeadCode/DeadClass.qlref b/java/ql/test-kotlin2/query-tests/DeadCode/DeadClass.qlref
@@ -1 +1,2 @@
-DeadCode/DeadClass.ql
+query: DeadCode/DeadClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/DeadCode/DeadMethod.qlref b/java/ql/test-kotlin2/query-tests/DeadCode/DeadMethod.qlref
@@ -1 +1,2 @@
-DeadCode/DeadMethod.ql
+query: DeadCode/DeadMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/DeadRefTypes/DeadRefTypes.qlref b/java/ql/test-kotlin2/query-tests/DeadRefTypes/DeadRefTypes.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Dead Code/DeadRefTypes.ql
+query: Violations of Best Practice/Dead Code/DeadRefTypes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/DeadRefTypes/test.kt b/java/ql/test-kotlin2/query-tests/DeadRefTypes/test.kt
@@ -1,4 +1,4 @@
-private class C1 { }
+private class C1 { } // $ Alert
 
 private class C2 { }
 
diff --git a/java/ql/test-kotlin2/query-tests/EmptyBlock/EmptyBlock.qlref b/java/ql/test-kotlin2/query-tests/EmptyBlock/EmptyBlock.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/EmptyBlock.ql
+query: Likely Bugs/Statements/EmptyBlock.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/ExposeRepresentation/ExposeRepresentation.qlref b/java/ql/test-kotlin2/query-tests/ExposeRepresentation/ExposeRepresentation.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+query: Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref b/java/ql/test-kotlin2/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref
@@ -1 +1,2 @@
-Performance/InnerClassCouldBeStatic.ql
+query: Performance/InnerClassCouldBeStatic.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref b/java/ql/test-kotlin2/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref
@@ -1 +1,2 @@
-Likely Bugs/Comparison/MissingInstanceofInEquals.ql
+query: Likely Bugs/Comparison/MissingInstanceofInEquals.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref b/java/ql/test-kotlin2/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref
@@ -1 +1,2 @@
-Advisory/Declarations/MissingOverrideAnnotation.ql
+query: Advisory/Declarations/MissingOverrideAnnotation.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/MutualDependency/MutualDependency.qlref b/java/ql/test-kotlin2/query-tests/MutualDependency/MutualDependency.qlref
@@ -1 +1,2 @@
-Architecture/Dependencies/MutualDependency.ql
+query: Architecture/Dependencies/MutualDependency.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref b/java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref
@@ -1 +1,2 @@
-Advisory/Naming/NamingConventionsRefTypes.ql
+query: Advisory/Naming/NamingConventionsRefTypes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/Test.kt b/java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/Test.kt
@@ -9,4 +9,4 @@ class Foo {
     }
 }
 
-class aaaa {}
+class aaaa {} // $ Alert
diff --git a/java/ql/test-kotlin2/query-tests/NonSerializableField/NonSerializableField.qlref b/java/ql/test-kotlin2/query-tests/NonSerializableField/NonSerializableField.qlref
@@ -1 +1,2 @@
-Likely Bugs/Serialization/NonSerializableField.ql
+query: Likely Bugs/Serialization/NonSerializableField.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref b/java/ql/test-kotlin2/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref
@@ -1 +1,2 @@
-Likely Bugs/Serialization/NonSerializableInnerClass.ql
+query: Likely Bugs/Serialization/NonSerializableInnerClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/NullMaybe/NullMaybe.qlref b/java/ql/test-kotlin2/query-tests/NullMaybe/NullMaybe.qlref
@@ -1 +1,2 @@
-Likely Bugs/Nullness/NullMaybe.ql
+query: Likely Bugs/Nullness/NullMaybe.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/OneStatementPerLine/OneStatementPerLine.qlref b/java/ql/test-kotlin2/query-tests/OneStatementPerLine/OneStatementPerLine.qlref
@@ -1 +1,2 @@
-Advisory/Statements/OneStatementPerLine.ql
+query: Advisory/Statements/OneStatementPerLine.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref b/java/ql/test-kotlin2/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/PartiallyMaskedCatch.ql
+query: Likely Bugs/Statements/PartiallyMaskedCatch.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref b/java/ql/test-kotlin2/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref
@@ -1 +1,2 @@
-Likely Bugs/Statements/ReturnValueIgnored.ql
+query: Likely Bugs/Statements/ReturnValueIgnored.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref b/java/ql/test-kotlin2/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
+query: Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref b/java/ql/test-kotlin2/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref
@@ -1 +1,2 @@
-Compatibility/JDK9/UnderscoreIdentifier.ql
+query: Compatibility/JDK9/UnderscoreIdentifier.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/UnreadLocal/UnreadLocal.qlref b/java/ql/test-kotlin2/query-tests/UnreadLocal/UnreadLocal.qlref
@@ -1 +1,2 @@
-Violations of Best Practice/Dead Code/UnreadLocal.ql
+query: Violations of Best Practice/Dead Code/UnreadLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/UnreadLocal/test.kt b/java/ql/test-kotlin2/query-tests/UnreadLocal/test.kt
@@ -5,13 +5,13 @@ fun fn0(size: Int) {
 }
 
 fun fn1(a: Array<Int>) {
-    for (e in a) {
+    for (e in a) { // $ Alert
         println()
     }
 }
 
 fun fn2(a: Array<Int>) {
-    for ((idx, e) in a.withIndex()) {
+    for ((idx, e) in a.withIndex()) { // $ Alert
         println()
     }
 }
diff --git a/java/ql/test-kotlin2/query-tests/UselessNullCheck/Test.kt b/java/ql/test-kotlin2/query-tests/UselessNullCheck/Test.kt
@@ -13,6 +13,6 @@ fun fn(x:Any?, y: Any?) {
 fun fn0(o: Any?) {
     if (o != null) {
         o?.toString()
-        o.toString()
+        o.toString() // $ Alert
     }
 }
diff --git a/java/ql/test-kotlin2/query-tests/UselessNullCheck/UselessNullCheck.qlref b/java/ql/test-kotlin2/query-tests/UselessNullCheck/UselessNullCheck.qlref
@@ -1 +1,2 @@
-Language Abuse/UselessNullCheck.ql
+query: Language Abuse/UselessNullCheck.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/UselessParameter/UselessParameter.qlref b/java/ql/test-kotlin2/query-tests/UselessParameter/UselessParameter.qlref
@@ -1 +1,2 @@
-DeadCode/UselessParameter.ql
+query: DeadCode/UselessParameter.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test-kotlin2/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref b/java/ql/test-kotlin2/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref
@@ -1 +1,2 @@
-Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+query: Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql`
	`1`	`+query: Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql`
	`1`	`+query: Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Violations of Best Practice/legacy/AutoBoxing.ql`
	`1`	`+query: Violations of Best Practice/legacy/AutoBoxing.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Likely Bugs/Resource Leaks/CloseReader.ql`
	`1`	`+query: Likely Bugs/Resource Leaks/CloseReader.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Likely Bugs/Resource Leaks/CloseWriter.ql`
	`1`	`+query: Likely Bugs/Resource Leaks/CloseWriter.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql`
	`1`	`+query: Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,21 @@ fun fn0(f: Function0<Unit>) = f()`
`2`	`2`
`3`	`3`	`fun fn1() {`
`4`	`4`	`var c = true`
`5`		`- while (c) { // TODO: false positive`
	`5`	`+ while (c) { // $ SPURIOUS: Alert // TODO: false positive`
`6`	`6`	`fn0 {`
`7`	`7`	`c = false`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`var d = true`
`12`		`- while (d) {`
	`12`	`+ while (d) { // $ Alert`
`13`	`13`	`fn0 {`
`14`	`14`	`println(d)`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`val e = true`
`19`		`- while (e) {`
	`19`	`+ while (e) { // $ Alert`
`20`	`20`	`fn0 {`
`21`	`21`	`println(e)`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Likely Bugs/Termination/ConstantLoopCondition.ql`
	`1`	`+query: Likely Bugs/Termination/ConstantLoopCondition.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-DeadCode/DeadClass.ql`
	`1`	`+query: DeadCode/DeadClass.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-DeadCode/DeadMethod.ql`
	`1`	`+query: DeadCode/DeadMethod.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`