Kotlin: Accept Kotlin 1 test changes 1.9.0 -> 2.0.0

Author: igfoo

java/ql/test-kotlin1/library-tests/classes/PrintAst.expected

@@ -103,24 +103,24 @@ classes.kt:
 #   25|       3: [TypeAccess] Unit
 #   25|       5: [BlockStmt] { ... }
 #   28|   9: [Class] ClassSix
-#   28|     1: [Constructor] ClassSix
-#   28|       5: [BlockStmt] { ... }
-#   28|         0: [SuperConstructorInvocationStmt] super(...)
-#   28|         1: [BlockStmt] { ... }
-#   28|     2: [Method] funIF1
+#   28|     1: [Method] funIF1
 #   28|       3: [TypeAccess] Unit
 #   28|       5: [BlockStmt] { ... }
 #   28|         0: [ReturnStmt] return ...
 #   28|           0: [MethodCall] funIF1(...)
 #   28|             -1: [SuperAccess] IF1.super
 #   28|               0: [TypeAccess] IF1
-#   28|     3: [Method] funIF2
+#   28|     2: [Method] funIF2
 #   28|       3: [TypeAccess] Unit
 #   28|       5: [BlockStmt] { ... }
 #   28|         0: [ReturnStmt] return ...
 #   28|           0: [MethodCall] funIF2(...)
 #   28|             -1: [SuperAccess] IF2.super
 #   28|               0: [TypeAccess] IF2
+#   28|     3: [Constructor] ClassSix
+#   28|       5: [BlockStmt] { ... }
+#   28|         0: [SuperConstructorInvocationStmt] super(...)
+#   28|         1: [BlockStmt] { ... }
 #   29|     4: [Constructor] ClassSix
 #-----|       4: (Parameters)
 #   29|         0: [Parameter] i

java/ql/test-kotlin1/library-tests/comments/comments.expected

@@ -18,7 +18,6 @@ comments
 | comments.kt:95:1:95:163 | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner.  ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% |
 commentOwners
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
-| comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
 | comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:13:17:46 | getMembers$private |

java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected

@@ -1,7 +1,7 @@
-| Test.kt:3:1:80:1 | { ... } | 0 | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | 2 | Test.kt:3:8:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 3 | Test.kt:3:8:80:1 | Test |
+| Test.kt:3:8:80:1 | { ... } | 0 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | { ... } | 2 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | 3 | Test.kt:3:8:80:1 | Test |
 | Test.kt:4:2:79:2 | test | 0 | Test.kt:4:2:79:2 | test |
 | Test.kt:4:13:79:2 | { ... } | 0 | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:7:5:7 | var ...; |
@@ -155,15 +155,15 @@
 | Test.kt:105:5:109:5 | <Expr>; | 5 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
 | Test.kt:105:20:107:5 | { ... } | 0 | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:105:20:107:5 | { ... } | 1 | Test.kt:106:9:106:29 | <Expr>; |
-| Test.kt:105:20:107:5 | { ... } | 2 | Test.kt:106:18:106:27 | "x not null" |
+| Test.kt:105:20:107:5 | { ... } | 2 | Test.kt:106:17:106:28 | "x not null" |
 | Test.kt:105:20:107:5 | { ... } | 3 | Test.kt:106:9:106:29 | println(...) |
 | Test.kt:107:16:109:5 | ... -> ... | 0 | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:107:16:109:5 | ... -> ... | 1 | Test.kt:107:16:107:16 | y |
 | Test.kt:107:16:109:5 | ... -> ... | 2 | Test.kt:107:21:107:24 | null |
 | Test.kt:107:16:109:5 | ... -> ... | 3 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
 | Test.kt:107:27:109:5 | { ... } | 0 | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:27:109:5 | { ... } | 1 | Test.kt:108:9:108:29 | <Expr>; |
-| Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:18:108:27 | "y not null" |
+| Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:17:108:28 | "y not null" |
 | Test.kt:107:27:109:5 | { ... } | 3 | Test.kt:108:9:108:29 | println(...) |
 | Test.kt:112:1:116:1 | fn | 0 | Test.kt:112:1:116:1 | fn |
 | Test.kt:112:32:116:1 | { ... } | 0 | Test.kt:112:32:116:1 | { ... } |

java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected

@@ -2,8 +2,8 @@
 | Test.kt:0:0:0:0 | TestKt | Class | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:3:1:80:1 | Test | Class | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt | Test.kt:3:8:80:1 | { ... } | BlockStmt |
-| Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
 | Test.kt:3:8:80:1 | Test | Constructor | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
 | Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:8:80:1 | Test | Constructor |
 | Test.kt:4:2:79:2 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:4:2:79:2 | test | Method | file://:0:0:0:0 | <none> | <none> |
@@ -206,20 +206,20 @@
 | Test.kt:105:9:107:5 | ... -> ... | WhenBranch | Test.kt:105:9:105:9 | x | VarAccess |
 | Test.kt:105:14:105:17 | null | NullLiteral | Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr |
 | Test.kt:105:20:107:5 | { ... } | BlockStmt | Test.kt:106:9:106:29 | <Expr>; | ExprStmt |
-| Test.kt:106:9:106:29 | <Expr>; | ExprStmt | Test.kt:106:18:106:27 | "x not null" | StringLiteral |
+| Test.kt:106:9:106:29 | <Expr>; | ExprStmt | Test.kt:106:17:106:28 | "x not null" | StringLiteral |
 | Test.kt:106:9:106:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:106:9:106:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
-| Test.kt:106:18:106:27 | "x not null" | StringLiteral | Test.kt:106:9:106:29 | println(...) | MethodCall |
+| Test.kt:106:17:106:28 | "x not null" | StringLiteral | Test.kt:106:9:106:29 | println(...) | MethodCall |
 | Test.kt:107:16:107:16 | y | VarAccess | Test.kt:107:21:107:24 | null | NullLiteral |
 | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:100:1:110:1 | fn | Method |
 | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:27:109:5 | { ... } | BlockStmt |
 | Test.kt:107:16:109:5 | ... -> ... | WhenBranch | Test.kt:107:16:107:16 | y | VarAccess |
 | Test.kt:107:21:107:24 | null | NullLiteral | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr |
 | Test.kt:107:27:109:5 | { ... } | BlockStmt | Test.kt:108:9:108:29 | <Expr>; | ExprStmt |
-| Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:18:108:27 | "y not null" | StringLiteral |
+| Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:17:108:28 | "y not null" | StringLiteral |
 | Test.kt:108:9:108:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
-| Test.kt:108:18:108:27 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
+| Test.kt:108:17:108:28 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
 | Test.kt:112:1:116:1 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:112:1:116:1 | fn | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:112:8:112:17 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |

java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected

@@ -1,6 +1,6 @@
 | Test.kt:3:1:80:1 | super(...) | Test.kt:3:8:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:5:7:5:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:6:7:6:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:7:7:7:7 | var ...; |

java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected

@@ -1,6 +1,6 @@
-| Test.kt:3:1:80:1 | super(...) | Test.kt:3:1:80:1 | { ... } |
+| Test.kt:3:1:80:1 | super(...) | Test.kt:3:8:80:1 | { ... } |
 | Test.kt:3:8:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:8:80:1 | { ... } | Test.kt:3:1:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | { ... } |
 | Test.kt:5:7:5:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:6:7:6:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:6:7:6:7 | var ...; | Test.kt:5:7:5:7 | var ...; |

java/ql/test-kotlin1/library-tests/dataflow/foreach/test.expected

@@ -2,14 +2,14 @@
 | C1.java:10:44:10:46 | "a" | C1.java:12:17:12:20 | ...[...] |
 | C1.java:10:44:10:46 | "a" | C1.java:15:20:15:23 | ...[...] |
 | C1.java:10:44:10:46 | "a" | C1.java:19:20:19:20 | s |
-| C2.kt:8:32:8:32 | "a" | C2.kt:9:14:9:14 | l |
-| C2.kt:8:32:8:32 | "a" | C2.kt:10:14:10:17 | ...[...] |
-| C2.kt:8:32:8:32 | "a" | C2.kt:11:14:11:21 | get(...) |
-| C2.kt:8:32:8:32 | "a" | C2.kt:13:18:13:21 | ...[...] |
-| C2.kt:8:32:8:32 | "a" | C2.kt:16:18:16:18 | s |
-| C2.kt:23:24:23:24 | "a" | C2.kt:25:14:25:18 | ...[...] |
-| C2.kt:23:24:23:24 | "a" | C2.kt:27:14:27:22 | get(...) |
-| C2.kt:24:26:24:26 | "a" | C2.kt:26:14:26:18 | ...[...] |
-| C2.kt:24:26:24:26 | "a" | C2.kt:28:14:28:22 | get(...) |
-| C2.kt:36:30:36:30 | "a" | C2.kt:37:14:37:17 | ...[...] |
-| C2.kt:36:30:36:30 | "a" | C2.kt:38:14:38:21 | get(...) |
+| C2.kt:8:31:8:33 | "a" | C2.kt:9:14:9:14 | l |
+| C2.kt:8:31:8:33 | "a" | C2.kt:10:14:10:17 | ...[...] |
+| C2.kt:8:31:8:33 | "a" | C2.kt:11:14:11:21 | get(...) |
+| C2.kt:8:31:8:33 | "a" | C2.kt:13:18:13:21 | ...[...] |
+| C2.kt:8:31:8:33 | "a" | C2.kt:16:18:16:18 | s |
+| C2.kt:23:23:23:25 | "a" | C2.kt:25:14:25:18 | ...[...] |
+| C2.kt:23:23:23:25 | "a" | C2.kt:27:14:27:22 | get(...) |
+| C2.kt:24:25:24:27 | "a" | C2.kt:26:14:26:18 | ...[...] |
+| C2.kt:24:25:24:27 | "a" | C2.kt:28:14:28:22 | get(...) |
+| C2.kt:36:29:36:31 | "a" | C2.kt:37:14:37:17 | ...[...] |
+| C2.kt:36:29:36:31 | "a" | C2.kt:38:14:38:21 | get(...) |