azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed parsing of object and enum entries to drop "KtObjectDeclarationName"

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-30 21:14:03 +03:00
parent 03cda7f4d1
commit 52dc23012f
61 changed files with 180 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/CommentsBinding.txt
Vendored
+4 -8
View File
@@ -350,8 +350,7 @@ JetFile: CommentsBinding.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// this is A')
@@ -363,15 +362,13 @@ JetFile: CommentsBinding.kt
PsiElement(KDOC_TEXT)(' This is B ')
PsiElement(KDOC_END)('*/')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
PsiComment(BLOCK_COMMENT)('/* And this is C */')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('C')
PsiElement(IDENTIFIER)('C')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
@@ -381,8 +378,7 @@ JetFile: CommentsBinding.kt
PsiElement(KDOC_TEXT)(' This is X ')
PsiElement(KDOC_END)('*/')
PsiWhiteSpace('\n ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('X')
PsiElement(IDENTIFIER)('X')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
compiler/testData/psi/DefaultKeyword.txt
Vendored
+17 -30
View File
@@ -72,8 +72,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -96,8 +95,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -123,8 +121,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n')
OBJECT_DECLARATION
PsiComment(EOL_COMMENT)('//should be error')
@@ -133,10 +130,9 @@ JetFile: DefaultKeyword.kt
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiErrorElement:Name expected
<empty list>
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiErrorElement:Name expected
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
@@ -145,8 +141,7 @@ JetFile: DefaultKeyword.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -187,8 +182,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('C')
PsiElement(IDENTIFIER)('C')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -217,13 +211,11 @@ JetFile: DefaultKeyword.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
@@ -251,10 +243,9 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace(' ')
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace('\n')
OBJECT_DECLARATION_NAME
PsiErrorElement:Name expected
<empty list>
PsiErrorElement:Name expected
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
CLASS
@@ -326,13 +317,11 @@ JetFile: DefaultKeyword.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
@@ -355,13 +344,11 @@ JetFile: DefaultKeyword.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
@@ -374,4 +361,4 @@ JetFile: DefaultKeyword.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumCommas.txt
Vendored
+5 -9
View File
@@ -15,25 +15,21 @@ JetFile: EnumCommas.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('NORTH')
PsiElement(IDENTIFIER)('NORTH')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('SOUTH')
PsiElement(IDENTIFIER)('SOUTH')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('WEST')
PsiElement(IDENTIFIER)('WEST')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('EAST')
PsiElement(IDENTIFIER)('EAST')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntryCommaAnnotatedMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
compiler/testData/psi/EnumEntryCommaInlineMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntryCommaInlineMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
compiler/testData/psi/EnumEntryCommaMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntryCommaMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
compiler/testData/psi/EnumEntryCommaPublicMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntryCommaPublicMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
compiler/testData/psi/EnumEntrySemicolonInlineMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntrySemicolonInlineMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
FUN
compiler/testData/psi/EnumEntrySemicolonMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntrySemicolonMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
FUN
compiler/testData/psi/EnumEntrySpaceInlineMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntrySpaceInlineMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
PsiWhiteSpace('\n\n ')
compiler/testData/psi/EnumEntrySpaceMember.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntrySpaceMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
PsiWhiteSpace('\n\n ')
compiler/testData/psi/EnumEntryTwoCommas.txt
Vendored
+1 -2
View File
@@ -15,8 +15,7 @@ JetFile: EnumEntryTwoCommas.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
compiler/testData/psi/EnumIn.txt
Vendored
+1 -2
View File
@@ -15,7 +15,6 @@ JetFile: EnumIn.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('`in`')
PsiElement(IDENTIFIER)('`in`')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumInline.txt
Vendored
+1 -2
View File
@@ -15,7 +15,6 @@ JetFile: EnumInline.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('inline')
PsiElement(IDENTIFIER)('inline')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumInlinePublic.txt
Vendored
+2 -4
View File
@@ -18,16 +18,14 @@ JetFile: EnumInlinePublic.kt
MODIFIER_LIST
PsiElement(inline)('inline')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('public')
PsiElement(IDENTIFIER)('public')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
MODIFIER_LIST
PsiElement(inner)('inner')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('private')
PsiElement(IDENTIFIER)('private')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
compiler/testData/psi/EnumMissingName.txt
Vendored
+4 -7
View File
@@ -32,8 +32,7 @@ JetFile: EnumMissingName.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('RED')
PsiElement(IDENTIFIER)('RED')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -50,8 +49,7 @@ JetFile: EnumMissingName.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GREEN')
PsiElement(IDENTIFIER)('GREEN')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -68,8 +66,7 @@ JetFile: EnumMissingName.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('BLUE')
PsiElement(IDENTIFIER)('BLUE')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -84,4 +81,4 @@ JetFile: EnumMissingName.kt
PsiElement(INTEGER_LITERAL)('0x0000FF')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumOldConstructorSyntax.txt
Vendored
+1 -2
View File
@@ -27,8 +27,7 @@ JetFile: EnumOldConstructorSyntax.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('FIRST')
PsiElement(IDENTIFIER)('FIRST')
PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
<empty list>
PsiErrorElement:Expecting member declaration
compiler/testData/psi/EnumShortCommas.txt
Vendored
+4 -7
View File
@@ -30,8 +30,7 @@ JetFile: EnumShortCommas.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('RED')
PsiElement(IDENTIFIER)('RED')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -48,8 +47,7 @@ JetFile: EnumShortCommas.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GREEN')
PsiElement(IDENTIFIER)('GREEN')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -66,8 +64,7 @@ JetFile: EnumShortCommas.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('BLUE')
PsiElement(IDENTIFIER)('BLUE')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -85,4 +82,4 @@ JetFile: EnumShortCommas.kt
PsiWhiteSpace('\n ')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumShortWithOverload.txt
Vendored
+4 -7
View File
@@ -30,8 +30,7 @@ JetFile: EnumShortWithOverload.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('RED')
PsiElement(IDENTIFIER)('RED')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -81,8 +80,7 @@ JetFile: EnumShortWithOverload.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GREEN')
PsiElement(IDENTIFIER)('GREEN')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -132,8 +130,7 @@ JetFile: EnumShortWithOverload.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('BLUE')
PsiElement(IDENTIFIER)('BLUE')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -199,4 +196,4 @@ JetFile: EnumShortWithOverload.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/EnumWithAnnotationKeyword.txt
Vendored
+1 -2
View File
@@ -19,8 +19,7 @@ JetFile: EnumWithAnnotationKeyword.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('D')
PsiElement(IDENTIFIER)('D')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
compiler/testData/psi/Enums.txt
Vendored
+3 -6
View File
@@ -30,8 +30,7 @@ JetFile: Enums.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('RED')
PsiElement(IDENTIFIER)('RED')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -48,8 +47,7 @@ JetFile: Enums.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GREEN')
PsiElement(IDENTIFIER)('GREEN')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -66,8 +64,7 @@ JetFile: Enums.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('BLUE')
PsiElement(IDENTIFIER)('BLUE')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
compiler/testData/psi/InterfaceWithEnumKeyword.txt
Vendored
+1 -2
View File
@@ -54,7 +54,6 @@ JetFile: InterfaceWithEnumKeyword.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('D')
PsiElement(IDENTIFIER)('D')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/NamedClassObject.txt
Vendored
+5 -9
View File
@@ -17,8 +17,7 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Companion')
PsiElement(IDENTIFIER)('Companion')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
@@ -26,8 +25,7 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
@@ -35,8 +33,7 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('C')
PsiElement(IDENTIFIER)('C')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -51,7 +48,6 @@ JetFile: NamedClassObject.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('C')
PsiElement(IDENTIFIER)('C')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/SimpleClassMembers.txt
Vendored
+3 -5
View File
@@ -22,8 +22,7 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('foo')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -82,8 +81,7 @@ JetFile: SimpleClassMembers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('foo')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
@@ -401,4 +399,4 @@ JetFile: SimpleClassMembers.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/ShortAnnotations.txt
Vendored
+3 -5
View File
@@ -107,8 +107,7 @@ JetFile: ShortAnnotations.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n')
PsiErrorElement:Expecting a top level declaration
PsiElement(IDENTIFIER)('foo')
@@ -404,8 +403,7 @@ JetFile: ShortAnnotations.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiWhiteSpace('\n ')
PsiErrorElement:Expecting member declaration
PsiElement(IDENTIFIER)('foo')
@@ -780,4 +778,4 @@ JetFile: ShortAnnotations.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/at/enumEntries.txt
Vendored
+6 -11
View File
@@ -41,8 +41,7 @@ JetFile: enumEntries.kt
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('X')
PsiElement(IDENTIFIER)('X')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -65,8 +64,7 @@ JetFile: enumEntries.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Ann')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Y')
PsiElement(IDENTIFIER)('Y')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -98,8 +96,7 @@ JetFile: enumEntries.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Z')
PsiElement(IDENTIFIER)('Z')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -130,8 +127,7 @@ JetFile: enumEntries.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('private')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Q')
PsiElement(IDENTIFIER)('Q')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n\n ')
ENUM_ENTRY
@@ -149,8 +145,7 @@ JetFile: enumEntries.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('W')
PsiElement(IDENTIFIER)('W')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
FUN
@@ -174,4 +169,4 @@ JetFile: enumEntries.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/annotation/at/validDeclarations.txt
Vendored
+4 -6
View File
@@ -471,9 +471,8 @@ JetFile: validDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION_NAME
PsiErrorElement:Name expected
PsiElement(AT)('@')
PsiErrorElement:Name expected
PsiElement(AT)('@')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(companion)('companion')
@@ -488,8 +487,7 @@ JetFile: validDeclarations.kt
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
SECONDARY_CONSTRUCTOR
@@ -661,4 +659,4 @@ JetFile: validDeclarations.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/AnonymousObjects.txt
Vendored
+3 -5
View File
@@ -137,13 +137,11 @@ JetFile: AnonymousObjects.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('TOO_MANY_CLICKS')
PsiElement(IDENTIFIER)('TOO_MANY_CLICKS')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('ONE_MORE_MESSAGE')
PsiElement(IDENTIFIER)('ONE_MORE_MESSAGE')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
@@ -202,4 +200,4 @@ JetFile: AnonymousObjects.kt
PsiElement(RBRACE)('}')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Color.txt
Vendored
+4 -7
View File
@@ -56,8 +56,7 @@ JetFile: Color.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('RED')
PsiElement(IDENTIFIER)('RED')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -84,8 +83,7 @@ JetFile: Color.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GREEN')
PsiElement(IDENTIFIER)('GREEN')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -112,8 +110,7 @@ JetFile: Color.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('BLUE')
PsiElement(IDENTIFIER)('BLUE')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -138,4 +135,4 @@ JetFile: Color.kt
PsiElement(INTEGER_LITERAL)('255')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/util/Comparison.txt
Vendored
+4 -7
View File
@@ -217,18 +217,15 @@ JetFile: Comparison.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('LS')
PsiElement(IDENTIFIER)('LS')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('EQ')
PsiElement(IDENTIFIER)('EQ')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('GR')
PsiElement(IDENTIFIER)('GR')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
@@ -420,4 +417,4 @@ JetFile: Comparison.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GR')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/namelessObjectAsEnumMember.txt
Vendored
+6 -9
View File
@@ -19,13 +19,11 @@ JetFile: namelessObjectAsEnumMember.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('A')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('B')
PsiElement(IDENTIFIER)('B')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
@@ -33,8 +31,7 @@ JetFile: namelessObjectAsEnumMember.kt
PsiElement(inner)('inner')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n')
OBJECT_DECLARATION_NAME
PsiErrorElement:Name expected
<empty list>
PsiElement(RBRACE)('}')
PsiErrorElement:Name expected
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
Vendored
+4 -7
View File
@@ -130,8 +130,7 @@ JetFile: nestedClassAmbiguity.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Nested4')
PsiElement(IDENTIFIER)('Nested4')
PsiWhiteSpace('\n ')
PRIMARY_CONSTRUCTOR
PsiElement(constructor)('constructor')
@@ -146,8 +145,7 @@ JetFile: nestedClassAmbiguity.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Nested5')
PsiElement(IDENTIFIER)('Nested5')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
@@ -179,8 +177,7 @@ JetFile: nestedClassAmbiguity.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('TopLevel')
PsiElement(IDENTIFIER)('TopLevel')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
PsiElement(constructor)('constructor')
@@ -213,4 +210,4 @@ JetFile: nestedClassAmbiguity.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/ImportRecovery.txt
Vendored
+1 -2
View File
@@ -22,8 +22,7 @@ JetFile: ImportRecovery.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('StyleSheetOrigin')
PsiElement(IDENTIFIER)('StyleSheetOrigin')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
Vendored
+5 -9
View File
@@ -6,8 +6,7 @@ JetFile: ConstructorModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
@@ -20,8 +19,7 @@ JetFile: ConstructorModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
@@ -38,8 +36,7 @@ JetFile: ConstructorModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
@@ -66,8 +63,7 @@ JetFile: ConstructorModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PRIMARY_CONSTRUCTOR
MODIFIER_LIST
@@ -100,4 +96,4 @@ JetFile: ConstructorModifiers.kt
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
Vendored
+4 -7
View File
@@ -6,8 +6,7 @@ JetFile: EmptyParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -16,8 +15,7 @@ JetFile: EmptyParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -30,8 +28,7 @@ JetFile: EmptyParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -49,4 +46,4 @@ JetFile: EmptyParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/objects/declarations/Everything.txt
Vendored
+2 -3
View File
@@ -6,8 +6,7 @@ JetFile: Everything.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -76,4 +75,4 @@ JetFile: Everything.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
Vendored
+3 -5
View File
@@ -6,8 +6,7 @@ JetFile: FollowedByModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
@@ -20,8 +19,7 @@ JetFile: FollowedByModifiers.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace('\n\n')
CLASS
MODIFIER_LIST
@@ -38,4 +36,4 @@ JetFile: FollowedByModifiers.kt
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiElement(IDENTIFIER)('Bar')
compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
Vendored
+4 -7
View File
@@ -6,8 +6,7 @@ JetFile: ParametersInParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -34,8 +33,7 @@ JetFile: ParametersInParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -66,8 +64,7 @@ JetFile: ParametersInParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -103,4 +100,4 @@ JetFile: ParametersInParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
Vendored
+4 -7
View File
@@ -6,8 +6,7 @@ JetFile: TypeParametersAndParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -26,8 +25,7 @@ JetFile: TypeParametersAndParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -58,8 +56,7 @@ JetFile: TypeParametersAndParentheses.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -87,4 +84,4 @@ JetFile: TypeParametersAndParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
Vendored
+4 -7
View File
@@ -6,8 +6,7 @@ JetFile: TypeParameterss.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -22,8 +21,7 @@ JetFile: TypeParameterss.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -42,8 +40,7 @@ JetFile: TypeParameterss.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiErrorElement:Type parameters are not allowed for objects
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
@@ -67,4 +64,4 @@ JetFile: TypeParameterss.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/recovery/objects/declarations/Where.txt
Vendored
+6 -11
View File
@@ -6,8 +6,7 @@ JetFile: Where.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PsiErrorElement:Where clause is not allowed for objects
PsiErrorElement:Type constraints are not allowed when no type parameters declared
@@ -28,8 +27,7 @@ JetFile: Where.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
@@ -59,8 +57,7 @@ JetFile: Where.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -85,8 +82,7 @@ JetFile: Where.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -120,8 +116,7 @@ JetFile: Where.kt
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Foo')
PsiElement(IDENTIFIER)('Foo')
PRIMARY_CONSTRUCTOR
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
@@ -154,4 +149,4 @@ JetFile: Where.kt
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/secondaryConstructors/enumParsing.txt
Vendored
+4 -7
View File
@@ -15,8 +15,7 @@ JetFile: enumParsing.kt
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('abc1')
PsiElement(IDENTIFIER)('abc1')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -41,8 +40,7 @@ JetFile: enumParsing.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('abc2')
PsiElement(IDENTIFIER)('abc2')
INITIALIZER_LIST
DELEGATOR_SUPER_CALL
CONSTRUCTOR_CALLEE
@@ -71,8 +69,7 @@ JetFile: enumParsing.kt
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
ENUM_ENTRY
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('abc3')
PsiElement(IDENTIFIER)('abc3')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
SECONDARY_CONSTRUCTOR
@@ -137,4 +134,4 @@ JetFile: enumParsing.kt
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')