[Spec tests] Update tests with spec version 0.1-313

2020-03-30 18:10:09 +03:00
parent 52cc7aa117
commit 0397470b85
100 changed files with 335 additions and 335 deletions
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 9 -> sentence 2
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 5
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 2 -> sentence 1
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 */
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 9 -> sentence 1
 *  - expressions, when-expression -> paragraph 2 -> sentence 4
@@ -1,6 +1,6 @@
 // KT-2902 Check for null should be required when match nullable enum element
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 1 -> sentence 1
 *  - expressions, when-expression -> paragraph 1 -> sentence 2
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 1 -> sentence 1
 *  - expressions, when-expression -> paragraph 1 -> sentence 2
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 2 -> sentence 1
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: neg):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: neg):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 5
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression -> paragraph 6 -> sentence 5
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
@@ -1,5 +1,5 @@
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 */
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 */
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 /*
- * RELEVANT SPEC SENTENCES (spec version: 0.1-152, test type: pos):
+ * RELEVANT SPEC SENTENCES (spec version: 0.1-313, test type: pos):
 *  - expressions, when-expression -> paragraph 5 -> sentence 1
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
 *  - expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-213
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, cast-expression -> paragraph 1 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: check of the cast operators as or as?
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check of the cast operators as or as?",
          "unexpectedBehaviour": false
@@ -4,7 +4,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-220
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, conditional-expression -> paragraph 6 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: The type of the condition expression must be a subtype of kotlin.Boolean, otherwise it is an error
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-220",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "The type of the condition expression must be a subtype of kotlin.Boolean, otherwise it is an error",
          "unexpectedBehaviour": false
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-222
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, jump-expressions, return-expressions -> paragraph 3 -> sentence 2
 * RELEVANT PLACES: expressions, jump-expressions, return-expressions -> paragraph 2 -> sentence 1
 * expressions, jump-expressions, return-expressions -> paragraph 3 -> sentence 3
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-300
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, jump-expressions, return-expressions -> paragraph 3 -> sentence 3
 * RELEVANT PLACES: expressions, jump-expressions, return-expressions -> paragraph 2 -> sentence 1
 * expressions, jump-expressions, return-expressions -> paragraph 3 -> sentence 2
@@ -56,7 +56,7 @@
    "pos": {
      "2": [
        {
-          "specVersion": "0.1-222",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "If several declarations match one name, the return is considered to be from the nearest matching function;",
          "unexpectedBehaviour": false
@@ -64,7 +64,7 @@
      ],
      "3": [
        {
-          "specVersion": "0.1-300",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "If return@Context is inside a lambda expression body, the name of the function using this lambda expression as its argument may be used as Context to refer to the lambda literal itself",
          "unexpectedBehaviour": false
@@ -76,14 +76,14 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-222",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "If several declarations match one name, the return is considered to be from the nearest matching function;",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/2.1.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-300",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "If return@Context is inside a lambda expression body, the name of the function using this lambda expression as its argument may be used as Context to refer to the lambda literal itself",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/jump-expressions/return-expressions/p-3/pos/3.1.kt",
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-213
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, postfix-operator-expressions, postfix-decrement-expression -> paragraph 6 -> sentence 1
 * RELEVANT PLACES: expressions, postfix-operator-expressions, postfix-decrement-expression -> paragraph 5 -> sentence 1
 * overloadable-operators -> paragraph 4 -> sentence 1
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-213
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, postfix-operator-expressions, postfix-decrement-expression -> paragraph 6 -> sentence 1
 * RELEVANT PLACES: expressions, prefix-expressions, prefix-decrement-expression -> paragraph 5 -> sentence 1
 * overloadable-operators -> paragraph 4 -> sentence 1
@@ -3,13 +3,13 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix decrement expression has the same type as its operand expression",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix decrement expression has the same type as its operand expression",
          "unexpectedBehaviour": false
@@ -21,7 +21,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix decrement expression has the same type as its operand expression",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-6/pos/1.1.kt",
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-213
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, postfix-operator-expressions, postfix-increment-expression -> paragraph 6 -> sentence 1
 * RELEVANT PLACES: expressions, postfix-operator-expressions, postfix-increment-expression -> paragraph 5 -> sentence 1
 * overloadable-operators -> paragraph 4 -> sentence 1
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-213
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, postfix-operator-expressions, postfix-increment-expression -> paragraph 6 -> sentence 1
 * RELEVANT PLACES: expressions, prefix-expressions, prefix-increment-expression -> paragraph 5 -> sentence 1
 * overloadable-operators -> paragraph 4 -> sentence 1
@@ -3,13 +3,13 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix increment expression has the same type as its operand expression",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " check postfix increment expression",
          "unexpectedBehaviour": false
@@ -21,7 +21,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " check postfix increment expression",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-6/pos/1.1.kt",
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix decrement expression has the same type as its operand expression",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-decrement-expression/p-6/pos/1.2.kt",
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-213",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "check postfix increment expression has the same type as its operand expression",
          "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/postfix-operator-expressions/postfix-increment-expression/p-6/pos/1.2.kt",
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-297
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, try-expression -> paragraph 7 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: finally block has no effect on the value returned by the try-expression
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-297",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "finally block has no effect on the value returned by the try-expression",
          "unexpectedBehaviour": false
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-297
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, type-checking-and-containment-checking-expressions, type-checking-expression -> paragraph 2 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: E is T: The type T must be runtime-available, otherwise it is a compiler error
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-297
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, type-checking-and-containment-checking-expressions, type-checking-expression -> paragraph 5 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: the expression null is T? for any type T always evaluates to true
@@ -21,7 +21,7 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-297",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "E is T: The type T must be runtime-available, otherwise it is a compiler error",
          "unexpectedBehaviour": false
@@ -33,7 +33,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-297",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "the expression null is T? for any type T always evaluates to true",
          "unexpectedBehaviour": false
@@ -4,7 +4,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: it is possible to  replace the else condition with an always-true condition (Enum)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 2
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (Boolean)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 3
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (Boolean)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 4
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (sealed class)
@@ -4,7 +4,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: it is possible to  replace the else condition with an always-true condition (Enum)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 2
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (Boolean)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 3
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (Boolean)
@@ -3,7 +3,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 4
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition (sealed class)
@@ -4,7 +4,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 2
 * NUMBER: 1
 * DESCRIPTION: The else condition is a special condition which evaluates to true if none of the branches above it evaluated to true.
@@ -4,7 +4,7 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: The else condition must also be in the last when entry of when expression, otherwise it is a compile-time error.
@@ -3,25 +3,25 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (Boolean)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (Boolean)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (sealed class)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "it is possible to  replace the else condition with an always-true condition (Enum)",
          "unexpectedBehaviour": false
@@ -31,25 +31,25 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (Boolean)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (Boolean)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": " it is possible to  replace the else condition with an always-true condition (sealed class)",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "it is possible to  replace the else condition with an always-true condition (Enum)",
          "unexpectedBehaviour": false
@@ -61,7 +61,7 @@
    "neg": {
      "2": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "The else condition is a special condition which evaluates to true if none of the branches above it evaluated to true.",
          "unexpectedBehaviour": false
@@ -71,7 +71,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "The else condition must also be in the last when entry of when expression, otherwise it is a compile-time error.",
          "unexpectedBehaviour": false
@@ -3,8 +3,8 @@
 /*
 * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * NUMBER: 1
 * DESCRIPTION: infix calls for properties
 */
@@ -26,10 +26,10 @@ val B.extensionValC: C

 fun box(): String{
    val b = B()
-    b memberValC 3         //resolved to (1) o_O
+    b memberValC 3         //resolved to (1)
    if (b.memberValC.isInvokeCalled) {
        c.isInvokeCalled = false
-        b extensionValC 4      //resolved to (1) o_O
+        b extensionValC 4      //resolved to (1)
        if (b.extensionValC.isInvokeCalled)
            return "OK"
    }
@@ -1,9 +1,9 @@
 {
-  "4": {
+  "2": {
    "pos": {
-      "1": [
+      "2": [
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "infix calls for properties",
          "unexpectedBehaviour": false
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Annotated when statement",
          "path": "compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt",
@@ -86,7 +86,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive break continue",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt",
@@ -107,21 +107,21 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -130,21 +130,21 @@
      ],
      "3": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -1,17 +1,4 @@
 {
-  "9": {
-    "pos": {
-      "2": [
-        {
-          "specVersion": "0.1-220",
-          "casesNumber": 0,
-          "description": "Correct info after array like call",
-          "path": "compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.kt",
-          "unexpectedBehaviour": false
-        }
-      ]
-    }
-  },
  "8": {
    "pos": {
      "1": [
@@ -24,5 +11,18 @@
        }
      ]
    }
+  },
+  "9": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-220",
+          "casesNumber": 0,
+          "description": "Correct info after array like call",
+          "path": "compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
  }
 }
@@ -6,7 +6,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, conditional-expression -> paragraph 6 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: The type of the condition expression must be a subtype of kotlin.Boolean
@@ -6,7 +6,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, conditional-expression -> paragraph 6 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: The type of the condition expression must be a subtype of kotlin.Boolean
@@ -3,7 +3,7 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 3,
          "description": "The type of the condition expression must be a subtype of kotlin.Boolean",
          "unexpectedBehaviour": true
@@ -13,7 +13,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": "The type of the condition expression must be a subtype of kotlin.Boolean",
          "unexpectedBehaviour": false
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
- * PLACE: expressions, jump-expressions, return-expressions -> paragraph 5 -> sentence 2
+ * SPEC VERSION: 0.1-313
+ * PLACE: expressions, jump-expressions, return-expressions -> paragraph 4 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: check returning is not allowed from run{...}
 */
@@ -11,11 +11,11 @@
      ]
    }
  },
-  "5": {
+  "4": {
    "neg": {
-      "2": [
+      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "check returning is not allowed from run{...}",
          "unexpectedBehaviour": false
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, logical-conjunction-expression -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: expressions, logical-conjunction-expression -> paragraph 2 -> sentence 2
 * NUMBER: 1
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, logical-conjunction-expression -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: expressions, logical-conjunction-expression -> paragraph 2 -> sentence 2
 * NUMBER: 1
@@ -3,7 +3,7 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 7,
          "description": "Both operands of a logical conjunction expression must have a type which is a subtype of kotlin.Boolean",
          "unexpectedBehaviour": false
@@ -11,7 +11,7 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 7,
          "description": "Both operands of a logical conjunction expression must have a type which is a subtype of kotlin.Boolean",
          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/neg/1.1.kt",
@@ -22,7 +22,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Both operands of a logical conjunction expression must have a type which is a subtype of kotlin.Boolean",
          "unexpectedBehaviour": false
@@ -30,7 +30,7 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Both operands of a logical conjunction expression must have a type which is a subtype of kotlin.Boolean",
          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/pos/1.1.kt",
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, logical-disjunction-expression -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: expressions, logical-disjunction-expression -> paragraph 2 -> sentence 2
 * NUMBER: 1
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, logical-disjunction-expression -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: expressions, logical-disjunction-expression -> paragraph 2 -> sentence 2
 * NUMBER: 1
@@ -3,7 +3,7 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 7,
          "description": "Both operands of a logical disjunction expression must have a type which is a subtype of kotlin.Boolean, otherwise it is a type error.",
          "unexpectedBehaviour": false
@@ -11,7 +11,7 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 7,
          "description": "Both operands of a logical disjunction expression must have a type which is a subtype of kotlin.Boolean, otherwise it is a type error.",
          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/neg/1.1.kt",
@@ -22,7 +22,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Both operands of a logical disjunction expression must have a type which is a subtype of kotlin.Boolean",
          "unexpectedBehaviour": false
@@ -30,7 +30,7 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Both operands of a logical disjunction expression must have a type which is a subtype of kotlin.Boolean",
          "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/pos/1.1.kt",
@@ -21,7 +21,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt",
@@ -35,14 +35,14 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum with smart cast",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt",
@@ -106,7 +106,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt",
@@ -120,21 +120,21 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean brackets",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean complex",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt",
@@ -186,28 +186,28 @@
      ],
      "4": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean brackets",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean complex",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt",
@@ -244,7 +244,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum mixed",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt",
@@ -279,28 +279,28 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum is",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive break continue",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum with smart cast",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt",
@@ -309,21 +309,21 @@
      ],
      "5": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean brackets",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean complex",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt",
@@ -377,7 +377,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt",
@@ -391,7 +391,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum null",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt",
@@ -418,7 +418,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum else",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt",
@@ -446,7 +446,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass else",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt",
@@ -482,7 +482,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -507,14 +507,14 @@
      ],
      "9": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum else",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt",
@@ -542,21 +542,21 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt",
@@ -570,7 +570,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum annotated",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt",
@@ -591,7 +591,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum null",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt",
@@ -607,7 +607,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -623,7 +623,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -657,7 +657,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass val",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt",
@@ -685,7 +685,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass var",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt",
@@ -6,7 +6,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition
@@ -6,7 +6,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-218
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 4 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION:  it is possible to  replace the else condition with an always-true condition
@@ -4,7 +4,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-100
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: 'When' with bound value and with different variants of expressions in the control structure body.
@@ -3,7 +3,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-100
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 2
 * DESCRIPTION: 'When' with bound value and allowed break and continue expression (without labels) in the control structure body.
@@ -4,7 +4,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-201
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 6 -> sentence 7
 * NUMBER: 1
 * DESCRIPTION: 'When' with bound value and with else branch not in the last position.
@@ -1,7 +1,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-201
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 6 -> sentence 7
 * NUMBER: 1
 * DESCRIPTION: 'When' with bound value and else branch.
@@ -30,7 +30,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass val",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt",
@@ -44,21 +44,21 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass var",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum mixed",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum is",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt",
@@ -95,7 +95,7 @@
      ],
      "7": [
        {
-          "specVersion": "0.1-201",
+          "specVersion": "0.1-313",
          "casesNumber": 3,
          "description": "\u0027When\u0027 with bound value and with else branch not in the last position.",
          "unexpectedBehaviour": false
@@ -132,21 +132,21 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression enum",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum mixed",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt",
@@ -214,14 +214,14 @@
          "unexpectedBehaviour": true
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass else",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt",
@@ -265,7 +265,7 @@
      ],
      "7": [
        {
-          "specVersion": "0.1-201",
+          "specVersion": "0.1-313",
          "casesNumber": 3,
          "description": "\u0027When\u0027 with bound value and else branch.",
          "unexpectedBehaviour": false
@@ -281,7 +281,7 @@
      ],
      "5": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Annotated when statement",
          "path": "compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt",
@@ -295,7 +295,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt",
@@ -324,14 +324,14 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression enum",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt",
@@ -340,14 +340,14 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression enum",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt",
@@ -360,7 +360,7 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": " it is possible to  replace the else condition with an always-true condition",
          "unexpectedBehaviour": false
@@ -370,7 +370,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-218",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": " it is possible to  replace the else condition with an always-true condition",
          "unexpectedBehaviour": false
@@ -488,7 +488,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Comma in when condition without argument",
          "path": "compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt",
@@ -504,7 +504,7 @@
      ],
      "4": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Duplicated labels",
          "path": "compiler/testData/diagnostics/tests/when/DuplicatedLabels.kt",
@@ -513,7 +513,7 @@
      ],
      "5": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Duplicated labels",
          "path": "compiler/testData/diagnostics/tests/when/DuplicatedLabels.kt",
@@ -526,33 +526,33 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-100",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "\u0027When\u0027 with bound value and allowed break and continue expression (without labels) in the control structure body.",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-100",
+          "specVersion": "0.1-313",
          "casesNumber": 25,
          "description": "\u0027When\u0027 with bound value and with different variants of expressions in the control structure body.",
          "unexpectedBehaviour": true
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Annotated when statement",
          "path": "compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum else",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt",
@@ -580,7 +580,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Duplicated labels",
          "path": "compiler/testData/diagnostics/tests/when/DuplicatedLabels.kt",
@@ -601,35 +601,35 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Comma in when condition without argument",
          "path": "compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass else",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt",
@@ -650,7 +650,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum annotated",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt",
@@ -685,7 +685,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive no initialization",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt",
@@ -706,7 +706,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive platform enum null",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt",
@@ -724,7 +724,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean nullable",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt",
@@ -752,7 +752,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass val",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt",
@@ -773,7 +773,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean brackets",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt",
@@ -787,7 +787,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean complex",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt",
@@ -822,14 +822,14 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive boolean",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass var",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt",
@@ -857,21 +857,21 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression enum",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum mixed",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Empty condition with expression",
          "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt",
@@ -913,7 +913,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive enum is",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt",
@@ -927,7 +927,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Exhaustive break continue",
          "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt",
@@ -941,14 +941,14 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Else on nullable enum with smart cast",
          "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt",
@@ -961,7 +961,7 @@
    "pos": {
      "2": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Annotated when statement",
          "path": "compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt",
@@ -977,7 +977,7 @@
      ],
      "1": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Duplicated labels",
          "path": "compiler/testData/diagnostics/tests/when/DuplicatedLabels.kt",
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-268
+ * SPEC VERSION: 0.1-313
 * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 1
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-268
+ * SPEC VERSION: 0.1-313
 * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-268
+ * SPEC VERSION: 0.1-313
 * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
@@ -5,7 +5,7 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-268
+ * SPEC VERSION: 0.1-313
 * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 5
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 1
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 2
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 3
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 4
@@ -5,8 +5,8 @@
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
 *
- * SPEC VERSION: 0.1-268
- * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-313
+ * PLACE: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 4
 * RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 1
 * overload-resolution, building-the-overload-candidate-set-ocs, infix-function-call -> paragraph 2 -> sentence 2
 * overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 5
@@ -38,110 +38,110 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
-          "casesNumber": 2,
-          "description": "Star-imported infix extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.4.kt",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Star-imported infix extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.5.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.5.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 6,
          "description": "Local extension infix extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.1.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
-          "casesNumber": 4,
-          "description": "Local extension infix extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.2.kt",
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.4.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Explicitly imported infix extension callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.3.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.2.kt",
          "unexpectedBehaviour": false
        }
      ],
-      "3": [
+      "4": [
        {
-          "specVersion": "0.1-268",
-          "casesNumber": 2,
-          "description": "Star-imported infix extension callables",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Star-imported infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 6,
          "description": "Local extension infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
-          "casesNumber": 4,
-          "description": "Local extension infix extension callables",
+          "specVersion": "0.1-313",
+          "casesNumber": 2,
+          "description": "Star-imported infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Explicitly imported infix extension callables",
          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
+          "casesNumber": 4,
+          "description": "Local extension infix extension callables",
+          "unexpectedBehaviour": false
        }
      ]
    },
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": "Local extension infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
-          "casesNumber": 1,
-          "description": "Star-imported extension callable only",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/3.5.kt",
-          "unexpectedBehaviour": false
-        },
-        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Explicitly imported infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
+          "casesNumber": 1,
+          "description": "Star-imported extension callable only",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/4.5.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Star-imported infix extension callables",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Star-imported infix extension callables",
          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": "Implicitly imported extension callable without infix modifier",
          "unexpectedBehaviour": false
@@ -149,30 +149,30 @@
      ],
      "2": [
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": "Local extension infix extension callables",
          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 2,
          "description": "Explicitly imported infix extension callables",
          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 4,
          "description": "Implicitly imported extension callable without infix modifier",
          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.1.kt",
          "unexpectedBehaviour": false
        }
      ],
-      "3": [
+      "4": [
        {
-          "specVersion": "0.1-268",
+          "specVersion": "0.1-313",
          "casesNumber": 1,
          "description": "Star-imported extension callable only",
          "unexpectedBehaviour": false
@@ -3,7 +3,7 @@
    "pos": {
      "1": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt",
@@ -24,7 +24,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass else",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt",
@@ -54,14 +54,14 @@
      ],
      "8": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch false bypass else",
          "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt",
@@ -79,7 +79,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass val",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt",
@@ -93,7 +93,7 @@
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass var",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt",
@@ -109,7 +109,7 @@
      ],
      "6": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass val",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt",
@@ -118,7 +118,7 @@
      ],
      "8": [
        {
-          "specVersion": "0.1-152",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "Branch bypass var",
          "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt",
@@ -1,7 +1,7 @@
 /*
 * KOTLIN PSI SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-100
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 1
 * DESCRIPTION: 'When' with bound value and empty control structure body.
@@ -1,7 +1,7 @@
 /*
 * KOTLIN PSI SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-100
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 2
 * DESCRIPTION: 'When' with bound value and empty 'when condition'.
@@ -1,7 +1,7 @@
 /*
 * KOTLIN PSI SPEC TEST (NEGATIVE)
 *
- * SPEC VERSION: 0.1-100
+ * SPEC VERSION: 0.1-313
 * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
 * NUMBER: 3
 * DESCRIPTION: 'When' with bound value and with invalid list of the conditions in 'when entry'.
@@ -111,19 +111,19 @@
    "neg": {
      "1": [
        {
-          "specVersion": "0.1-100",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "\u0027When\u0027 with bound value and empty \u0027when condition\u0027.",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-100",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "\u0027When\u0027 with bound value and with invalid list of the conditions in \u0027when entry\u0027.",
          "unexpectedBehaviour": false
        },
        {
-          "specVersion": "0.1-100",
+          "specVersion": "0.1-313",
          "casesNumber": 0,
          "description": "\u0027When\u0027 with bound value and empty control structure body.",
          "unexpectedBehaviour": false
@@ -1941,19 +1941,19 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                        }
                    }

-                    @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-5")
+                    @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-4")
                    @TestDataPath("$PROJECT_ROOT")
                    @RunWith(JUnit3RunnerWithInners.class)
-                    public static class P_5 extends AbstractDiagnosticsTestSpec {
+                    public static class P_4 extends AbstractDiagnosticsTestSpec {
                        private void runTest(String testDataFilePath) throws Exception {
                            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
                        }

-                        public void testAllFilesPresentInP_5() throws Exception {
-                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-5"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                        public void testAllFilesPresentInP_4() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-4"), Pattern.compile("^(.+)\\.kt$"), null, true);
                        }

-                        @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-5/neg")
+                        @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-4/neg")
                        @TestDataPath("$PROJECT_ROOT")
                        @RunWith(JUnit3RunnerWithInners.class)
                        public static class Neg extends AbstractDiagnosticsTestSpec {
@@ -1961,13 +1961,13 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
                            }

-                            @TestMetadata("2.1.kt")
-                            public void test2_1() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-5/neg/2.1.kt");
+                            @TestMetadata("1.1.kt")
+                            public void test1_1() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-4/neg/1.1.kt");
                            }

                            public void testAllFilesPresentInNeg() throws Exception {
-                                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-5/neg"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-4/neg"), Pattern.compile("^(.+)\\.kt$"), null, true);
                            }
                        }
                    }
@@ -3931,9 +3931,9 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.kt");
                            }

-                            @TestMetadata("3.5.kt")
-                            public void test3_5() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/3.5.kt");
+                            @TestMetadata("4.5.kt")
+                            public void test4_5() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/4.5.kt");
                            }

                            public void testAllFilesPresentInNeg() throws Exception {
@@ -3949,29 +3949,29 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
                            }

-                            @TestMetadata("3.1.kt")
-                            public void test3_1() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.1.kt");
+                            @TestMetadata("4.1.kt")
+                            public void test4_1() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.kt");
                            }

-                            @TestMetadata("3.2.kt")
-                            public void test3_2() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.2.kt");
+                            @TestMetadata("4.2.kt")
+                            public void test4_2() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.2.kt");
                            }

-                            @TestMetadata("3.3.kt")
-                            public void test3_3() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.3.kt");
+                            @TestMetadata("4.3.kt")
+                            public void test4_3() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.kt");
                            }

-                            @TestMetadata("3.4.kt")
-                            public void test3_4() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.4.kt");
+                            @TestMetadata("4.4.kt")
+                            public void test4_4() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.4.kt");
                            }

-                            @TestMetadata("3.5.kt")
-                            public void test3_5() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/3.5.kt");
+                            @TestMetadata("4.5.kt")
+                            public void test4_5() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.5.kt");
                            }

                            public void testAllFilesPresentInPos() throws Exception {
@@ -25,7 +25,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
    }

    public void testAllFilesPresentInBox() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates", "linked/type-inference", "linked/expressions/when-expression/exhaustive-when-expressions", "linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates", "linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
    }

    @TestMetadata("compiler/tests-spec/testData/codegen/box/linked")
@@ -37,7 +37,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
        }

        public void testAllFilesPresentInLinked() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked"), Pattern.compile("^(.+)\\.kt$"), null, true, "type-inference", "expressions/when-expression/exhaustive-when-expressions", "overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked"), Pattern.compile("^(.+)\\.kt$"), null, true, "overload-resolution/building-the-overload-candidate-set-ocs/call-with-an-explicit-receiver");
        }

        @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/expressions")
@@ -49,7 +49,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
            }

            public void testAllFilesPresentInExpressions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/expressions"), Pattern.compile("^(.+)\\.kt$"), null, true, "when-expression/exhaustive-when-expressions");
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/expressions"), Pattern.compile("^(.+)\\.kt$"), null, true);
            }

            @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/expressions/additive-expression")
@@ -3160,7 +3160,7 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
                }

                public void testAllFilesPresentInWhen_expression() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/expressions/when-expression"), Pattern.compile("^(.+)\\.kt$"), null, true, "exhaustive-when-expressions");
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/expressions/when-expression"), Pattern.compile("^(.+)\\.kt$"), null, true);
                }

                @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/expressions/when-expression/p-4")
@@ -3329,19 +3329,19 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
                        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call"), Pattern.compile("^(.+)\\.kt$"), null, true);
                    }

-                    @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-4")
+                    @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2")
                    @TestDataPath("$PROJECT_ROOT")
                    @RunWith(JUnit3RunnerWithInners.class)
-                    public static class P_4 extends AbstractBlackBoxCodegenTestSpec {
+                    public static class P_2 extends AbstractBlackBoxCodegenTestSpec {
                        private void runTest(String testDataFilePath) throws Exception {
                            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
                        }

-                        public void testAllFilesPresentInP_4() throws Exception {
-                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-4"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                        public void testAllFilesPresentInP_2() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2"), Pattern.compile("^(.+)\\.kt$"), null, true);
                        }

-                        @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-4/pos")
+                        @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos")
                        @TestDataPath("$PROJECT_ROOT")
                        @RunWith(JUnit3RunnerWithInners.class)
                        public static class Pos extends AbstractBlackBoxCodegenTestSpec {
@@ -3349,13 +3349,13 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
                                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
                            }

-                            @TestMetadata("1.1.kt")
-                            public void test1_1() throws Exception {
-                                runTest("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-4/pos/1.1.kt");
+                            @TestMetadata("2.1.kt")
+                            public void test2_1() throws Exception {
+                                runTest("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/2.1.kt");
                            }

                            public void testAllFilesPresentInPos() throws Exception {
-                                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-4/pos"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos"), Pattern.compile("^(.+)\\.kt$"), null, true);
                            }
                        }
                    }
@@ -25,7 +25,7 @@ public class ParsingTestSpecGenerated extends AbstractParsingTestSpec {
    }

    public void testAllFilesPresentInPsi() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates", "linked/type-inference", "linked/expressions/when-expression/exhaustive-when-expressions");
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi"), Pattern.compile("^(.+)\\.kt$"), null, true, "helpers", "templates");
    }

    @TestMetadata("compiler/tests-spec/testData/psi/linked")
@@ -37,7 +37,7 @@ public class ParsingTestSpecGenerated extends AbstractParsingTestSpec {
        }

        public void testAllFilesPresentInLinked() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked"), Pattern.compile("^(.+)\\.kt$"), null, true, "type-inference", "expressions/when-expression/exhaustive-when-expressions");
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked"), Pattern.compile("^(.+)\\.kt$"), null, true);
        }

        @TestMetadata("compiler/tests-spec/testData/psi/linked/expressions")
@@ -49,7 +49,7 @@ public class ParsingTestSpecGenerated extends AbstractParsingTestSpec {
            }

            public void testAllFilesPresentInExpressions() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked/expressions"), Pattern.compile("^(.+)\\.kt$"), null, true, "when-expression/exhaustive-when-expressions");
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked/expressions"), Pattern.compile("^(.+)\\.kt$"), null, true);
            }

            @TestMetadata("compiler/tests-spec/testData/psi/linked/expressions/constant-literals")
@@ -981,7 +981,7 @@ public class ParsingTestSpecGenerated extends AbstractParsingTestSpec {
                }

                public void testAllFilesPresentInWhen_expression() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked/expressions/when-expression"), Pattern.compile("^(.+)\\.kt$"), null, true, "exhaustive-when-expressions");
+                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/psi/linked/expressions/when-expression"), Pattern.compile("^(.+)\\.kt$"), null, true);
                }

                @TestMetadata("compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1")