Create import list psi element even if no directives are present

Fix a problem where deleting last import directive via "optimize imports" could lead to incorrect psi structure resulting in CCE, see EA-64291
New imports are inserted at the head (after package directive if present) of the file (before any comments) if no imports were present
Add test for inserting import to file where a first statement is a comment
Drop code dealing with non-existing import list in ImportInsertHelperImpl
AbstractQuickFixTest: check for unexpected actions before changes to the file are made as it relies on the first line having specific format
This commit is contained in:
Pavel V. Talanov
2015-06-08 15:13:33 +03:00
parent 4c4f730c53
commit 07d35d305e
461 changed files with 1275 additions and 472 deletions
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: AbsentLeftHandSide.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -125,4 +127,4 @@ JetFile: AbsentLeftHandSide.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('html')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: BareVal.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -53,4 +55,4 @@ JetFile: BareVal.kt
PsiErrorElement:Expecting property name or receiver type
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: BrokenFunctionSuperType.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -31,4 +33,4 @@ JetFile: BrokenFunctionSuperType.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: CatchKeywordRBrace.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -35,4 +37,4 @@ JetFile: CatchKeywordRBrace.kt
PsiElement(RPAR)(')')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: CloseBraceAtTopLevel.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PsiErrorElement:Expecting a top level declaration
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
@@ -18,4 +20,4 @@ JetFile: CloseBraceAtTopLevel.kt
PsiElement(RPAR)(')')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: DoWhileWithEmptyCondition.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -40,4 +42,4 @@ JetFile: DoWhileWithEmptyCondition.kt
BOOLEAN_CONSTANT
PsiElement(true)('true')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: DoWhileWithoutLPar.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -37,4 +39,4 @@ JetFile: DoWhileWithoutLPar.kt
BOOLEAN_CONSTANT
PsiElement(true)('true')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: EnumEntryInitList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(enum)('enum')
@@ -249,4 +251,4 @@ JetFile: EnumEntryInitList.kt
VALUE_ARGUMENT_LIST
PsiErrorElement:Expecting an argument list
<empty list>
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForEmptyParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -38,4 +40,4 @@ JetFile: ForEmptyParentheses.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForEmptyWithoutBody.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -33,4 +35,4 @@ JetFile: ForEmptyWithoutBody.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForNoBodyBeforeRBrace.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -38,4 +40,4 @@ JetFile: ForNoBodyBeforeRBrace.kt
<empty list>
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -40,4 +42,4 @@ JetFile: ForRecovery.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForWithOnlyOneLParInEOF.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -23,4 +25,4 @@ JetFile: ForWithOnlyOneLParInEOF.kt
PsiErrorElement:Expecting ')'
<empty list>
BODY
<empty list>
<empty list>
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForWithoutBodyInEOF.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -20,4 +22,4 @@ JetFile: ForWithoutBodyInEOF.kt
PsiElement(RPAR)(')')
BODY
PsiErrorElement:Expecting an expression
<empty list>
<empty list>
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForWithoutLPar.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: ForWithoutLPar.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForWithoutLParInEOF.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -17,4 +19,4 @@ JetFile: ForWithoutLParInEOF.kt
<empty list>
BODY
PsiErrorElement:Expecting an expression
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: ForWithoutParamButWithRange.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -36,4 +38,4 @@ JetFile: ForWithoutParamButWithRange.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ForWithoutRange.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: ForWithoutRange.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IfKeywordRBrace.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -31,4 +33,4 @@ JetFile: IfKeywordRBrace.kt
PsiElement(RPAR)(')')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IfWithEmptyCondition.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -28,4 +30,4 @@ JetFile: IfWithEmptyCondition.kt
BOOLEAN_CONSTANT
PsiElement(true)('true')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IfWithoutLPar.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -33,4 +35,4 @@ JetFile: IfWithoutLPar.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteAccessor1.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -33,4 +35,4 @@ JetFile: IncompleteAccessor1.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('D')
PsiElement(IDENTIFIER)('D')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteAccessor2.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -32,4 +34,4 @@ JetFile: IncompleteAccessor2.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('D')
PsiElement(IDENTIFIER)('D')
@@ -1,6 +1,8 @@
JetFile: IncompleteClassDeclaration.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -24,4 +26,4 @@ JetFile: IncompleteClassDeclaration.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
@@ -1,6 +1,8 @@
JetFile: IncompleteClassTypeParameters.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -25,4 +27,4 @@ JetFile: IncompleteClassTypeParameters.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteForRBrace.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -32,4 +34,4 @@ JetFile: IncompleteForRBrace.kt
PsiElement(RPAR)(')')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteFun.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiErrorElement:Expecting function name or receiver type
@@ -27,4 +29,4 @@ JetFile: IncompleteFun.kt
PsiElement(RPAR)(')')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: IncompleteFunDeclaration.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -23,4 +25,4 @@ JetFile: IncompleteFunDeclaration.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
@@ -1,6 +1,8 @@
JetFile: IncompleteFunTypeParameters.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -24,4 +26,4 @@ JetFile: IncompleteFunTypeParameters.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
@@ -1,6 +1,8 @@
JetFile: IncompleteTypeParameters.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -25,4 +27,4 @@ JetFile: IncompleteTypeParameters.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
@@ -1,6 +1,8 @@
JetFile: IncompleteTypeRefWithPackageKeyword.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -37,4 +39,4 @@ JetFile: IncompleteTypeRefWithPackageKeyword.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: IncompleteValTypeParameters.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -24,4 +26,4 @@ JetFile: IncompleteValTypeParameters.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('D')
PsiElement(IDENTIFIER)('D')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteWhenElse.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -70,4 +72,4 @@ JetFile: IncompleteWhenElse.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteWhere.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -32,4 +34,4 @@ JetFile: IncompleteWhere.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IncompleteWhere2.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -36,4 +38,4 @@ JetFile: IncompleteWhere2.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Next')
PsiElement(IDENTIFIER)('Next')
@@ -1,6 +1,8 @@
JetFile: InvalidCharAfterPropertyName.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -42,4 +44,4 @@ JetFile: InvalidCharAfterPropertyName.kt
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('I')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: InvalidCharInSingleLineLambda.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiComment(EOL_COMMENT)('// checks that invalid characters (inserted e.g. by completion) inside single-line block do not cause wrong scopes for declarations below')
PsiWhiteSpace('\n')
@@ -59,4 +61,4 @@ JetFile: InvalidCharInSingleLineLambda.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace(' ')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: MissingCommaInConstructorValueParameterList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -80,4 +82,4 @@ JetFile: MissingCommaInConstructorValueParameterList.kt
PsiElement(IDENTIFIER)('c')
PsiElement(CLOSING_QUOTE)('"')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: MissingCommaInValueArgumentList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -29,4 +31,4 @@ JetFile: MissingCommaInValueArgumentList.kt
PsiErrorElement:Expecting an element
<empty list>
PsiWhiteSpace('\n')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
@@ -1,6 +1,8 @@
JetFile: MissingCommaInValueParameterList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -43,4 +45,4 @@ JetFile: MissingCommaInValueParameterList.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: MissingCommaInValueParameterListWithValOrVar.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -131,4 +133,4 @@ JetFile: MissingCommaInValueParameterListWithValOrVar.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: NoArrowInWhen.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -40,4 +42,4 @@ JetFile: NoArrowInWhen.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -19,6 +19,8 @@ JetFile: PackageNewLineRecovery.kt
PsiElement(DOT)('.')
PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
<empty list>
IMPORT_LIST
<empty list>
PsiWhiteSpace('\n')
PROPERTY
MODIFIER_LIST
@@ -36,4 +38,4 @@ JetFile: PackageNewLineRecovery.kt
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('12')
PsiElement(INTEGER_LITERAL)('12')
+3 -1
View File
@@ -7,6 +7,8 @@ JetFile: PackageRecovery.kt
PsiElement(DOT)('.')
PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
<empty list>
IMPORT_LIST
<empty list>
PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// Hello')
PsiWhiteSpace('\n\n')
@@ -18,4 +20,4 @@ JetFile: PackageRecovery.kt
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('12')
PsiElement(INTEGER_LITERAL)('12')
@@ -1,6 +1,8 @@
JetFile: SameLineStatementRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -669,4 +671,4 @@ JetFile: SameLineStatementRecovery.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Some')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: ValueParameterNoTypeRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -37,4 +39,4 @@ JetFile: ValueParameterNoTypeRecovery.kt
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('13')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: WhenWithoutBraces.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -24,4 +26,4 @@ JetFile: WhenWithoutBraces.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: WhileWithEmptyCondition.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -25,4 +27,4 @@ JetFile: WhileWithEmptyCondition.kt
RETURN
PsiElement(return)('return')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: WhileWithoutLPar.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: WhileWithoutLPar.kt
BOOLEAN_CONSTANT
PsiElement(true)('true')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: WithWithoutInAndMultideclaration.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -37,4 +39,4 @@ JetFile: WithWithoutInAndMultideclaration.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: initRecovery.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -81,4 +83,4 @@ JetFile: initRecovery.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: kt2172.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -25,4 +27,4 @@ JetFile: kt2172.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: kt5102.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -52,4 +54,4 @@ JetFile: kt5102.kt
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: ConstructorModifiers.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -96,4 +98,4 @@ JetFile: ConstructorModifiers.kt
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
@@ -1,6 +1,8 @@
JetFile: EmptyParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -47,4 +49,4 @@ JetFile: EmptyParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: Everything.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -74,4 +76,4 @@ JetFile: Everything.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: FollowedByModifiers.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -35,4 +37,4 @@ JetFile: FollowedByModifiers.kt
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiElement(IDENTIFIER)('Bar')
@@ -1,6 +1,8 @@
JetFile: ParametersInParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -101,4 +103,4 @@ JetFile: ParametersInParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: TypeParametersAndParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -85,4 +87,4 @@ JetFile: TypeParametersAndParentheses.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: TypeParameterss.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -65,4 +67,4 @@ JetFile: TypeParameterss.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: Where.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -152,4 +154,4 @@ JetFile: Where.kt
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: ConstructorModifiers.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -123,4 +125,4 @@ JetFile: ConstructorModifiers.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: ConstructorModifiersAndName.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -135,4 +137,4 @@ JetFile: ConstructorModifiersAndName.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: EmptyParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -65,4 +67,4 @@ JetFile: EmptyParentheses.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: Everything.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -79,4 +81,4 @@ JetFile: Everything.kt
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: InFunction.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -132,4 +134,4 @@ JetFile: InFunction.kt
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: ParametersInParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -119,4 +121,4 @@ JetFile: ParametersInParentheses.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: TypeParametersAndParentheses.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -103,4 +105,4 @@ JetFile: TypeParametersAndParentheses.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: TypeParameterss.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -95,4 +97,4 @@ JetFile: TypeParameterss.kt
PsiElement(RPAR)(')')
CLASS_BODY
PsiErrorElement:Expecting a class body
<empty list>
<empty list>
@@ -1,6 +1,8 @@
JetFile: Where.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -196,4 +198,4 @@ JetFile: Where.kt
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: noQualifiedExpression.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -49,4 +51,4 @@ JetFile: noQualifiedExpression.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('test')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: noSafeQualifiedExpression.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -49,4 +51,4 @@ JetFile: noSafeQualifiedExpression.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('test')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: qualifiedExpressionWithSelector.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -53,4 +55,4 @@ JetFile: qualifiedExpressionWithSelector.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('test')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: qualifiedExpressionWithoutSelector.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -58,4 +60,4 @@ JetFile: qualifiedExpressionWithoutSelector.kt
PsiErrorElement:Expecting an element
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: safeQualifiedExpressionWithSelector.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -53,4 +55,4 @@ JetFile: safeQualifiedExpressionWithSelector.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('test')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: safeQualifiedExpressionWithoutSelector.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -58,4 +60,4 @@ JetFile: safeQualifiedExpressionWithoutSelector.kt
PsiErrorElement:Expecting an element
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: firstInFunction.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -21,4 +23,4 @@ JetFile: firstInFunction.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: firstInFunctionalType.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -27,4 +29,4 @@ JetFile: firstInFunctionalType.kt
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(IDENTIFIER)('Int')
@@ -1,6 +1,8 @@
JetFile: firstInLambda.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -29,4 +31,4 @@ JetFile: firstInLambda.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('0')
PsiWhiteSpace(' ')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: firstInPrimaryConstructor.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -22,4 +24,4 @@ JetFile: firstInPrimaryConstructor.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: firstInSecondaryConstructor.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -32,4 +34,4 @@ JetFile: firstInSecondaryConstructor.kt
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: firstInSetter.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: firstInSetter.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: secondInFunction.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -31,4 +33,4 @@ JetFile: secondInFunction.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: secondInFunctionalType.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -37,4 +39,4 @@ JetFile: secondInFunctionalType.kt
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(IDENTIFIER)('Int')
@@ -1,6 +1,8 @@
JetFile: secondInLambda.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -39,4 +41,4 @@ JetFile: secondInLambda.kt
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('0')
PsiWhiteSpace(' ')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: secondInPrimaryConstructor.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -32,4 +34,4 @@ JetFile: secondInPrimaryConstructor.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
@@ -1,6 +1,8 @@
JetFile: secondInSecondaryConstructor.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -42,4 +44,4 @@ JetFile: secondInSecondaryConstructor.kt
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')