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

compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt

@@ -86,3 +86,9 @@ object TrailingCommentsBinder : WhitespacesAndCommentsBinder {
         return result
     }
 }
+
+object DoNotBindAnything : WhitespacesAndCommentsBinder {
+    override fun getEdgePosition(tokens: List<IElementType>, atStreamEdge: Boolean, getter: WhitespacesAndCommentsBinder.TokenTextGetter): Int {
+        return 0
+    }
+}

compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java

@@ -215,8 +215,8 @@ public class JetParsing extends AbstractJetParsing {
             parseFileAnnotationList(FILE_ANNOTATIONS_WHEN_PACKAGE_OMITTED);
             packageDirective = mark();
             packageDirective.done(PACKAGE_DIRECTIVE);
-            // this is necessary to allow comments at the start of the file to be bound to the first declaration:
+            // this is necessary to allow comments at the start of the file to be bound to the first declaration
-            packageDirective.setCustomEdgeTokenBinders(PrecedingCommentsBinder.INSTANCE$, null);
+            packageDirective.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE$, null);
         }
 
         parseImportDirectives();
@@ -351,13 +351,15 @@ public class JetParsing extends AbstractJetParsing {
     }
 
     private void parseImportDirectives() {
-        if (at(IMPORT_KEYWORD)) {
+        PsiBuilder.Marker importList = mark();
-            PsiBuilder.Marker importList = mark();
+        if (!at(IMPORT_KEYWORD)) {
-            while (at(IMPORT_KEYWORD)) {
+            // this is necessary to allow comments at the start of the file to be bound to the first declaration
-                parseImportDirective();
+            importList.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE$, null);
-            }
-            importList.done(IMPORT_LIST);
         }
+        while (at(IMPORT_KEYWORD)) {
+            parseImportDirective();
+        }
+        importList.done(IMPORT_LIST);
     }
 
     /*

compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java

@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
 import java.io.IOException;
 
 public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
-    public static final int STUB_VERSION = 46;
+    public static final int STUB_VERSION = 47;
 
     private static final String NAME = "kotlin.FILE";
 

compiler/testData/parseCodeFragment/block/packageDirective.txt

@@ -6,6 +6,8 @@ JetFile: fragment.kt
         PsiWhiteSpace(' ')
         REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
+      IMPORT_LIST
+        <empty list>
     PsiWhiteSpace('\n')
     PROPERTY
       PsiElement(val)('val')

compiler/testData/psi/AbsentInnerType.txt

@@ -1,6 +1,8 @@
 JetFile: AbsentInnerType.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/AnonymousInitializer.txt

@@ -1,6 +1,8 @@
 JetFile: AnonymousInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/AssertNotNull.txt

@@ -1,6 +1,8 @@
 JetFile: AssertNotNull.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/BabySteps.txt

@@ -4,6 +4,8 @@ JetFile: BabySteps.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/BabySteps_ERR.txt

@@ -4,6 +4,8 @@ JetFile: BabySteps_ERR.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/BackslashInString.txt

@@ -1,6 +1,8 @@
 JetFile: BackslashInString.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt

@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*')

compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt

@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*\n/*')

compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt

@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile3.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*\n\nfooo')

compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt

@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile4.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*\n\n/*foo*/\n\nasdfas')

compiler/testData/psi/ByClauses.txt

@@ -1,6 +1,8 @@
 JetFile: ByClauses.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/CallWithManyClosures.txt

@@ -1,6 +1,8 @@
 JetFile: CallWithManyClosures.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/CallsInWhen.txt

@@ -1,6 +1,8 @@
 JetFile: CallsInWhen.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/Constructors.txt

@@ -1,6 +1,8 @@
 JetFile: Constructors.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/ControlStructures.txt

@@ -1,6 +1,8 @@
 JetFile: ControlStructures.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/DefaultKeyword.txt

@@ -1,6 +1,8 @@
 JetFile: DefaultKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/DocCommentAfterFileAnnotations.txt

@@ -11,9 +11,11 @@ JetFile: DocCommentAfterFileAnnotations.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('volatile')
       PsiElement(RBRACKET)(']')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   CLASS
     KDoc
       PsiElement(KDOC_START)('/**')

compiler/testData/psi/DocCommentForFirstDeclaration.txt

@@ -1,6 +1,8 @@
 JetFile: DocCommentForFirstDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     KDoc
       PsiElement(KDOC_START)('/**')

compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt

@@ -9,6 +9,8 @@ JetFile: DocCommentOnPackageDirectiveLine.kt
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('p2')
     PsiElement(SEMICOLON)(';')
+  IMPORT_LIST
+    <empty list>
   FUN
     KDoc
       PsiElement(KDOC_START)('/**')

compiler/testData/psi/DocCommentsBinding.txt

@@ -1,6 +1,8 @@
 JetFile: DocCommentsBinding.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     KDoc
       PsiElement(KDOC_START)('/**')

compiler/testData/psi/DoubleColon.txt

@@ -1,6 +1,8 @@
 JetFile: DoubleColon.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/DynamicReceiver.txt

@@ -1,6 +1,8 @@
 JetFile: DynamicReceiver.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/DynamicSoftKeyword.txt

@@ -1,6 +1,8 @@
 JetFile: DynamicSoftKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       ANNOTATION_ENTRY

compiler/testData/psi/DynamicTypes.txt

@@ -1,6 +1,8 @@
 JetFile: DynamicTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/EOLsInComments.txt

@@ -1,6 +1,8 @@
 JetFile: EOLsInComments.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/EOLsOnRollback.txt

@@ -1,6 +1,8 @@
 JetFile: EOLsOnRollback.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/EmptyFile.txt

@@ -1,3 +1,5 @@
 JetFile: EmptyFile.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>

compiler/testData/psi/EnumCommas.txt

@@ -1,6 +1,8 @@
 JetFile: EnumCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/EnumMissingName.txt

@@ -1,6 +1,8 @@
 JetFile: EnumMissingName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiComment(EOL_COMMENT)('// Error: name should present')
     PsiWhiteSpace('\n')

compiler/testData/psi/EnumNoAnnotations.txt

@@ -20,6 +20,8 @@ JetFile: EnumNoAnnotations.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('enum')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST

compiler/testData/psi/EnumSemicolonBetween.txt

@@ -1,6 +1,8 @@
 JetFile: EnumSemicolonBetween.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/EnumSemicolonBetweenWithMembers.txt

@@ -1,6 +1,8 @@
 JetFile: EnumSemicolonBetweenWithMembers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/EnumShortCommas.txt

@@ -1,6 +1,8 @@
 JetFile: EnumShortCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/EnumShortNoCommas.txt

@@ -1,6 +1,8 @@
 JetFile: EnumShortNoCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiComment(EOL_COMMENT)('// NB: this test uses deprecated syntax')
     PsiWhiteSpace('\n')

compiler/testData/psi/EnumShortWithOverload.txt

@@ -1,6 +1,8 @@
 JetFile: EnumShortWithOverload.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/EnumShortWithOverloadNoCommas.txt

@@ -1,6 +1,8 @@
 JetFile: EnumShortWithOverloadNoCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/Enums.txt

@@ -1,6 +1,8 @@
 JetFile: Enums.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')

compiler/testData/psi/Expressions_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: Expressions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/ExtensionsWithQNReceiver.txt

@@ -1,6 +1,8 @@
 JetFile: ExtensionsWithQNReceiver.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/FileStart_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: FileStart_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiErrorElement:Expecting a top level declaration
     PsiElement(DIV)('/')
   PsiErrorElement:Expecting a top level declaration

compiler/testData/psi/FloatingPointLiteral.txt

@@ -1,6 +1,8 @@
 JetFile: FloatingPointLiteral.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/ForWithMultiDecl.txt

@@ -1,6 +1,8 @@
 JetFile: ForWithMultiDecl.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionCalls.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionCalls.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionExpressions.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionExpressions_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionExpressions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionLiterals.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionLiterals_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionLiterals_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionNoParameterList.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionNoParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionTypes.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionTypes_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionTypes_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiWhiteSpace(' ')

compiler/testData/psi/Functions.txt

@@ -1,6 +1,8 @@
 JetFile: Functions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionsWithoutName.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionsWithoutName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/FunctionsWithoutName_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: FunctionsWithoutName_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiErrorElement:Expecting '('

compiler/testData/psi/Functions_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: Functions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/HangOnLonelyModifier.txt

@@ -1,6 +1,8 @@
 JetFile: HangOnLonelyModifier.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/IfWithPropery.txt

@@ -1,6 +1,8 @@
 JetFile: IfWithPropery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/Inner.txt

@@ -1,6 +1,8 @@
 JetFile: Inner.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/IntegerLiteral.txt

@@ -1,6 +1,8 @@
 JetFile: IntegerLiteral.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/Interface.txt

@@ -1,6 +1,8 @@
 JetFile: Interface.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(interface)('interface')
     PsiWhiteSpace(' ')

compiler/testData/psi/Labels.txt

@@ -1,6 +1,8 @@
 JetFile: Labels.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/LineCommentAfterFileAnnotations.txt

@@ -11,9 +11,11 @@ JetFile: LineCommentAfterFileAnnotations.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('volatile')
       PsiElement(RBRACKET)(']')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   CLASS
     PsiComment(EOL_COMMENT)('// class C')
     PsiWhiteSpace('\n')

compiler/testData/psi/LineCommentForFirstDeclaration.txt

@@ -1,6 +1,8 @@
 JetFile: LineCommentForFirstDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiComment(EOL_COMMENT)('// This is foo')
     PsiWhiteSpace('\n')

compiler/testData/psi/LocalDeclarations.txt

@@ -1,6 +1,8 @@
 JetFile: LocalDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/LongPackageName.txt

@@ -16,3 +16,5 @@ JetFile: LongPackageName.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('buzz')
+  IMPORT_LIST
+    <empty list>

compiler/testData/psi/ModifierAsSelector.txt

@@ -1,8 +1,10 @@
 JetFile: ModifierAsSelector.kt
-  PsiComment(EOL_COMMENT)('// JET-1')
-  PsiWhiteSpace('\n\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiComment(EOL_COMMENT)('// JET-1')
+  PsiWhiteSpace('\n\n')
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/MultiVariableDeclarations.txt

@@ -1,6 +1,8 @@
 JetFile: MultiVariableDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/NamedClassObject.txt

@@ -1,6 +1,8 @@
 JetFile: NamedClassObject.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/NestedComments.txt

@@ -1,6 +1,8 @@
 JetFile: NestedComments.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/NewLinesValidOperations.txt

@@ -1,6 +1,8 @@
 JetFile: NewLinesValidOperations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/NewlinesInParentheses.txt

@@ -1,6 +1,8 @@
 JetFile: NewlinesInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/NotIsAndNotIn.txt

@@ -1,6 +1,8 @@
 JetFile: NotIsAndNotIn.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/ObjectLiteralAsStatement.txt

@@ -1,6 +1,8 @@
 JetFile: ObjectLiteralAsStatement.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/ParameterNameMising.txt

@@ -1,6 +1,8 @@
 JetFile: ParameterNameMising.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/ParameterType.txt

@@ -1,6 +1,8 @@
 JetFile: ParameterType.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/ParameterType_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: ParameterType_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/Precedence.txt

@@ -1,6 +1,8 @@
 JetFile: Precedence.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: PrimaryConstructorModifiers_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')

compiler/testData/psi/Properties.txt

@@ -1,6 +1,8 @@
 JetFile: Properties.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')

compiler/testData/psi/PropertiesFollowedByInitializers.txt

@@ -1,6 +1,8 @@
 JetFile: PropertiesFollowedByInitializers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/Properties_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: Properties_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(var)('var')
     PsiWhiteSpace(' ')

compiler/testData/psi/QuotedIdentifiers.txt

@@ -1,6 +1,8 @@
 JetFile: QuotedIdentifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     MODIFIER_LIST
       ANNOTATION

compiler/testData/psi/RootPackage.txt

@@ -9,6 +9,8 @@ JetFile: RootPackage.kt
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('bar')
     PsiElement(SEMICOLON)(';')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/SemicolonAfterIf.txt

@@ -1,6 +1,8 @@
 JetFile: SemicolonAfterIf.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/SimpleClassMembers.txt

@@ -1,6 +1,8 @@
 JetFile: SimpleClassMembers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/SimpleClassMembers_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: SimpleClassMembers_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/SimpleExpressions.txt

@@ -1,6 +1,8 @@
 JetFile: SimpleExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/SimpleModifiers.txt

@@ -12,6 +12,8 @@ JetFile: SimpleModifiers.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('goo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST

compiler/testData/psi/SoftKeywordsInTypeArguments.txt

@@ -1,6 +1,8 @@
 JetFile: SoftKeywordsInTypeArguments.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/StringTemplates.txt

@@ -1,6 +1,8 @@
 JetFile: StringTemplates.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/Super.txt

@@ -1,6 +1,8 @@
 JetFile: Super.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiComment(EOL_COMMENT)('// KT-156 Fix the this<Super> syntax')
     PsiWhiteSpace('\n')

compiler/testData/psi/ThisType.txt

@@ -1,6 +1,8 @@
 JetFile: ThisType.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/TraitConstructor.txt

@@ -1,6 +1,8 @@
 JetFile: TraitConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(interface)('interface')
     PsiWhiteSpace(' ')

compiler/testData/psi/TryRecovery.txt

@@ -1,6 +1,8 @@
 JetFile: TryRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')

compiler/testData/psi/TypeConstraints.txt

@@ -1,6 +1,8 @@
 JetFile: TypeConstraints.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')

compiler/testData/psi/TypeDef.txt

@@ -12,6 +12,8 @@ JetFile: TypeDef.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('goo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   TYPEDEF
     PsiElement(typealias)('typealias')

compiler/testData/psi/TypeDef_ERR.txt

@@ -1,6 +1,8 @@
 JetFile: TypeDef_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiErrorElement:Type name expected