From d9160a26e9a73b40f06d94c8bc22b7a1c0d4f6c8 Mon Sep 17 00:00:00 2001 From: "anastasiia.spaseeva" Date: Wed, 6 May 2020 18:18:29 +0300 Subject: [PATCH] [Spec tests] Add property `helpers` to testMaps --- .../boolean-literals/testsMap.json | 48 +++++++++++------ .../conditional-expressions/testsMap.json | 12 +++-- .../abstract-classes/testsMap.json | 9 ++-- .../additive-expression/testsMap.json | 6 ++- .../kotlin.unit/testsMap.json | 3 +- .../comparison-expressions/testsMap.json | 3 +- .../conditional-expression/testsMap.json | 6 ++- .../boolean-literals/testsMap.json | 15 ++++-- .../character-literals/testsMap.json | 54 ++++++++++++------- .../real-literals/testsMap.json | 15 ++++-- .../testsMap.json | 30 +++++++---- .../elvis-operator-expression/testsMap.json | 3 +- .../value-equality-expressions/testsMap.json | 6 ++- .../return-expressions/testsMap.json | 3 +- .../testsMap.json | 12 +++-- .../testsMap.json | 12 +++-- .../multiplicative-expression/testsMap.json | 6 ++- .../testsMap.json | 3 +- .../logical-not-expression/testsMap.json | 3 +- .../unary-minus-expression/testsMap.json | 3 +- .../unary-plus-expression/testsMap.json | 3 +- .../range-expression/testsMap.json | 6 ++- .../expressions/try-expression/testsMap.json | 6 ++- .../testsMap.json | 3 +- .../type-checking-expression/testsMap.json | 6 ++- .../exhaustive-when-expressions/testsMap.json | 24 ++++++--- .../expressions/when-expression/testsMap.json | 54 ++++++++++++------- .../overloadable-operators/testsMap.json | 6 ++- .../while-loop-statement/testsMap.json | 6 ++- .../type-system/introduction-1/testsMap.json | 12 +++-- .../built-in-types/kotlin.any/testsMap.json | 9 ++-- .../kotlin.nothing/testsMap.json | 9 ++-- .../spec/utils/TestsJsonMapGenerator.kt | 1 + 33 files changed, 265 insertions(+), 132 deletions(-) diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json index d5defa6e036..0319e81e510 100644 --- a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json +++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json @@ -8,7 +8,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the companionObject.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.10.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -24,7 +25,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -40,7 +42,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the typeParameter.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.14.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -48,7 +51,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the packageComplex.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.5.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -64,7 +68,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the parameter.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.15.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -72,7 +77,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.4.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -80,7 +86,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the function.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.11.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -96,7 +103,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.9.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -104,7 +112,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the typeAlias.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.18.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -136,7 +145,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.16.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -152,7 +162,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the setter.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.12.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -160,7 +171,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the callableReference.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.26.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -168,7 +180,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the typeConstraint.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -176,7 +189,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the simpleUserType.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.13.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -200,7 +214,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the object.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.17.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" }, { "specVersion": "0.1-300", @@ -208,7 +223,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the packageSimple.", "path": "compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.6.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "reflect" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json index d32c6e3fe00..268627ca0e3 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json @@ -8,7 +8,8 @@ "description": "check any if-statement in kotlin may be trivially turned into such an expression by replacing the missing branch with a kotlin.Unit object expression.", "path": "compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "1": [ @@ -54,7 +55,8 @@ "description": "check any if-statement in kotlin may be trivially turned into such an expression by replacing the missing branch with a kotlin.Unit object expression.", "path": "compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" } ], "1": [ @@ -64,7 +66,8 @@ "description": "check if-expressions must have both branches.", "path": "compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-296", @@ -72,7 +75,8 @@ "description": "check if-expressions must have both branches.", "path": "compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-152", diff --git a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/testsMap.json index 6778c935778..443410d3270 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/testsMap.json @@ -144,7 +144,8 @@ "description": "Abstract classes may contain one or more abstract members, which should be implemented in a subtype of this abstract class", "path": "compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" }, { "specVersion": "0.1-213", @@ -152,7 +153,8 @@ "description": "Abstract classes may contain one or more abstract members, which should be implemented in a subtype of this abstract class", "path": "compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/pos/1.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" }, { "specVersion": "0.1-213", @@ -160,7 +162,8 @@ "description": "Abstract classes may contain one or more abstract members, which should be implemented in a subtype of this abstract class", "path": "compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/pos/1.4.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" }, { "specVersion": "0.1-213", diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/testsMap.json index dcddd2422eb..c2ef1a0c76b 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The return type of these functions is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "description": "The return type of these functions is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/built-in-types-and-their-semantics/kotlin.unit/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/built-in-types-and-their-semantics/kotlin.unit/testsMap.json index 7271df5661f..dde0e5319d7 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/built-in-types-and-their-semantics/kotlin.unit/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/built-in-types-and-their-semantics/kotlin.unit/testsMap.json @@ -8,7 +8,8 @@ "description": "Check of Unit type", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/built-in-types-and-their-semantics/kotlin.unit/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/testsMap.json index bc2468ed0a6..e1d1c1f5b4c 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/testsMap.json @@ -36,7 +36,8 @@ "description": "All comparison expressions always have type kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/p-5/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/testsMap.json index 14a62db634f..c7d1823eca4 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The type of the condition expression must be a subtype of kotlin.Boolean", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] }, @@ -20,7 +21,8 @@ "description": "The type of the condition expression must be a subtype of kotlin.Boolean", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json index ca699abf4d2..a1cc21352b1 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json @@ -8,7 +8,8 @@ "description": "checking of type for Boolean values: impossible to use as identifiers", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "3": [ @@ -18,7 +19,8 @@ "description": "Checking of type for Boolean values", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] }, @@ -30,7 +32,8 @@ "description": "checking of type for Boolean values: possible to use as identifiers if surround with backticks", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "3": [ @@ -40,7 +43,8 @@ "description": "Checking of type for Boolean values", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -48,7 +52,8 @@ "description": "Checking of subtype for Boolean values", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/testsMap.json index 9d34343f94b..b31bebd53fd 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/testsMap.json @@ -8,7 +8,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] }, @@ -30,7 +32,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -40,7 +43,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } @@ -54,7 +58,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ], "2": [ @@ -64,7 +69,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] }, @@ -76,7 +82,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ], "2": [ @@ -86,7 +93,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } @@ -100,7 +108,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -108,7 +117,8 @@ "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] }, @@ -120,7 +130,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -128,7 +139,8 @@ "description": "to define a character the unicode code point escaped symbol \\u could be used with followed by exactly four hexadecimal digits", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -136,7 +148,8 @@ "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } @@ -150,7 +163,8 @@ "description": "A character literal defines a constant holding a unicode character value", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -158,7 +172,8 @@ "description": "to define a character the unicode code point escaped symbol \\u could be used with followed by exactly four hexadecimal digits", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -166,7 +181,8 @@ "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } @@ -180,7 +196,8 @@ "description": "to define a character the unicode codepoint escaped symbol \\u could be used with followed by exactly four hexadecimal digits.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] }, @@ -192,7 +209,8 @@ "description": "to define a character the unicode code point escaped symbol \\u could be used with followed by exactly four hexadecimal digits", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-4/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json index 529a1af8e27..3f90499d4dd 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json @@ -322,7 +322,8 @@ "description": "A type checking of a real literal with an exponent mark.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -330,7 +331,8 @@ "description": "A type checking of a real literal with omitted a whole-number part.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -338,7 +340,8 @@ "description": "A type checking of a real literal with omitted a whole-number part and an exponent mark.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -346,7 +349,8 @@ "description": "A type checking of a real literal with omitted a fraction part and an exponent mark.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -354,7 +358,8 @@ "description": "A type checking of a simple real literal (with/without underscores).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json index 16f778f10ec..14386ea7971 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json @@ -8,7 +8,8 @@ "description": "Various integer literals with not allowed long literal mark in lower case (type checking).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -16,7 +17,8 @@ "description": "Check of integer type selection depends on the context (incopatible types).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.5.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -24,7 +26,8 @@ "description": "Type checking (comparison with invalid types) of too a big integers.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -32,7 +35,8 @@ "description": "Type checking (comparison with invalid types) of various integer literals.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -40,7 +44,8 @@ "description": "Type checking (comparison with invalid types) of various integer literals with long literal mark.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "1": [ @@ -78,7 +83,8 @@ "description": "Type checking of various integer literals with long literal mark.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -86,7 +92,8 @@ "description": "Check of integer type selection depends on the context.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.5.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -94,7 +101,8 @@ "description": "Type checking of binary integer literals.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -102,7 +110,8 @@ "description": "Type checking of hexadecimal integer literals.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-100", @@ -110,7 +119,8 @@ "description": "Type checking of decimal integer literals.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/elvis-operator-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/elvis-operator-expression/testsMap.json index a9954dfdca2..51c3384e740 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/elvis-operator-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/elvis-operator-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The type of elvis operator expression is the least upper bound of the non-nullable variant of the type of the left-hand side expression and the type of the right-hand side expression.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/elvis-operator-expression/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/testsMap.json index 4bdbc80d07e..53bee4ae72c 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/testsMap.json @@ -8,7 +8,8 @@ "description": "Value equality expressions always have type kotlin.Boolean as does the equals method in kotlin.Any", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } @@ -22,7 +23,8 @@ "description": "Value equality expressions always have type kotlin.Boolean as does the equals method in kotlin.Any", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/equality-expressions/value-equality-expressions/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/testsMap.json index 20dedad318e..7a642ccfb85 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/testsMap.json @@ -8,7 +8,8 @@ "description": "", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/jump-expressions/return-expressions/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/testsMap.json index adeafa3071e..99f397f7c50 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/testsMap.json @@ -8,7 +8,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] }, @@ -30,7 +32,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -40,7 +43,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/testsMap.json index 5536134804a..7edfe38e249 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/testsMap.json @@ -8,7 +8,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] }, @@ -30,7 +32,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -40,7 +43,8 @@ "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", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/testsMap.json index 7c1c4e900ff..f646ecd6b0b 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The return type of these functions is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/p-5/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "description": "The return type of these functions is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/multiplicative-expression/p-5/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/not-null-assertion-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/not-null-assertion-expression/testsMap.json index 49ee070d920..0a0d7c5e118 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/not-null-assertion-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/not-null-assertion-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The type of non-null assertion e!! expression is the non-nullable variant of the type of e.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/not-null-assertion-expression/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/logical-not-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/logical-not-expression/testsMap.json index 13df13f89e2..98367f29488 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/logical-not-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/logical-not-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "No additional restrictions apply for unary minus", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/logical-not-expression/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-minus-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-minus-expression/testsMap.json index 146d11467ac..6a870c66472 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-minus-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-minus-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "No additional restrictions apply for unary minus", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-minus-expression/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-plus-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-plus-expression/testsMap.json index 4bd469c175d..2581991f80e 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-plus-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-plus-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "No additional restrictions apply for unary plus", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/prefix-expressions/unary-plus-expression/p-3/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/testsMap.json index 41da3f7c50c..2ce032cc497 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "The return type of range operator is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "2": [ @@ -18,7 +19,8 @@ "description": "The return type of range operator is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/range-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/testsMap.json index 306f1b8dee7..9340b4349ab 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/testsMap.json @@ -198,7 +198,8 @@ "description": "The type of the try-expression is the least upper bound of the types of the last expressions of the try body and the last expressions of all the catch blocks", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/p-8/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } @@ -224,7 +225,8 @@ "description": "The type of the try-expression is the least upper bound of the types of the last expressions of the try body and the last expressions of all the catch blocks", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/try-expression/p-8/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/testsMap.json index 9e8d665bc78..7f98270ab62 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "Containment-checking expressions always have type kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-5/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/testsMap.json index 633251ea491..69d46c79e66 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/testsMap.json @@ -8,7 +8,8 @@ "description": "Type-checking expression always has type kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" }, { "specVersion": "0.1-296", @@ -16,7 +17,8 @@ "description": "Type-checking expression always has type kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/type-checking-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json index 24d43cfb086..ad9939d2753 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json @@ -8,7 +8,8 @@ "description": "Non-exhaustive when using nullable enum values.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "enumClasses" }, { "specVersion": "0.1-100", @@ -16,7 +17,8 @@ "description": "Non-exhaustive when using subclasses of the nullable sealed class.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "sealedClasses" }, { "specVersion": "0.1-100", @@ -190,7 +192,8 @@ "description": "Non-exhaustive when using subclasses of the sealed class.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/6.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "sealedClasses" }, { "specVersion": "0.1-152", @@ -420,7 +423,8 @@ "description": "Exhaustive when using subclasses of the nullable sealed class.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.3.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "sealedClasses" }, { "specVersion": "0.1-100", @@ -428,7 +432,8 @@ "description": "Exhaustive when using nullable enum values.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.2.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "enumClasses" }, { "specVersion": "0.1-100", @@ -478,7 +483,8 @@ "description": "Exhaustive when, with bound value (sealed, enum, boolean), with redundant else branch.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "enumClasses, sealedClasses" }, { "specVersion": "0.1-100", @@ -578,7 +584,8 @@ "description": "Exhaustive when using enum values.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "enumClasses" } ], "6": [ @@ -588,7 +595,8 @@ "description": "Exhaustive when using subclasses of the sealed class.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/6.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "sealedClasses" } ], "9": [ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json index 87fe3e87a14..93e41eede8d 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json @@ -18,7 +18,8 @@ "description": "\u0027When\u0027 with bound value and type test condition on the non-type operand of the type checking operator.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "classes" }, { "specVersion": "0.1-296", @@ -26,7 +27,8 @@ "description": "\u0027When\u0027 with bound value and type test condition (without companion object in classes), but without type checking operator.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "classes" }, { "specVersion": "0.1-152", @@ -92,7 +94,8 @@ "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with range expression, but without containment checking operator.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider" }, { "specVersion": "0.1-296", @@ -100,7 +103,8 @@ "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with contains operator and type without defined contains operator.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "classes" }, { "specVersion": "0.1-152", @@ -228,7 +232,8 @@ "description": "\u0027When\u0027 with bound value and type test condition (invert type checking operator).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.2.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "classes, sealedClasses, objects" }, { "specVersion": "0.1-296", @@ -236,7 +241,8 @@ "description": "\u0027When\u0027 with bound value and enumaration of type test conditions.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.3.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "classes, sealedClasses, objects" }, { "specVersion": "0.1-296", @@ -244,7 +250,8 @@ "description": "\u0027When\u0027 with bound value and enumaration of type test conditions (with invert type checking operator).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.4.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "sealedClasses" }, { "specVersion": "0.1-296", @@ -252,7 +259,8 @@ "description": "\u0027When\u0027 with bound value and type test condition.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "classes, objects" }, { "specVersion": "0.1-313", @@ -286,7 +294,8 @@ "description": "\u0027When\u0027 with different variants of the arithmetic expressions (additive expression and multiplicative expression) in \u0027when condition\u0027.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/10.2.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes, functions" }, { "specVersion": "0.1-201", @@ -294,7 +303,8 @@ "description": "\u0027When\u0027 with enumeration of the different variants of expressions in \u0027when condition\u0027.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/10.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes, functions" } ], "3": [ @@ -304,7 +314,8 @@ "description": "\u0027When\u0027 with bound value and containment operator.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes" }, { "specVersion": "0.1-296", @@ -312,7 +323,8 @@ "description": "\u0027When\u0027 with bound value and enumeration of the containment operators.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes" } ], "7": [ @@ -472,7 +484,8 @@ "description": "When with non-boolean value in the when condition.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider" }, { "specVersion": "0.1-100", @@ -480,7 +493,8 @@ "description": "When without bound value, forbidden comma in the when condition.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes" } ], "1": [ @@ -528,7 +542,8 @@ "description": "When without bound value, various boolean values in the when condition.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, enumClasses, sealedClasses, classes" }, { "specVersion": "0.1-100", @@ -536,7 +551,8 @@ "description": "\u0027When\u0027 without bound value and with Nothing in condition (subtype of Boolean).", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.3.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider" }, { "specVersion": "0.1-100", @@ -562,7 +578,8 @@ "description": "When without bound value, various expressions in the control structure body.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/1.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes, functions" }, { "specVersion": "0.1-152", @@ -636,7 +653,8 @@ "description": "\u0027When\u0027 with bound value and with different variants of expressions in the control structure body.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt", "unexpectedBehaviour": true, - "linkType": "main" + "linkType": "main", + "helpers": "typesProvider, classes, functions" }, { "specVersion": "0.1-313", diff --git a/compiler/tests-spec/testData/diagnostics/linked/overloadable-operators/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/overloadable-operators/testsMap.json index 5c079807f33..ad2f18f855c 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overloadable-operators/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/overloadable-operators/testsMap.json @@ -28,7 +28,8 @@ "description": "All comparison expressions always have type kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/comparison-expressions/p-5/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" }, { "specVersion": "0.1-218", @@ -36,7 +37,8 @@ "description": "The return type of these functions is not restricted.", "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/additive-expression/p-4/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/testsMap.json index 0115ce33ab3..4ef1dfad5d4 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/testsMap.json @@ -20,7 +20,8 @@ "description": "condition expression is not a subtype of kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/p-3/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } @@ -46,7 +47,8 @@ "description": "condition expression is not a subtype of kotlin.Boolean.", "path": "compiler/tests-spec/testData/diagnostics/linked/statements/loop-statements/while-loop-statement/p-3/neg/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/testsMap.json index a8bfc0b07b5..38828c1f35e 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/testsMap.json @@ -8,7 +8,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType, functions" }, { "specVersion": "0.1-296", @@ -16,7 +17,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType, functions" } ] } @@ -60,7 +62,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-8/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ], "1": [ @@ -70,7 +73,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-8/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/testsMap.json index 450915dc002..84ee41f0e24 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/testsMap.json @@ -8,7 +8,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.2.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" }, { "specVersion": "0.1-296", @@ -16,7 +17,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" }, { "specVersion": "0.1-296", @@ -24,7 +26,8 @@ "description": "The use of Boolean literals as the identifier (with backtick) in the class.", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-8/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "primary" + "linkType": "primary", + "helpers": "checkType" } ] } diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/testsMap.json index be2222e5f3b..c81512db7d7 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/testsMap.json @@ -8,7 +8,8 @@ "description": "Check of Nothing type", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/neg/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType" } ] }, @@ -20,7 +21,8 @@ "description": "Check of Nothing as a subtype of any type", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/pos/2.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" } ], "1": [ @@ -30,7 +32,8 @@ "description": "Check of Nothing type is a subtype of any types", "path": "compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/pos/1.1.kt", "unexpectedBehaviour": false, - "linkType": "main" + "linkType": "main", + "helpers": "checkType, functions" } ] } diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapGenerator.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapGenerator.kt index 04008f1114b..7d3aae9bb28 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapGenerator.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapGenerator.kt @@ -56,6 +56,7 @@ object TestsJsonMapGenerator { test.unexpectedBehavior || test.cases.byNumbers.any { it.value.unexpectedBehavior } ) addProperty("linkType", linkType.toString()) + test.helpers?.run { addProperty("helpers", test.helpers.joinToString()) } }