diff --git a/compiler/testData/psi/annotation/at/kt21055.kt b/compiler/testData/psi/annotation/at/kt21055.kt deleted file mode 100644 index c2f899c4749..00000000000 --- a/compiler/testData/psi/annotation/at/kt21055.kt +++ /dev/null @@ -1,9 +0,0 @@ -fun main(args: Array) { - val c = C(1, 2, 3, 4) - val number = when (c) { - match B(e1, e2 @ : Pair if(l > r), e3) @ a: A @ m -> e1 + l + r - match (_, p :Pair, _) -> 20 - else -> 40 - } - println(number) -} diff --git a/compiler/testData/psi/annotation/at/kt21055.txt b/compiler/testData/psi/annotation/at/kt21055.txt deleted file mode 100644 index e25ff567661..00000000000 --- a/compiler/testData/psi/annotation/at/kt21055.txt +++ /dev/null @@ -1,240 +0,0 @@ -KtFile: kt21055.kt - PACKAGE_DIRECTIVE - - IMPORT_LIST - - FUN - PsiElement(fun)('fun') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('main') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('args') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Array') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_PROJECTION - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('String') - PsiElement(GT)('>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - PROPERTY - PsiElement(val)('val') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - CALL_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('C') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - VALUE_ARGUMENT - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('1') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_ARGUMENT - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('2') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_ARGUMENT - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('3') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_ARGUMENT - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('4') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n ') - PROPERTY - PsiElement(val)('val') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('number') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - WHEN - PsiElement(when)('when') - PsiWhiteSpace(' ') - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - BINARY_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('match') - PsiWhiteSpace(' ') - OPERATION_REFERENCE - PsiElement(IDENTIFIER)('B') - PARENTHESIZED - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('e1') - PsiErrorElement:Expecting ')' - - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - WHEN_CONDITION_WITH_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('e2') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting '->' - PsiElement(AT)('@') - PsiErrorElement:Expecting an expression - - PsiWhiteSpace(' ') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - PsiErrorElement:Expecting an expression - - PsiErrorElement:Expecting '->' - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Pair') - PsiWhiteSpace(' ') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - IF - PsiElement(if)('if') - PsiElement(LPAR)('(') - CONDITION - BINARY_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('l') - PsiWhiteSpace(' ') - OPERATION_REFERENCE - PsiElement(GT)('>') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('r') - PsiElement(RPAR)(')') - THEN - PsiErrorElement:Expecting an expression - - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - WHEN_CONDITION_WITH_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('e3') - PsiErrorElement:Expecting '->' - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - ANNOTATED_EXPRESSION - PsiErrorElement:Expected annotation identifier after '@' - PsiElement(AT)('@') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - PsiErrorElement:Expecting an expression - - PsiErrorElement:Expecting '->' - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiWhiteSpace(' ') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - ANNOTATED_EXPRESSION - PsiErrorElement:Expected annotation identifier after '@' - PsiElement(AT)('@') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('m') - PsiWhiteSpace(' ') - PsiElement(ARROW)('->') - PsiWhiteSpace(' ') - BINARY_EXPRESSION - BINARY_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('e1') - PsiWhiteSpace(' ') - OPERATION_REFERENCE - PsiElement(PLUS)('+') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('l') - PsiWhiteSpace(' ') - OPERATION_REFERENCE - PsiElement(PLUS)('+') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('r') - PsiWhiteSpace('\n ') - WHEN_ENTRY - WHEN_CONDITION_WITH_EXPRESSION - CALL_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('match') - PsiWhiteSpace(' ') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - VALUE_ARGUMENT - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('_') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_ARGUMENT - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('p') - PsiWhiteSpace(' ') - PsiErrorElement:Unexpected type specification - PsiElement(COLON)(':') - PsiElement(IDENTIFIER)('Pair') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_ARGUMENT - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('_') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(ARROW)('->') - PsiWhiteSpace(' ') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('20') - PsiWhiteSpace('\n ') - WHEN_ENTRY - PsiElement(else)('else') - PsiWhiteSpace(' ') - PsiElement(ARROW)('->') - PsiWhiteSpace(' ') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('40') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n ') - CALL_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('println') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - VALUE_ARGUMENT - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('number') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.kt b/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.kt deleted file mode 100644 index dabe6866794..00000000000 --- a/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.kt +++ /dev/null @@ -1,24 +0,0 @@ -@ :ann1 -class A1 - -@ /* */ // -:ann2 -class A2 - -@: ann3 -class A3 - -@ : ann4 -class A4 - -@set :ann5 -class A5 - -@ set : ann8 -class A8 - -@sset : ann9 -class A9 - -@ : -class A10 diff --git a/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.txt b/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.txt deleted file mode 100644 index 27e8f10a7bc..00000000000 --- a/compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.txt +++ /dev/null @@ -1,143 +0,0 @@ -KtFile: recoveryWhitespaceBeforeColon_ERR.kt - FILE_ANNOTATION_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - PsiWhiteSpace(' ') - PsiErrorElement:Expected annotation target before ':' - PsiElement(COLON)(':') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann1') - PACKAGE_DIRECTIVE - - IMPORT_LIST - - PsiWhiteSpace('\n') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A1') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - PsiWhiteSpace(' ') - PsiComment(BLOCK_COMMENT)('/* */') - PsiWhiteSpace(' ') - PsiComment(EOL_COMMENT)('//') - PsiWhiteSpace('\n') - PsiErrorElement:Expected annotation target before ':' - PsiElement(COLON)(':') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann2') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A2') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - PsiErrorElement:Expected annotation target before ':' - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann3') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A3') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - PsiWhiteSpace(' ') - PsiErrorElement:Expected annotation target before ':' - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann4') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A4') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - ANNOTATION_TARGET - PsiElement(set)('set') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann5') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A5') - PsiWhiteSpace('\n\n') - MODIFIER_LIST - PsiErrorElement:Expected annotation identifier after '@' - PsiElement(AT)('@') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting a top level declaration - PsiElement(IDENTIFIER)('set') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting a top level declaration - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting a top level declaration - PsiElement(IDENTIFIER)('ann8') - PsiWhiteSpace('\n') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A8') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - ANNOTATION_ENTRY - PsiElement(AT)('@') - PsiErrorElement:Expected annotation target before ':' - PsiElement(IDENTIFIER)('sset') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - CONSTRUCTOR_CALLEE - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ann9') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A9') - PsiWhiteSpace('\n\n') - CLASS - MODIFIER_LIST - PsiErrorElement:Expected annotation identifier after ':' - PsiElement(AT)('@') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace('\n') - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A10') diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java index abab9a9ca6b..37a636a3f53 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java @@ -860,11 +860,6 @@ public class ParsingTestGenerated extends AbstractParsingTest { runTest("compiler/testData/psi/annotation/at/expressionJustAtTyped.kt"); } - @TestMetadata("kt21055.kt") - public void testKt21055() throws Exception { - runTest("compiler/testData/psi/annotation/at/kt21055.kt"); - } - @TestMetadata("modifierAtFileStart.kt") public void testModifierAtFileStart() throws Exception { runTest("compiler/testData/psi/annotation/at/modifierAtFileStart.kt"); @@ -880,11 +875,6 @@ public class ParsingTestGenerated extends AbstractParsingTest { runTest("compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon.kt"); } - @TestMetadata("recoveryWhitespaceBeforeColon_ERR.kt") - public void testRecoveryWhitespaceBeforeColon_ERR() throws Exception { - runTest("compiler/testData/psi/annotation/at/recoveryWhitespaceBeforeColon_ERR.kt"); - } - @TestMetadata("validDeclarations.kt") public void testValidDeclarations() throws Exception { runTest("compiler/testData/psi/annotation/at/validDeclarations.kt");