Convert Ruby qlref tests to inline expectations

CODEOWNERS

@@ -59,5 +59,9 @@ MODULE.bazel @github/codeql-ci-reviewers
 /.github/workflows/rust.yml @github/codeql-rust
 /.github/workflows/swift.yml @github/codeql-swift
 
+# Misc
+/misc/scripts/accept-expected-changes-from-ci.py @RasmusWL
+/misc/scripts/generate-code-scanning-query-list.py @RasmusWL
+
 # .devcontainer
 /.devcontainer/ @github/codeql-ci-reviewers

actions/ql/lib/change-notes/2026-06-12-self_hosted_runners.md

@@ -1,4 +0,0 @@
----
-category: fix
----
-* The query `actions/pr-on-self-hosted-runner` was updated to the latest standard runner labels reducing false positive results.

actions/ql/lib/codeql/actions/security/SelfHostedQuery.qll

@@ -2,12 +2,10 @@ import actions
 
 bindingset[runner]
 predicate isGithubHostedRunner(string runner) {
-  // The list of github hosted repos:
-  // https://github.com/actions/runner-images/blob/main/README.md#available-images
-  // https://docs.github.com/en/enterprise-cloud@latest/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories
-  runner.toLowerCase().regexpMatch("^ubuntu-([0-9.]+|latest|slim)(-arm)?$") or
-  runner.toLowerCase().regexpMatch("^macos-([0-9]+|latest)(-x?large|-intel)?$") or
-  runner.toLowerCase().regexpMatch("^windows-([0-9.]+|latest)(-vs[0-9.]+)?(-arm)?$")
+  // list of github hosted repos: https://github.com/actions/runner-images/blob/main/README.md#available-images
+  runner
+      .toLowerCase()
+      .regexpMatch("^(ubuntu-([0-9.]+|latest)|macos-([0-9]+|latest)(-x?large)?|windows-([0-9.]+|latest))$")
 }
 
 bindingset[runner]

actions/ql/test/query-tests/Security/CWE-284/.github/workflows/test3.yml

@@ -1,43 +0,0 @@
-name: test
-
-on:
-  pull_request:
-
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-          - ubuntu-22.04
-          - ubuntu-22.04-arm
-          - ubuntu-26.04
-          - ubuntu-26.04-arm
-          - ubuntu-slim
-          - macos-26
-          - macos-26-xlarge
-          - macos-26-intel
-          - macos-26-large
-          - macos-latest-large
-          - macos-15-large
-          - macos-15
-          - macos-15-intel
-          - macos-latest
-          - macos-15
-          - macos-15-xlarge
-          - macos-14-large
-          - macos-14
-          - macos-14-xlarge
-          - windows-2025-vs2026
-          - windows-latest
-          - windows-2025
-          - windows-2022
-          - windows-11
-          - windows-11-arm
-          - windows-11-vs2026-arm
-    runs-on: ${{ matrix.os }}
-    steps:
-      - run: cmd

csharp/downgrades/d13c4c187d7318fd2b8f35c7e8d7f4dc26be68b1/upgrade.properties

@@ -1,2 +0,0 @@
-description: Restructure and rename types related to operations.
-compatibility: full

csharp/ql/lib/change-notes/2026-06-12-restructure-operations.md

@@ -1,4 +0,0 @@
----
-category: breaking
----
-* Renamed types related to *operation* expressions. The QL classes `BinaryArithmeticOperation`, `BinaryBitwiseOperation`, and `BinaryLogicalOperation` now include compound assignments; for example, `BinaryArithmeticOperation` now includes `a += b`.

csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll

@@ -50,15 +50,15 @@ private predicate maybeUsedInElfHashFunction(Variable v, Operation xor, Operatio
   |
     add instanceof AddOperation and
     e1.getAChild*() = add.getAnOperand() and
-    e1 instanceof BinaryBitwiseExpr and
-    e2 = e1.(BinaryBitwiseExpr).getLeftOperand() and
+    e1 instanceof BinaryBitwiseOperation and
+    e2 = e1.(BinaryBitwiseOperation).getLeftOperand() and
     v = addAssign.getTargetVariable() and
     addAssign.getAChild*() = add and
     (xor instanceof BitwiseXorExpr or xor instanceof AssignXorExpr) and
     addAssign.getControlFlowNode().getASuccessor*() = xor.getControlFlowNode() and
     xorAssign.getAChild*() = xor and
     v = xorAssign.getTargetVariable() and
-    (notOp instanceof UnaryBitwiseOperation or notOp instanceof AssignBitwiseExpr) and
+    (notOp instanceof UnaryBitwiseOperation or notOp instanceof AssignBitwiseOperation) and
     xor.getControlFlowNode().getASuccessor*() = notOp.getControlFlowNode() and
     notAssign.getAChild*() = notOp and
     v = notAssign.getTargetVariable() and

csharp/ql/lib/semmle/code/csharp/Assignable.qll

@@ -290,7 +290,7 @@ module AssignableInternal {
     newtype TAssignableDefinition =
       TAssignmentDefinition(Assignment a) {
         not a.getLeftOperand() instanceof TupleExpr and
-        not a instanceof AssignCallExpr and
+        not a instanceof AssignCallOperation and
         not a instanceof AssignCoalesceExpr
       } or
       TTupleAssignmentDefinition(AssignExpr ae, Expr leaf) { tupleAssignmentDefinition(ae, leaf) } or
@@ -324,7 +324,7 @@ module AssignableInternal {
       TAddressOfDefinition(AddressOfExpr aoe) or
       TPatternDefinition(TopLevelPatternDecl tlpd) or
       TAssignOperationDefinition(AssignOperation ao) {
-        ao instanceof AssignCallExpr and not ao instanceof CompoundAssignmentOperatorCall
+        ao instanceof AssignCallOperation and not ao instanceof CompoundAssignmentOperatorCall
         or
         ao instanceof AssignCoalesceExpr
       }

csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll

@@ -912,17 +912,18 @@ module Internal {
       )
     or
     // In C#, `null + 1` has type `int?` with value `null`
-    result =
-      any(BinaryArithmeticOperation bao |
-        exists(Expr o |
-          bao.getAnOperand() = e and
-          bao.getAnOperand() = o and
-          // The other operand must be provably non-null in order
-          // for `only if` to hold
-          nonNullValueImplied(o) and
-          e != o
-        )
-      )
+    exists(BinaryOperation bo, Expr o |
+      bo instanceof BinaryArithmeticOperation or
+      bo instanceof AssignArithmeticOperation
+    |
+      result = bo and
+      bo.getAnOperand() = e and
+      bo.getAnOperand() = o and
+      // The other operand must be provably non-null in order
+      // for `only if` to hold
+      nonNullValueImplied(o) and
+      e != o
+    )
   }
 
   /**
@@ -933,10 +934,10 @@ module Internal {
       any(QualifiableExpr qe |
         qe.isConditional() and
         result = qe.getQualifier()
-      )
-    or
+      ) or
     // In C#, `null + 1` has type `int?` with value `null`
-    e = any(BinaryArithmeticOperation bao | result = bao.getAnOperand())
+    e = any(BinaryArithmeticOperation bao | result = bao.getAnOperand()) or
+    e = any(AssignArithmeticOperation aao | result = aao.getAnOperand())
   }
 
   deprecated predicate isGuard(Expr e, GuardValue val) {

csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraph.qll

@@ -172,10 +172,6 @@ module Ast implements AstSig<Location> {
 
   class DoStmt = CS::DoStmt;
 
-  class UntilStmt extends LoopStmt {
-    UntilStmt() { none() }
-  }
-
   final private class FinalForStmt = CS::ForStmt;
 
   class ForStmt extends FinalForStmt {
@@ -207,7 +203,7 @@ module Ast implements AstSig<Location> {
   final private class FinalTryStmt = CS::TryStmt;
 
   class TryStmt extends FinalTryStmt {
-    AstNode getBody(int index) { index = 0 and result = this.getBlock() }
+    Stmt getBody() { result = this.getBlock() }
 
     CatchClause getCatch(int index) { result = this.getCatchClause(index) }
 

csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll

@@ -124,7 +124,9 @@ private module Internal {
       TDispatchDynamicOperatorCall(DynamicOperatorCall doc) or
       TDispatchDynamicMemberAccess(DynamicMemberAccess dma) or
       TDispatchDynamicElementAccess(DynamicElementAccess dea) or
-      TDispatchDynamicEventAccess(AssignArithmeticExpr aao, DynamicMemberAccess dma, string name) {
+      TDispatchDynamicEventAccess(
+        AssignArithmeticOperation aao, DynamicMemberAccess dma, string name
+      ) {
         isPotentialEventCall(aao, dma, name)
       } or
       TDispatchDynamicObjectCreation(DynamicObjectCreation doc) or
@@ -228,7 +230,7 @@ private module Internal {
    * accessor.
    */
   private predicate isPotentialEventCall(
-    AssignArithmeticExpr aao, DynamicMemberAccess dma, string name
+    AssignArithmeticOperation aao, DynamicMemberAccess dma, string name
   ) {
     aao instanceof DynamicOperatorCall and
     dma = aao.getLeftOperand() and
@@ -1395,7 +1397,9 @@ private module Internal {
   private class DispatchDynamicEventAccess extends DispatchReflectionOrDynamicCall,
     TDispatchDynamicEventAccess
   {
-    override AssignArithmeticExpr getCall() { this = TDispatchDynamicEventAccess(result, _, _) }
+    override AssignArithmeticOperation getCall() {
+      this = TDispatchDynamicEventAccess(result, _, _)
+    }
 
     override string getName() { this = TDispatchDynamicEventAccess(_, _, result) }
 

csharp/ql/lib/semmle/code/csharp/exprs/ArithmeticOperation.qll

@@ -11,27 +11,19 @@ import Expr
  * (`UnaryArithmeticOperation`) or a binary arithmetic operation
  * (`BinaryArithmeticOperation`).
  */
-class ArithmeticOperation extends Operation, @arith_operation {
+class ArithmeticOperation extends Operation, @arith_op_expr {
   override string getOperator() { none() }
 }
 
 /**
- * A binary arithmetic operation. Either a binary arithmetic expression (`BinaryArithmeticExpr`) or
- * an arithmetic assignment expression (`AssignArithmeticExpr`).
- */
-class BinaryArithmeticOperation extends ArithmeticOperation, BinaryOperation, @bin_arith_operation {
-  override string getOperator() { none() }
-}
-
-/**
- * A unary arithmetic operation. Either a unary minus expression
- * (`UnaryMinusExpr`), a unary plus expression (`UnaryPlusExpr`),
+ * A unary arithmetic operation. Either a unary minus operation
+ * (`UnaryMinusExpr`), a unary plus operation (`UnaryPlusExpr`),
  * or a mutator operation (`MutatorOperation`).
  */
-class UnaryArithmeticOperation extends ArithmeticOperation, UnaryOperation, @un_arith_operation { }
+class UnaryArithmeticOperation extends ArithmeticOperation, UnaryOperation, @un_arith_op_expr { }
 
 /**
- * A unary minus expression, for example `-x`.
+ * A unary minus operation, for example `-x`.
  */
 class UnaryMinusExpr extends UnaryArithmeticOperation, @minus_expr {
   override string getOperator() { result = "-" }
@@ -40,7 +32,7 @@ class UnaryMinusExpr extends UnaryArithmeticOperation, @minus_expr {
 }
 
 /**
- * A unary plus expression, for example `+x`.
+ * A unary plus operation, for example `+x`.
  */
 class UnaryPlusExpr extends UnaryArithmeticOperation, @plus_expr {
   override string getOperator() { result = "+" }
@@ -52,40 +44,40 @@ class UnaryPlusExpr extends UnaryArithmeticOperation, @plus_expr {
  * A mutator operation. Either an increment operation (`IncrementOperation`)
  * or a decrement operation (`DecrementOperation`).
  */
-class MutatorOperation extends UnaryArithmeticOperation, @mut_operation { }
+class MutatorOperation extends UnaryArithmeticOperation, @mut_op_expr { }
 
 /**
- * An increment operation. Either a postfix increment expression
- * (`PostIncrExpr`) or a prefix increment expression (`PreIncrExpr`).
+ * An increment operation. Either a postfix increment operation
+ * (`PostIncrExpr`) or a prefix increment operation (`PreIncrExpr`).
  */
-class IncrementOperation extends MutatorOperation, @incr_operation {
+class IncrementOperation extends MutatorOperation, @incr_op_expr {
   override string getOperator() { result = "++" }
 }
 
 /**
- * A decrement operation. Either a postfix decrement expression
- * (`PostDecrExpr`) or a prefix decrement expression (`PreDecrExpr`).
+ * A decrement operation. Either a postfix decrement operation
+ * (`PostDecrExpr`) or a prefix decrement operation (`PreDecrExpr`).
  */
-class DecrementOperation extends MutatorOperation, @decr_operation {
+class DecrementOperation extends MutatorOperation, @decr_op_expr {
   override string getOperator() { result = "--" }
 }
 
 /**
- * A prefix increment expression, for example `++x`.
+ * A prefix increment operation, for example `++x`.
  */
 class PreIncrExpr extends IncrementOperation, @pre_incr_expr {
   override string getAPrimaryQlClass() { result = "PreIncrExpr" }
 }
 
 /**
- * A prefix decrement expression, for example `--x`.
+ * A prefix decrement operation, for example `--x`.
  */
 class PreDecrExpr extends DecrementOperation, @pre_decr_expr {
   override string getAPrimaryQlClass() { result = "PreDecrExpr" }
 }
 
 /**
- * A postfix increment expression, for example `x++`.
+ * A postfix increment operation, for example `x++`.
  */
 class PostIncrExpr extends IncrementOperation, @post_incr_expr {
   override string toString() { result = "..." + this.getOperator() }
@@ -94,7 +86,7 @@ class PostIncrExpr extends IncrementOperation, @post_incr_expr {
 }
 
 /**
- * A postfix decrement expression, for example `x--`.
+ * A postfix decrement operation, for example `x--`.
  */
 class PostDecrExpr extends DecrementOperation, @post_decr_expr {
   override string toString() { result = "..." + this.getOperator() }
@@ -103,84 +95,55 @@ class PostDecrExpr extends DecrementOperation, @post_decr_expr {
 }
 
 /**
- * An addition operation, either `x + y` or `x += y`.
+ * A binary arithmetic operation. Either an addition operation
+ * (`AddExpr`), a subtraction operation (`SubExpr`), a multiplication
+ * operation (`MulExpr`), a division operation (`DivExpr`), or a
+ * remainder operation (`RemExpr`).
  */
-class AddOperation extends BinaryArithmeticOperation, @add_operation { }
-
-/**
- * A subtraction operation, either `x - y` or `x -= y`.
- */
-class SubOperation extends BinaryArithmeticOperation, @sub_operation { }
-
-/**
- * A multiplication operation, either `x * y` or `x *= y`.
- */
-class MulOperation extends BinaryArithmeticOperation, @mul_operation { }
-
-/**
- * A division operation, either `x / y` or `x /= y`.
- */
-class DivOperation extends BinaryArithmeticOperation, @div_operation {
-  /** Gets the numerator of this division operation. */
-  Expr getNumerator() { result = this.getLeftOperand() }
-
-  /** Gets the denominator of this division operation. */
-  Expr getDenominator() { result = this.getRightOperand() }
+class BinaryArithmeticOperation extends ArithmeticOperation, BinaryOperation, @bin_arith_op_expr {
+  override string getOperator() { none() }
 }
 
 /**
- * A remainder operation, either `x % y` or `x %= y`.
+ * An addition operation, for example `x + y`.
  */
-class RemOperation extends BinaryArithmeticOperation, @rem_operation { }
-
-/**
- * A binary arithmetic expression. Either an addition expression
- * (`AddExpr`), a subtraction expression (`SubExpr`), a multiplication
- * expression (`MulExpr`), a division expression (`DivExpr`), or a
- * remainder expression (`RemExpr`).
- */
-class BinaryArithmeticExpr extends BinaryArithmeticOperation, @bin_arith_expr { }
-
-/**
- * An addition expression, for example `x + y`.
- */
-class AddExpr extends BinaryArithmeticExpr, AddOperation, @add_expr {
+class AddExpr extends BinaryArithmeticOperation, AddOperation, @add_expr {
   override string getOperator() { result = "+" }
 
   override string getAPrimaryQlClass() { result = "AddExpr" }
 }
 
 /**
- * A subtraction expression, for example `x - y`.
+ * A subtraction operation, for example `x - y`.
  */
-class SubExpr extends BinaryArithmeticExpr, SubOperation, @sub_expr {
+class SubExpr extends BinaryArithmeticOperation, SubOperation, @sub_expr {
   override string getOperator() { result = "-" }
 
   override string getAPrimaryQlClass() { result = "SubExpr" }
 }
 
 /**
- * A multiplication expression, for example `x * y`.
+ * A multiplication operation, for example `x * y`.
  */
-class MulExpr extends BinaryArithmeticExpr, MulOperation, @mul_expr {
+class MulExpr extends BinaryArithmeticOperation, MulOperation, @mul_expr {
   override string getOperator() { result = "*" }
 
   override string getAPrimaryQlClass() { result = "MulExpr" }
 }
 
 /**
- * A division expression, for example `x / y`.
+ * A division operation, for example `x / y`.
  */
-class DivExpr extends BinaryArithmeticExpr, DivOperation, @div_expr {
+class DivExpr extends BinaryArithmeticOperation, DivOperation, @div_expr {
   override string getOperator() { result = "/" }
 
   override string getAPrimaryQlClass() { result = "DivExpr" }
 }
 
 /**
- * A remainder expression, for example `x % y`.
+ * A remainder operation, for example `x % y`.
  */
-class RemExpr extends BinaryArithmeticExpr, RemOperation, @rem_expr {
+class RemExpr extends BinaryArithmeticOperation, RemOperation, @rem_expr {
   override string getOperator() { result = "%" }
 
   override string getAPrimaryQlClass() { result = "RemExpr" }

csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll

@@ -72,9 +72,9 @@ class AssignExpr extends Assignment, @simple_assign_expr {
 }
 
 /**
- * An assignment operation. Either an arithmetic assignment expression
- * (`AssignArithmeticExpr`), a bitwise assignment expression
- * (`AssignBitwiseExpr`), an event assignment (`AddOrRemoveEventExpr`), or
+ * An assignment operation. Either an arithmetic assignment operation
+ * (`AssignArithmeticOperation`), a bitwise assignment operation
+ * (`AssignBitwiseOperation`), an event assignment (`AddOrRemoveEventExpr`), or
  * a null-coalescing assignment (`AssignCoalesceExpr`).
  */
 class AssignOperation extends Assignment, @assign_op_expr {
@@ -94,147 +94,134 @@ class AssignOperation extends Assignment, @assign_op_expr {
 }
 
 /**
- * A compound assignment expression that invokes an operator.
+ * A compound assignment operation that invokes an operator.
  *
  * (1) `x += y` invokes the compound assignment operator `+=` (if it exists).
  * (2) `x += y` invokes the operator `+` and assigns `x + y` to `x`.
  *
- * Either an arithmetic assignment expression (`AssignArithmeticExpr`) or a bitwise
- * assignment expression (`AssignBitwiseExpr`).
+ * Either an arithmetic assignment operation (`AssignArithmeticOperation`) or a bitwise
+ * assignment operation (`AssignBitwiseOperation`).
  */
-class AssignCallExpr extends AssignOperation, OperatorCall, QualifiableExpr, @assign_op_call_expr {
+class AssignCallOperation extends AssignOperation, OperatorCall, QualifiableExpr,
+  @assign_op_call_expr
+{
   override string toString() { result = AssignOperation.super.toString() }
 }
 
 /**
- * DEPRECATED: Use `AssignCallExpr` instead.
- */
-deprecated class AssignCallOperation = AssignCallExpr;
-
-/**
- * An arithmetic assignment expression. Either an addition assignment expression
- * (`AssignAddExpr`), a subtraction assignment expression (`AssignSubExpr`), a
- * multiplication assignment expression (`AssignMulExpr`), a division assignment
- * expression (`AssignDivExpr`), or a remainder assignment expression
+ * An arithmetic assignment operation. Either an addition assignment operation
+ * (`AssignAddExpr`), a subtraction assignment operation (`AssignSubExpr`), a
+ * multiplication assignment operation (`AssignMulExpr`), a division assignment
+ * operation (`AssignDivExpr`), or a remainder assignment operation
  * (`AssignRemExpr`).
  */
-class AssignArithmeticExpr extends AssignCallExpr, @assign_arith_expr { }
+class AssignArithmeticOperation extends AssignCallOperation, @assign_arith_expr { }
 
 /**
- * DEPRECATED: Use `AssignArithmeticExpr` instead.
+ * An addition assignment operation, for example `x += y`.
  */
-deprecated class AssignArithmeticOperation = AssignArithmeticExpr;
-
-/**
- * An addition assignment expression, for example `x += y`.
- */
-class AssignAddExpr extends AssignArithmeticExpr, AddOperation, @assign_add_expr {
+class AssignAddExpr extends AssignArithmeticOperation, AddOperation, @assign_add_expr {
   override string getOperator() { result = "+=" }
 
   override string getAPrimaryQlClass() { result = "AssignAddExpr" }
 }
 
 /**
- * A subtraction assignment expression, for example `x -= y`.
+ * A subtraction assignment operation, for example `x -= y`.
  */
-class AssignSubExpr extends AssignArithmeticExpr, SubOperation, @assign_sub_expr {
+class AssignSubExpr extends AssignArithmeticOperation, SubOperation, @assign_sub_expr {
   override string getOperator() { result = "-=" }
 
   override string getAPrimaryQlClass() { result = "AssignSubExpr" }
 }
 
 /**
- * A multiplication assignment expression, for example `x *= y`.
+ * An multiplication assignment operation, for example `x *= y`.
  */
-class AssignMulExpr extends AssignArithmeticExpr, MulOperation, @assign_mul_expr {
+class AssignMulExpr extends AssignArithmeticOperation, MulOperation, @assign_mul_expr {
   override string getOperator() { result = "*=" }
 
   override string getAPrimaryQlClass() { result = "AssignMulExpr" }
 }
 
 /**
- * A division assignment expression, for example `x /= y`.
+ * An division assignment operation, for example `x /= y`.
  */
-class AssignDivExpr extends AssignArithmeticExpr, DivOperation, @assign_div_expr {
+class AssignDivExpr extends AssignArithmeticOperation, DivOperation, @assign_div_expr {
   override string getOperator() { result = "/=" }
 
   override string getAPrimaryQlClass() { result = "AssignDivExpr" }
 }
 
 /**
- * A remainder assignment expression, for example `x %= y`.
+ * A remainder assignment operation, for example `x %= y`.
  */
-class AssignRemExpr extends AssignArithmeticExpr, RemOperation, @assign_rem_expr {
+class AssignRemExpr extends AssignArithmeticOperation, RemOperation, @assign_rem_expr {
   override string getOperator() { result = "%=" }
 
   override string getAPrimaryQlClass() { result = "AssignRemExpr" }
 }
 
 /**
- * A bitwise assignment expression. Either a bitwise-and assignment
- * expression (`AssignAndExpr`), a bitwise-or assignment
- * expression (`AssignOrExpr`), a bitwise exclusive-or assignment
- * expression (`AssignXorExpr`), a left-shift assignment
- * expression (`AssignLeftShiftExpr`), or a right-shift assignment
- * expression (`AssignRightShiftExpr`), or an unsigned right-shift assignment
- * expression (`AssignUnsignedRightShiftExpr`).
+ * A bitwise assignment operation. Either a bitwise-and assignment
+ * operation (`AssignAndExpr`), a bitwise-or assignment
+ * operation (`AssignOrExpr`), a bitwise exclusive-or assignment
+ * operation (`AssignXorExpr`), a left-shift assignment
+ * operation (`AssignLeftShiftExpr`), or a right-shift assignment
+ * operation (`AssignRightShiftExpr`), or an unsigned right-shift assignment
+ * operation (`AssignUnsignedRightShiftExpr`).
  */
-class AssignBitwiseExpr extends AssignCallExpr, @assign_bitwise_expr { }
+class AssignBitwiseOperation extends AssignCallOperation, @assign_bitwise_expr { }
 
 /**
- * DEPRECATED: Use `AssignBitwiseExpr` instead.
+ * A bitwise-and assignment operation, for example `x &= y`.
  */
-deprecated class AssignBitwiseOperation = AssignBitwiseExpr;
-
-/**
- * A bitwise-and assignment expression, for example `x &= y`.
- */
-class AssignAndExpr extends AssignBitwiseExpr, BitwiseAndOperation, @assign_and_expr {
+class AssignAndExpr extends AssignBitwiseOperation, BitwiseAndOperation, @assign_and_expr {
   override string getOperator() { result = "&=" }
 
   override string getAPrimaryQlClass() { result = "AssignAndExpr" }
 }
 
 /**
- * A bitwise-or assignment expression, for example `x |= y`.
+ * A bitwise-or assignment operation, for example `x |= y`.
  */
-class AssignOrExpr extends AssignBitwiseExpr, BitwiseOrOperation, @assign_or_expr {
+class AssignOrExpr extends AssignBitwiseOperation, BitwiseOrOperation, @assign_or_expr {
   override string getOperator() { result = "|=" }
 
   override string getAPrimaryQlClass() { result = "AssignOrExpr" }
 }
 
 /**
- * A bitwise exclusive-or assignment expression, for example `x ^= y`.
+ * A bitwise exclusive-or assignment operation, for example `x ^= y`.
  */
-class AssignXorExpr extends AssignBitwiseExpr, BitwiseXorOperation, @assign_xor_expr {
+class AssignXorExpr extends AssignBitwiseOperation, BitwiseXorOperation, @assign_xor_expr {
   override string getOperator() { result = "^=" }
 
   override string getAPrimaryQlClass() { result = "AssignXorExpr" }
 }
 
 /**
- * A left-shift assignment expression, for example `x <<= y`.
+ * A left-shift assignment operation, for example `x <<= y`.
  */
-class AssignLeftShiftExpr extends AssignBitwiseExpr, LeftShiftOperation, @assign_lshift_expr {
+class AssignLeftShiftExpr extends AssignBitwiseOperation, LeftShiftOperation, @assign_lshift_expr {
   override string getOperator() { result = "<<=" }
 
   override string getAPrimaryQlClass() { result = "AssignLeftShiftExpr" }
 }
 
 /**
- * A right-shift assignment expression, for example `x >>= y`.
+ * A right-shift assignment operation, for example `x >>= y`.
  */
-class AssignRightShiftExpr extends AssignBitwiseExpr, RightShiftOperation, @assign_rshift_expr {
+class AssignRightShiftExpr extends AssignBitwiseOperation, RightShiftOperation, @assign_rshift_expr {
   override string getOperator() { result = ">>=" }
 
   override string getAPrimaryQlClass() { result = "AssignRightShiftExpr" }
 }
 
 /**
- * An unsigned right-shift assignment expression, for example `x >>>= y`.
+ * An unsigned right-shift assignment operation, for example `x >>>= y`.
  */
-class AssignUnsignedRightShiftExpr extends AssignBitwiseExpr, UnsignedRightShiftOperation,
+class AssignUnsignedRightShiftExpr extends AssignBitwiseOperation, UnsignedRightShiftOperation,
   @assign_urshift_expr
 {
   override string getOperator() { result = ">>>=" }
@@ -310,10 +297,10 @@ class RemoveEventExpr extends AddOrRemoveEventExpr, @remove_event_expr {
 }
 
 /**
- * A null-coalescing assignment expression, for example `x ??= y`.
+ * A null-coalescing assignment operation, for example `x ??= y`.
  */
 class AssignCoalesceExpr extends AssignOperation, NullCoalescingOperation, @assign_coalesce_expr {
-  override string getOperator() { result = "??=" }
+  override string toString() { result = "... ??= ..." }
 
   override string getAPrimaryQlClass() { result = "AssignCoalesceExpr" }
 }

csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll

@@ -10,16 +10,16 @@ import Expr
  * A bitwise operation. Either a unary bitwise operation (`UnaryBitwiseOperation`)
  * or a binary bitwise operation (`BinaryBitwiseOperation`).
  */
-class BitwiseOperation extends Operation, @bit_operation { }
+class BitwiseOperation extends Operation, @bit_expr { }
 
 /**
  * A unary bitwise operation, that is, a bitwise complement operation
  * (`ComplementExpr`).
  */
-class UnaryBitwiseOperation extends BitwiseOperation, UnaryOperation, @un_bit_operation { }
+class UnaryBitwiseOperation extends BitwiseOperation, UnaryOperation, @un_bit_op_expr { }
 
 /**
- * A bitwise complement expression, for example `~x`.
+ * A bitwise complement operation, for example `~x`.
  */
 class ComplementExpr extends UnaryBitwiseOperation, @bit_not_expr {
   override string getOperator() { result = "~" }
@@ -28,101 +28,67 @@ class ComplementExpr extends UnaryBitwiseOperation, @bit_not_expr {
 }
 
 /**
- * A binary bitwise operation. Either a binary bitwise expression (`BinaryBitwiseExpr`) or
- * a bitwise assignment expression (`AssignBitwiseExpr`).
+ * A binary bitwise operation. Either a bitwise-and operation
+ * (`BitwiseAndExpr`), a bitwise-or operation (`BitwiseOrExpr`),
+ * a bitwise exclusive-or operation (`BitwiseXorExpr`), a left-shift
+ * operation (`LeftShiftExpr`), a right-shift operation (`RightShiftExpr`),
+ * or an unsigned right-shift operation (`UnsignedRightShiftExpr`).
  */
-class BinaryBitwiseOperation extends BitwiseOperation, BinaryOperation, @bin_bit_operation {
+class BinaryBitwiseOperation extends BitwiseOperation, BinaryOperation, @bin_bit_op_expr {
   override string getOperator() { none() }
 }
 
 /**
- * A bitwise-and operation, either `x & y` or `x &= y`.
+ * A left-shift operation, for example `x << y`.
  */
-class BitwiseAndOperation extends BinaryBitwiseOperation, @and_operation { }
-
-/**
- * A bitwise-or operation, either `x | y` or `x |= y`.
- */
-class BitwiseOrOperation extends BinaryBitwiseOperation, @or_operation { }
-
-/**
- * A bitwise exclusive-or operation, either `x ^ y` or `x ^= y`.
- */
-class BitwiseXorOperation extends BinaryBitwiseOperation, @xor_operation { }
-
-/**
- * A left-shift operation, either `x << y` or `x <<= y`.
- */
-class LeftShiftOperation extends BinaryBitwiseOperation, @lshift_operation { }
-
-/**
- * A right-shift operation, either `x >> y` or `x >>= y`.
- */
-class RightShiftOperation extends BinaryBitwiseOperation, @rshift_operation { }
-
-/**
- * An unsigned right-shift operation, either `x >>> y` or `x >>>= y`.
- */
-class UnsignedRightShiftOperation extends BinaryBitwiseOperation, @urshift_operation { }
-
-/**
- * A binary bitwise expression. Either a bitwise-and expression
- * (`BitwiseAndExpr`), a bitwise-or expression (`BitwiseOrExpr`),
- * a bitwise exclusive-or expression (`BitwiseXorExpr`), a left-shift
- * expression (`LeftShiftExpr`), a right-shift expression (`RightShiftExpr`),
- * or an unsigned right-shift expression (`UnsignedRightShiftExpr`).
- */
-class BinaryBitwiseExpr extends BinaryBitwiseOperation, @bin_bit_expr { }
-
-/**
- * A left-shift expression, for example `x << y`.
- */
-class LeftShiftExpr extends BinaryBitwiseExpr, LeftShiftOperation, @lshift_expr {
+class LeftShiftExpr extends BinaryBitwiseOperation, LeftShiftOperation, @lshift_expr {
   override string getOperator() { result = "<<" }
 
   override string getAPrimaryQlClass() { result = "LeftShiftExpr" }
 }
 
 /**
- * A right-shift expression, for example `x >> y`.
+ * A right-shift operation, for example `x >> y`.
  */
-class RightShiftExpr extends BinaryBitwiseExpr, RightShiftOperation, @rshift_expr {
+class RightShiftExpr extends BinaryBitwiseOperation, RightShiftOperation, @rshift_expr {
   override string getOperator() { result = ">>" }
 
   override string getAPrimaryQlClass() { result = "RightShiftExpr" }
 }
 
 /**
- * An unsigned right-shift expression, for example `x >>> y`.
+ * An unsigned right-shift operation, for example `x >>> y`.
  */
-class UnsignedRightShiftExpr extends BinaryBitwiseExpr, UnsignedRightShiftOperation, @urshift_expr {
+class UnsignedRightShiftExpr extends BinaryBitwiseOperation, UnsignedRightShiftOperation,
+  @urshift_expr
+{
   override string getOperator() { result = ">>>" }
 
   override string getAPrimaryQlClass() { result = "UnsignedRightShiftExpr" }
 }
 
 /**
- * A bitwise-and expression, for example `x & y`.
+ * A bitwise-and operation, for example `x & y`.
  */
-class BitwiseAndExpr extends BinaryBitwiseExpr, BitwiseAndOperation, @bit_and_expr {
+class BitwiseAndExpr extends BinaryBitwiseOperation, BitwiseAndOperation, @bit_and_expr {
   override string getOperator() { result = "&" }
 
   override string getAPrimaryQlClass() { result = "BitwiseAndExpr" }
 }
 
 /**
- * A bitwise-or expression, for example `x | y`.
+ * A bitwise-or operation, for example `x | y`.
  */
-class BitwiseOrExpr extends BinaryBitwiseExpr, BitwiseOrOperation, @bit_or_expr {
+class BitwiseOrExpr extends BinaryBitwiseOperation, BitwiseOrOperation, @bit_or_expr {
   override string getOperator() { result = "|" }
 
   override string getAPrimaryQlClass() { result = "BitwiseOrExpr" }
 }
 
 /**
- * A bitwise exclusive-or expression, for example `x ^ y`.
+ * A bitwise exclusive-or operation, for example `x ^ y`.
  */
-class BitwiseXorExpr extends BinaryBitwiseExpr, BitwiseXorOperation, @bit_xor_expr {
+class BitwiseXorExpr extends BinaryBitwiseOperation, BitwiseXorOperation, @bit_xor_expr {
   override string getOperator() { result = "^" }
 
   override string getAPrimaryQlClass() { result = "BitwiseXorExpr" }

csharp/ql/lib/semmle/code/csharp/exprs/Call.qll

@@ -609,7 +609,7 @@ class InstanceMutatorOperatorCall extends MutatorOperatorCall {
  * }
  * ```
  */
-class CompoundAssignmentOperatorCall extends AssignCallExpr {
+class CompoundAssignmentOperatorCall extends AssignCallOperation {
   CompoundAssignmentOperatorCall() { this.getTarget() instanceof CompoundAssignmentOperator }
 
   override Expr getArgument(int i) { result = this.getChildExpr(i + 1) and i >= 0 }

csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll

@@ -14,6 +14,7 @@ import Creation
 import Dynamic
 import Literal
 import LogicalOperation
+import Operation
 import semmle.code.csharp.controlflow.ControlFlowElement
 import semmle.code.csharp.Location
 import semmle.code.csharp.Stmt
@@ -211,7 +212,7 @@ class LocalConstantDeclExpr extends LocalVariableDeclExpr {
  * (`UnaryOperation`), a binary operation (`BinaryOperation`), or a
  * ternary operation (`TernaryOperation`).
  */
-class Operation extends Expr, @operation_expr {
+class Operation extends Expr, @op_expr {
   /** Gets the name of the operator in this operation. */
   string getOperator() { none() }
 
@@ -226,7 +227,7 @@ class Operation extends Expr, @operation_expr {
  * indirection operation (`PointerIndirectionExpr`), an address-of operation
  * (`AddressOfExpr`), or a unary logical operation (`UnaryLogicalOperation`).
  */
-class UnaryOperation extends Operation, @un_operation {
+class UnaryOperation extends Operation, @un_op {
   /** Gets the operand of this unary operation. */
   Expr getOperand() { result = this.getChild(0) }
 
@@ -240,7 +241,7 @@ class UnaryOperation extends Operation, @un_operation {
  * a binary logical operation (`BinaryLogicalOperation`), or an
  * assignment (`Assignment`).
  */
-class BinaryOperation extends Operation, @bin_operation {
+class BinaryOperation extends Operation, @bin_op {
   /** Gets the left operand of this binary operation. */
   Expr getLeftOperand() { result = this.getChild(0) }
 
@@ -263,7 +264,7 @@ class BinaryOperation extends Operation, @bin_operation {
  * A ternary operation, that is, a ternary conditional operation
  * (`ConditionalExpr`).
  */
-class TernaryOperation extends Operation, @ternary_operation { }
+class TernaryOperation extends Operation, @ternary_op { }
 
 /**
  * A parenthesized expression, for example `(2 + 3)` in

csharp/ql/lib/semmle/code/csharp/exprs/LogicalOperation.qll

@@ -11,14 +11,14 @@ import Expr
  * a binary logical operation (`BinaryLogicalOperation`), or a ternary logical
  * operation (`TernaryLogicalOperation`).
  */
-class LogicalOperation extends Operation, @log_operation {
+class LogicalOperation extends Operation, @log_expr {
   override string getOperator() { none() }
 }
 
 /**
  * A unary logical operation, that is, a logical 'not' (`LogicalNotExpr`).
  */
-class UnaryLogicalOperation extends LogicalOperation, UnaryOperation, @un_log_operation { }
+class UnaryLogicalOperation extends LogicalOperation, UnaryOperation, @un_log_op_expr { }
 
 /**
  * A logical 'not', for example `!String.IsNullOrEmpty(s)`.
@@ -31,10 +31,10 @@ class LogicalNotExpr extends UnaryLogicalOperation, @log_not_expr {
 
 /**
  * A binary logical operation. Either a logical 'and' (`LogicalAndExpr`),
- * a logical 'or' (`LogicalOrExpr`), or a null-coalescing operation
- * (`NullCoalescingOperation`).
+ * a logical 'or' (`LogicalAndExpr`), or a null-coalescing operation
+ * (`NullCoalescingExpr`).
  */
-class BinaryLogicalOperation extends LogicalOperation, BinaryOperation, @bin_log_operation {
+class BinaryLogicalOperation extends LogicalOperation, BinaryOperation, @bin_log_op_expr {
   override string getOperator() { none() }
 }
 
@@ -57,12 +57,7 @@ class LogicalOrExpr extends BinaryLogicalOperation, @log_or_expr {
 }
 
 /**
- * A null-coalescing operation, either `x ?? y` or `x ??= y`.
- */
-class NullCoalescingOperation extends BinaryLogicalOperation, @null_coalescing_operation { }
-
-/**
- * A null-coalescing expression, for example `s ?? ""` on line 2 in
+ * A null-coalescing operation, for example `s ?? ""` on line 2 in
  *
  * ```csharp
  * string NonNullOrEmpty(string s) {
@@ -70,7 +65,9 @@ class NullCoalescingOperation extends BinaryLogicalOperation, @null_coalescing_o
  * }
  * ```
  */
-class NullCoalescingExpr extends NullCoalescingOperation, @null_coalescing_expr {
+class NullCoalescingExpr extends BinaryLogicalOperation, NullCoalescingOperation,
+  @null_coalescing_expr
+{
   override string getOperator() { result = "??" }
 
   override string getAPrimaryQlClass() { result = "NullCoalescingExpr" }
@@ -80,7 +77,7 @@ class NullCoalescingExpr extends NullCoalescingOperation, @null_coalescing_expr
  * A ternary logical operation, that is, a ternary conditional expression
  * (`ConditionalExpr`).
  */
-class TernaryLogicalOperation extends LogicalOperation, TernaryOperation, @ternary_log_operation { }
+class TernaryLogicalOperation extends LogicalOperation, TernaryOperation, @ternary_log_op_expr { }
 
 /**
  * A conditional expression, for example `s != null ? s.Length : -1`

csharp/ql/lib/semmle/code/csharp/exprs/Operation.qll

@@ -1,6 +1,71 @@
 /**
  * Provides classes for operations that also have compound assignment forms.
  */
-deprecated module;
 
 import Expr
+
+/**
+ * An addition operation, either `x + y` or `x += y`.
+ */
+class AddOperation extends BinaryOperation, @add_operation { }
+
+/**
+ * A subtraction operation, either `x - y` or `x -= y`.
+ */
+class SubOperation extends BinaryOperation, @sub_operation { }
+
+/**
+ * A multiplication operation, either `x * y` or `x *= y`.
+ */
+class MulOperation extends BinaryOperation, @mul_operation { }
+
+/**
+ * A division operation, either `x / y` or `x /= y`.
+ */
+class DivOperation extends BinaryOperation, @div_operation {
+  /** Gets the numerator of this division operation. */
+  Expr getNumerator() { result = this.getLeftOperand() }
+
+  /** Gets the denominator of this division operation. */
+  Expr getDenominator() { result = this.getRightOperand() }
+}
+
+/**
+ * A remainder operation, either `x % y` or `x %= y`.
+ */
+class RemOperation extends BinaryOperation, @rem_operation { }
+
+/**
+ * A bitwise-and operation, either `x & y` or `x &= y`.
+ */
+class BitwiseAndOperation extends BinaryOperation, @and_operation { }
+
+/**
+ * A bitwise-or operation, either `x | y` or `x |= y`.
+ */
+class BitwiseOrOperation extends BinaryOperation, @or_operation { }
+
+/**
+ * A bitwise exclusive-or operation, either `x ^ y` or `x ^= y`.
+ */
+class BitwiseXorOperation extends BinaryOperation, @xor_operation { }
+
+/**
+ * A left-shift operation, either `x << y` or `x <<= y`.
+ */
+class LeftShiftOperation extends BinaryOperation, @lshift_operation { }
+
+/**
+ * A right-shift operation, either `x >> y` or `x >>= y`.
+ */
+class RightShiftOperation extends BinaryOperation, @rshift_operation { }
+
+/**
+ * An unsigned right-shift operation, either `x >>> y` or `x >>>= y`.
+ */
+class UnsignedRightShiftOperation extends BinaryOperation, @urshift_operation { }
+
+/**
+ * A null-coalescing operation, either `x ?? y` or `x ??= y`.
+ */
+class NullCoalescingOperation extends BinaryOperation, @null_coalescing_operation { }

csharp/ql/lib/semmlecode.csharp.dbscheme

@@ -1254,39 +1254,33 @@ case @expr.kind of
 
 @delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
 
-@bin_arith_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
-@bin_arith_operation = @mul_operation | @div_operation | @rem_operation | @add_operation | @sub_operation;
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
 
-@incr_operation =  @pre_incr_expr | @post_incr_expr;
-@decr_operation =  @pre_decr_expr | @post_decr_expr;
-@mut_operation = @incr_operation | @decr_operation;
-@un_arith_operation = @plus_expr | @minus_expr | @mut_operation;
-@arith_operation = @bin_arith_operation | @un_arith_operation;
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
 
-@ternary_log_operation = @conditional_expr;
-@bin_log_operation = @log_and_expr | @log_or_expr | @null_coalescing_operation;
-@un_log_operation = @log_not_expr;
-@log_operation = @un_log_operation | @bin_log_operation | @ternary_log_operation;
-
-@bin_bit_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
-              | @rshift_expr | @urshift_expr;
-@bin_bit_operation = @and_operation | @or_operation | @xor_operation | @lshift_operation
-              | @rshift_operation | @urshift_operation;
-@un_bit_expr = @bit_not_expr;
-@un_bit_operation = @un_bit_expr;
-@bit_expr = @un_bit_expr | @bin_bit_expr;
-@bit_operation = @un_bit_operation | @bin_bit_operation;
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
 
 @equality_op_expr =  @eq_expr | @ne_expr;
 @rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
 @comp_expr = @equality_op_expr | @rel_op_expr;
 
-@operation_expr = @un_operation | @bin_operation | @ternary_operation;
+@op_expr = @un_op | @bin_op | @ternary_op;
 
-@ternary_operation = @ternary_log_operation;
-@bin_operation = @assign_expr | @bin_arith_operation | @bin_log_operation | @bin_bit_operation | @comp_expr;
-@un_operation = @un_arith_operation | @un_log_operation | @un_bit_operation | @sizeof_expr
-              | @pointer_indirection_expr | @address_of_expr;
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
 
 @anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
 

csharp/ql/lib/upgrades/3cabc77473cbbda95edebafea345c2e3fdfa12d9/upgrade.properties

@@ -1,2 +0,0 @@
-description: Restructure and rename types related to operations.
-compatibility: full

csharp/ql/test/library-tests/csharp11/operators.expected

@@ -1,7 +1,6 @@
 binarybitwise
 | Operators.cs:7:18:7:25 | ... >>> ... | Operators.cs:7:18:7:19 | access to local variable x1 | Operators.cs:7:25:7:25 | 2 | >>> | UnsignedRightShiftExpr |
 | Operators.cs:10:18:10:25 | ... >>> ... | Operators.cs:10:18:10:19 | access to local variable y1 | Operators.cs:10:25:10:25 | 3 | >>> | UnsignedRightShiftExpr |
-| Operators.cs:13:9:13:16 | ... >>>= ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>>= | AssignUnsignedRightShiftExpr |
 assignbitwise
 | Operators.cs:13:9:13:16 | ... >>>= ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>>= | AssignUnsignedRightShiftExpr |
 userdefined

csharp/ql/test/library-tests/csharp11/operators.ql

@@ -11,7 +11,7 @@ query predicate binarybitwise(
 }
 
 query predicate assignbitwise(
-  AssignBitwiseExpr op, Expr left, Expr right, string name, string qlclass
+  AssignBitwiseOperation op, Expr left, Expr right, string name, string qlclass
 ) {
   op.getFile().getStem() = "Operators" and
   left = op.getLeftOperand() and

go/extractor/go.mod

@@ -10,7 +10,7 @@ toolchain go1.26.4
 //    bazel mod tidy
 require (
 	golang.org/x/mod v0.37.0
-	golang.org/x/tools v0.46.0
+	golang.org/x/tools v0.45.0
 )
 
 require github.com/stretchr/testify v1.11.1
@@ -18,6 +18,6 @@ require github.com/stretchr/testify v1.11.1
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sync v0.21.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go/extractor/go.sum

@@ -8,10 +8,10 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
 golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk=
-golang.org/x/tools v0.46.0/go.mod h1:FrD85F8l+NWL+9XWBSyVSHO6Ne4jutsfIFba7AWQ5Ys=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
+golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

java/ql/integration-tests/kotlin/all-platforms/gradle_kotlinx_serialization/ConstantExpAppearsNonConstant.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -84,10 +84,6 @@ private module Ast implements AstSig<Location> {
 
   class DoStmt = J::DoStmt;
 
-  class UntilStmt extends LoopStmt {
-    UntilStmt() { none() }
-  }
-
   final private class FinalForStmt = J::ForStmt;
 
   class ForStmt extends FinalForStmt {
@@ -121,18 +117,15 @@ private module Ast implements AstSig<Location> {
   final private class FinalTryStmt = J::TryStmt;
 
   class TryStmt extends FinalTryStmt {
-    AstNode getBody(int index) {
-      result = super.getResource(index)
-      or
-      index = count(super.getAResource()) and
-      result = super.getBlock()
-    }
+    Stmt getBody() { result = super.getBlock() }
 
     CatchClause getCatch(int index) { result = super.getCatchClause(index) }
 
     Stmt getFinally() { result = super.getFinally() }
   }
 
+  AstNode getTryInit(TryStmt try, int index) { result = try.getResource(index) }
+
   final private class FinalCatchClause = J::CatchClause;
 
   class CatchClause extends FinalCatchClause {

java/ql/test-kotlin1/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql

java/ql/test-kotlin1/query-tests/AutoBoxing/AutoBoxing.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/legacy/AutoBoxing.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/legacy/AutoBoxing.ql

java/ql/test-kotlin1/query-tests/CloseReader/CloseReader.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Resource Leaks/CloseReader.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Resource Leaks/CloseReader.ql

java/ql/test-kotlin1/query-tests/CloseWriter/CloseWriter.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Resource Leaks/CloseWriter.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Resource Leaks/CloseWriter.ql

java/ql/test-kotlin1/query-tests/ConfusingOverloading/ConfusingOverloading.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql

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) { // $ SPURIOUS: Alert // TODO: false positive
+    while (c) { // TODO: false positive
         fn0 {
             c = false
         }
     }
 
     var d = true
-    while (d) { // $ Alert
+    while (d) {
         fn0 {
             println(d)
         }
     }
 
     val e = true
-    while (e) { // $ Alert
+    while (e) {
         fn0 {
             println(e)
         }

java/ql/test-kotlin1/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Termination/ConstantLoopCondition.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Termination/ConstantLoopCondition.ql

java/ql/test-kotlin1/query-tests/DeadCode/DeadClass.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadClass.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadClass.ql

java/ql/test-kotlin1/query-tests/DeadCode/DeadMethod.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadMethod.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadMethod.ql

java/ql/test-kotlin1/query-tests/DeadRefTypes/DeadRefTypes.expected

@@ -1 +1 @@
-| test.kt:1:1:1:31 | C1 | Unused class: C1 is not referenced within this codebase. If not used as an external API it should be removed. |
+| test.kt:1:1:1:20 | C1 | Unused class: C1 is not referenced within this codebase. If not used as an external API it should be removed. |

java/ql/test-kotlin1/query-tests/DeadRefTypes/DeadRefTypes.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Dead Code/DeadRefTypes.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Dead Code/DeadRefTypes.ql

java/ql/test-kotlin1/query-tests/DeadRefTypes/test.kt

@@ -1,4 +1,4 @@
-private class C1 { } // $ Alert
+private class C1 { }
 
 private class C2 { }
 

java/ql/test-kotlin1/query-tests/EmptyBlock/EmptyBlock.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/EmptyBlock.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/EmptyBlock.ql

java/ql/test-kotlin1/query-tests/ExposeRepresentation/ExposeRepresentation.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql

java/ql/test-kotlin1/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref

@@ -1,2 +1 @@
-query: Performance/InnerClassCouldBeStatic.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Performance/InnerClassCouldBeStatic.ql

java/ql/test-kotlin1/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Comparison/MissingInstanceofInEquals.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Comparison/MissingInstanceofInEquals.ql

java/ql/test-kotlin1/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref

@@ -1,2 +1 @@
-query: Advisory/Declarations/MissingOverrideAnnotation.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Declarations/MissingOverrideAnnotation.ql

java/ql/test-kotlin1/query-tests/MutualDependency/MutualDependency.qlref

@@ -1,2 +1 @@
-query: Architecture/Dependencies/MutualDependency.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Architecture/Dependencies/MutualDependency.ql

java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.expected

@@ -1 +1 @@
-| Test.kt:12:1:12:24 | aaaa | Class and interface names should start in uppercase. |
+| Test.kt:12:1:12:13 | aaaa | Class and interface names should start in uppercase. |

java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref

@@ -1,2 +1 @@
-query: Advisory/Naming/NamingConventionsRefTypes.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Naming/NamingConventionsRefTypes.ql

java/ql/test-kotlin1/query-tests/NamingConventionsRefTypes/Test.kt

@@ -9,4 +9,4 @@ class Foo {
     }
 }
 
-class aaaa {} // $ Alert
+class aaaa {}

java/ql/test-kotlin1/query-tests/NonSerializableField/NonSerializableField.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Serialization/NonSerializableField.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Serialization/NonSerializableField.ql

java/ql/test-kotlin1/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Serialization/NonSerializableInnerClass.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Serialization/NonSerializableInnerClass.ql

java/ql/test-kotlin1/query-tests/NullMaybe/NullMaybe.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Nullness/NullMaybe.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Nullness/NullMaybe.ql

java/ql/test-kotlin1/query-tests/OneStatementPerLine/OneStatementPerLine.qlref

@@ -1,2 +1 @@
-query: Advisory/Statements/OneStatementPerLine.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Statements/OneStatementPerLine.ql

java/ql/test-kotlin1/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/PartiallyMaskedCatch.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/PartiallyMaskedCatch.ql

java/ql/test-kotlin1/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/ReturnValueIgnored.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/ReturnValueIgnored.ql

java/ql/test-kotlin1/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql

java/ql/test-kotlin1/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref

@@ -1,2 +1 @@
-query: Compatibility/JDK9/UnderscoreIdentifier.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Compatibility/JDK9/UnderscoreIdentifier.ql

java/ql/test-kotlin1/query-tests/UnreadLocal/UnreadLocal.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Dead Code/UnreadLocal.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Dead Code/UnreadLocal.ql

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) { // $ Alert
+    for (e in a) {
         println()
     }
 }
 
 fun fn2(a: Array<Int>) {
-    for ((idx, e) in a.withIndex()) { // $ Alert
+    for ((idx, e) in a.withIndex()) {
         println()
     }
 }

java/ql/test-kotlin1/query-tests/UselessNullCheck/Test.kt

@@ -12,7 +12,7 @@ fun fn(x:Any?, y: Any?) {
 
 fun fn0(o: Any?) {
     if (o != null) {
-        o?.toString() // $ Alert
+        o?.toString()
         o.toString()
     }
 }

java/ql/test-kotlin1/query-tests/UselessNullCheck/UselessNullCheck.qlref

@@ -1,2 +1 @@
-query: Language Abuse/UselessNullCheck.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Language Abuse/UselessNullCheck.ql

java/ql/test-kotlin1/query-tests/UselessParameter/UselessParameter.qlref

@@ -1,2 +1 @@
-query: DeadCode/UselessParameter.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/UselessParameter.ql

java/ql/test-kotlin1/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql

java/ql/test-kotlin2/query-tests/AbstractToConcreteCollection/AbstractToConcreteCollection.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql

java/ql/test-kotlin2/query-tests/AutoBoxing/AutoBoxing.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/legacy/AutoBoxing.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/legacy/AutoBoxing.ql

java/ql/test-kotlin2/query-tests/CloseReader/CloseReader.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Resource Leaks/CloseReader.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Resource Leaks/CloseReader.ql

java/ql/test-kotlin2/query-tests/CloseWriter/CloseWriter.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Resource Leaks/CloseWriter.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Resource Leaks/CloseWriter.ql

java/ql/test-kotlin2/query-tests/ConfusingOverloading/ConfusingOverloading.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql

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) { // $ SPURIOUS: Alert // TODO: false positive
+    while (c) { // TODO: false positive
         fn0 {
             c = false
         }
     }
 
     var d = true
-    while (d) { // $ Alert
+    while (d) {
         fn0 {
             println(d)
         }
     }
 
     val e = true
-    while (e) { // $ Alert
+    while (e) {
         fn0 {
             println(e)
         }

java/ql/test-kotlin2/query-tests/ConstantLoopCondition/ConstantLoopCondition.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Termination/ConstantLoopCondition.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Termination/ConstantLoopCondition.ql

java/ql/test-kotlin2/query-tests/DeadCode/DeadClass.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadClass.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadClass.ql

java/ql/test-kotlin2/query-tests/DeadCode/DeadMethod.qlref

@@ -1,2 +1 @@
-query: DeadCode/DeadMethod.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/DeadMethod.ql

java/ql/test-kotlin2/query-tests/DeadRefTypes/DeadRefTypes.expected

@@ -1 +1 @@
-| test.kt:1:1:1:31 | C1 | Unused class: C1 is not referenced within this codebase. If not used as an external API it should be removed. |
+| test.kt:1:1:1:20 | C1 | Unused class: C1 is not referenced within this codebase. If not used as an external API it should be removed. |

java/ql/test-kotlin2/query-tests/DeadRefTypes/DeadRefTypes.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Dead Code/DeadRefTypes.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Dead Code/DeadRefTypes.ql

java/ql/test-kotlin2/query-tests/DeadRefTypes/test.kt

@@ -1,4 +1,4 @@
-private class C1 { } // $ Alert
+private class C1 { }
 
 private class C2 { }
 

java/ql/test-kotlin2/query-tests/EmptyBlock/EmptyBlock.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/EmptyBlock.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/EmptyBlock.ql

java/ql/test-kotlin2/query-tests/ExposeRepresentation/ExposeRepresentation.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql

java/ql/test-kotlin2/query-tests/InnerClassCouldBeStatic/InnerClassCouldBeStatic.qlref

@@ -1,2 +1 @@
-query: Performance/InnerClassCouldBeStatic.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Performance/InnerClassCouldBeStatic.ql

java/ql/test-kotlin2/query-tests/MissingInstanceofInEquals/MissingInstanceofInEquals.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Comparison/MissingInstanceofInEquals.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Comparison/MissingInstanceofInEquals.ql

java/ql/test-kotlin2/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.qlref

@@ -1,2 +1 @@
-query: Advisory/Declarations/MissingOverrideAnnotation.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Declarations/MissingOverrideAnnotation.ql

java/ql/test-kotlin2/query-tests/MutualDependency/MutualDependency.qlref

@@ -1,2 +1 @@
-query: Architecture/Dependencies/MutualDependency.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Architecture/Dependencies/MutualDependency.ql

java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.expected

@@ -1 +1 @@
-| Test.kt:12:1:12:24 | aaaa | Class and interface names should start in uppercase. |
+| Test.kt:12:1:12:13 | aaaa | Class and interface names should start in uppercase. |

java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/NamingConventionsRefTypes.qlref

@@ -1,2 +1 @@
-query: Advisory/Naming/NamingConventionsRefTypes.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Naming/NamingConventionsRefTypes.ql

java/ql/test-kotlin2/query-tests/NamingConventionsRefTypes/Test.kt

@@ -9,4 +9,4 @@ class Foo {
     }
 }
 
-class aaaa {} // $ Alert
+class aaaa {}

java/ql/test-kotlin2/query-tests/NonSerializableField/NonSerializableField.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Serialization/NonSerializableField.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Serialization/NonSerializableField.ql

java/ql/test-kotlin2/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Serialization/NonSerializableInnerClass.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Serialization/NonSerializableInnerClass.ql

java/ql/test-kotlin2/query-tests/NullMaybe/NullMaybe.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Nullness/NullMaybe.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Nullness/NullMaybe.ql

java/ql/test-kotlin2/query-tests/OneStatementPerLine/OneStatementPerLine.qlref

@@ -1,2 +1 @@
-query: Advisory/Statements/OneStatementPerLine.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Advisory/Statements/OneStatementPerLine.ql

java/ql/test-kotlin2/query-tests/PartiallyMaskedCatch/PartiallyMaskedCatch.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/PartiallyMaskedCatch.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/PartiallyMaskedCatch.ql

java/ql/test-kotlin2/query-tests/ReturnValueIgnored/ReturnValueIgnored.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Statements/ReturnValueIgnored.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Statements/ReturnValueIgnored.ql

java/ql/test-kotlin2/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql

java/ql/test-kotlin2/query-tests/UnderscoreIdentifier/UnderscoreIdentifier.qlref

@@ -1,2 +1 @@
-query: Compatibility/JDK9/UnderscoreIdentifier.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Compatibility/JDK9/UnderscoreIdentifier.ql

java/ql/test-kotlin2/query-tests/UnreadLocal/UnreadLocal.qlref

@@ -1,2 +1 @@
-query: Violations of Best Practice/Dead Code/UnreadLocal.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Violations of Best Practice/Dead Code/UnreadLocal.ql

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) { // $ Alert
+    for (e in a) {
         println()
     }
 }
 
 fun fn2(a: Array<Int>) {
-    for ((idx, e) in a.withIndex()) { // $ Alert
+    for ((idx, e) in a.withIndex()) {
         println()
     }
 }

java/ql/test-kotlin2/query-tests/UselessNullCheck/Test.kt

@@ -12,7 +12,7 @@ fun fn(x:Any?, y: Any?) {
 
 fun fn0(o: Any?) {
     if (o != null) {
-        o?.toString() // $ Alert
+        o?.toString()
         o.toString()
     }
 }

java/ql/test-kotlin2/query-tests/UselessNullCheck/UselessNullCheck.qlref

@@ -1,2 +1 @@
-query: Language Abuse/UselessNullCheck.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Language Abuse/UselessNullCheck.ql

java/ql/test-kotlin2/query-tests/UselessParameter/UselessParameter.qlref

@@ -1,2 +1 @@
-query: DeadCode/UselessParameter.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+DeadCode/UselessParameter.ql

java/ql/test-kotlin2/query-tests/WhitespaceContradictsPrecedence/WhitespaceContradictsPrecedence.qlref

@@ -1,2 +1 @@
-query: Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql
+Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql