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')
@@ -15,4 +17,4 @@ JetFile: fragment.kt
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       INTEGER_CONSTANT
-        PsiElement(INTEGER_LITERAL)('1')
+        PsiElement(INTEGER_LITERAL)('1')

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(' ')
@@ -18,4 +20,4 @@ JetFile: AbsentInnerType.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('1')
+      PsiElement(INTEGER_LITERAL)('1')

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(' ')
@@ -34,4 +36,4 @@ JetFile: AnonymousInitializer.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -123,4 +125,4 @@ JetFile: AssertNotNull.kt
                 PsiElement(false)('false')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -78,4 +80,4 @@ JetFile: BabySteps.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -80,4 +82,4 @@ JetFile: BabySteps_ERR.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -19,4 +21,4 @@ JetFile: BackslashInString.kt
         PsiErrorElement:Expecting '"'
           <empty list>
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -329,4 +331,4 @@ JetFile: ByClauses.kt
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -241,4 +243,4 @@ JetFile: CallWithManyClosures.kt
             PsiElement(LBRACE)('{')
             BLOCK
               <empty list>
-            PsiElement(RBRACE)('}')
+            PsiElement(RBRACE)('}')

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(' ')
@@ -219,4 +221,4 @@ JetFile: CallsInWhen.kt
         PsiWhiteSpace('\n  ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -111,4 +113,4 @@ JetFile: Constructors.kt
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Bar')
+              PsiElement(IDENTIFIER)('Bar')

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(' ')
@@ -991,4 +993,4 @@ JetFile: ControlStructures.kt
             PsiElement(IDENTIFIER)('r')
         PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -366,4 +368,4 @@ JetFile: DefaultKeyword.kt
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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)('/**')
@@ -29,4 +31,4 @@ JetFile: DocCommentAfterFileAnnotations.kt
     PsiElement(IDENTIFIER)('C')
     CLASS_BODY
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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)('/**')
@@ -20,4 +22,4 @@ JetFile: DocCommentForFirstDeclaration.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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)('/**')
@@ -24,4 +26,4 @@ JetFile: DocCommentOnPackageDirectiveLine.kt
       PsiElement(RPAR)(')')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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)('/**')
@@ -177,4 +179,4 @@ JetFile: DocCommentsBinding.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -606,4 +608,4 @@ JetFile: DoubleColon.kt
         REFERENCE_EXPRESSION
           PsiErrorElement:Expecting an identifier
             <empty list>
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -137,4 +139,4 @@ JetFile: DynamicReceiver.kt
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      PsiElement(RPAR)(')')

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
@@ -84,4 +86,4 @@ JetFile: DynamicSoftKeyword.kt
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -135,4 +137,4 @@ JetFile: DynamicTypes.kt
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
       DYNAMIC_TYPE
-        PsiElement(dynamic)('dynamic')
+        PsiElement(dynamic)('dynamic')

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(' ')
@@ -113,4 +115,4 @@ JetFile: EOLsInComments.kt
         REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('b')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -87,4 +89,4 @@ JetFile: EOLsOnRollback.kt
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('f')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -34,4 +36,4 @@ JetFile: EnumCommas.kt
       PsiWhiteSpace('\n    ')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -82,4 +84,4 @@ JetFile: EnumMissingName.kt
                   PsiElement(INTEGER_LITERAL)('0x0000FF')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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
@@ -97,4 +99,4 @@ JetFile: EnumNoAnnotations.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('3')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -34,4 +36,4 @@ JetFile: EnumSemicolonBetween.kt
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('EAST')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -69,4 +71,4 @@ JetFile: EnumSemicolonBetweenWithMembers.kt
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('EAST')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -83,4 +85,4 @@ JetFile: EnumShortCommas.kt
       PsiWhiteSpace('\n    ')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -82,4 +84,4 @@ JetFile: EnumShortNoCommas.kt
                   PsiElement(INTEGER_LITERAL)('0x0000FF')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -197,4 +199,4 @@ JetFile: EnumShortWithOverload.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -194,4 +196,4 @@ JetFile: EnumShortWithOverloadNoCommas.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -87,4 +89,4 @@ JetFile: Enums.kt
                   PsiElement(INTEGER_LITERAL)('0x0000FF')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -55,4 +57,4 @@ JetFile: Expressions_ERR.kt
           PsiErrorElement:Expecting an element
             PsiElement(RBRACKET)(']')
           PsiWhiteSpace('\n')
-          PsiElement(RBRACE)('}')
+          PsiElement(RBRACE)('}')

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(' ')
@@ -73,4 +75,4 @@ JetFile: ExtensionsWithQNReceiver.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('1')
+      PsiElement(INTEGER_LITERAL)('1')

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
@@ -32,4 +34,4 @@ JetFile: FileStart_ERR.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
   PsiErrorElement:Expecting a top level declaration
-    <empty list>
+    <empty list>

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(' ')
@@ -111,4 +113,4 @@ JetFile: FloatingPointLiteral.kt
           FLOAT_CONSTANT
             PsiElement(FLOAT_CONSTANT)('1.0e-1f')
         PsiWhiteSpace('\n')
-        PsiElement(RPAR)(')')
+        PsiElement(RPAR)(')')

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(' ')
@@ -663,4 +665,4 @@ JetFile: ForWithMultiDecl.kt
             PsiElement(LBRACE)('{')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -494,4 +496,4 @@ JetFile: FunctionCalls.kt
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -975,4 +977,4 @@ JetFile: FunctionExpressions.kt
                 PsiElement(IDENTIFIER)('a')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -641,4 +643,4 @@ JetFile: FunctionExpressions_ERR.kt
                           PsiElement(IDENTIFIER)('V')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -799,4 +801,4 @@ JetFile: FunctionLiterals.kt
       PsiWhiteSpace('\n    ')
       PsiComment(EOL_COMMENT)('//{[a] a: A -> }')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -509,4 +511,4 @@ JetFile: FunctionLiterals_ERR.kt
             <empty list>
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -41,4 +43,4 @@ JetFile: FunctionNoParameterList.kt
     PsiWhiteSpace(' ')
     CLASS_BODY
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -667,4 +669,4 @@ JetFile: FunctionTypes.kt
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Unit')
+              PsiElement(IDENTIFIER)('Unit')

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(' ')
@@ -28,4 +30,4 @@ JetFile: FunctionTypes_ERR.kt
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('b')
+              PsiElement(IDENTIFIER)('b')

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(' ')
@@ -635,4 +637,4 @@ JetFile: Functions.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('5')
+      PsiElement(INTEGER_LITERAL)('5')

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(' ')
@@ -479,4 +481,4 @@ JetFile: FunctionsWithoutName.kt
         USER_TYPE
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('bar')
-        PsiElement(QUEST)('?')
+        PsiElement(QUEST)('?')

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 '('
@@ -283,4 +285,4 @@ JetFile: FunctionsWithoutName_ERR.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('a')
-    PsiElement(SEMICOLON)(';')
+    PsiElement(SEMICOLON)(';')

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(' ')
@@ -304,4 +306,4 @@ JetFile: Functions_ERR.kt
     PsiErrorElement:Expecting an expression
       <empty list>
     PsiWhiteSpace(' ')
-    PsiElement(SEMICOLON)(';')
+    PsiElement(SEMICOLON)(';')

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(' ')
@@ -15,4 +17,4 @@ JetFile: HangOnLonelyModifier.kt
       PsiErrorElement:Expecting a statement
         PsiElement(in)('in')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -84,4 +86,4 @@ JetFile: IfWithPropery.kt
           PsiElement(LBRACE)('{')
           NULL
             PsiElement(null)('null')
-          PsiElement(RBRACE)('}')
+          PsiElement(RBRACE)('}')

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(' ')
@@ -17,4 +19,4 @@ JetFile: Inner.kt
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('Inner')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -113,4 +115,4 @@ JetFile: IntegerLiteral.kt
     INTEGER_CONSTANT
       PsiElement(INTEGER_LITERAL)('0')
     PsiErrorElement:Property getter or setter expected
-      PsiElement(INTEGER_LITERAL)('1')
+      PsiElement(INTEGER_LITERAL)('1')

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(' ')
@@ -22,4 +24,4 @@ JetFile: Interface.kt
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('a')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -315,4 +317,4 @@ JetFile: Labels.kt
             PsiElement(AT)('@')
             PsiElement(IDENTIFIER)('a')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -22,4 +24,4 @@ JetFile: LineCommentAfterFileAnnotations.kt
     PsiElement(IDENTIFIER)('C')
     CLASS_BODY
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -13,4 +15,4 @@ JetFile: LineCommentForFirstDeclaration.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -122,4 +124,4 @@ JetFile: LocalDeclarations.kt
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Unit')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/LongPackageName.txt

@@ -15,4 +15,6 @@ JetFile: LongPackageName.kt
           PsiElement(IDENTIFIER)('baz')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('buzz')
+        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(' ')
@@ -39,4 +41,4 @@ JetFile: ModifierAsSelector.kt
             PsiElement(RPAR)(')')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace(' ')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -614,4 +616,4 @@ JetFile: MultiVariableDeclarations.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -52,4 +54,4 @@ JetFile: NamedClassObject.kt
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('C')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -61,4 +63,4 @@ JetFile: NestedComments.kt
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('b')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -105,4 +107,4 @@ JetFile: NewLinesValidOperations.kt
         BOOLEAN_CONSTANT
           PsiElement(true)('true')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -363,4 +365,4 @@ JetFile: NewlinesInParentheses.kt
                         PsiElement(IDENTIFIER)('X')
                 PsiElement(GT)('>')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -60,4 +62,4 @@ JetFile: NotIsAndNotIn.kt
                 PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -68,4 +70,4 @@ JetFile: ObjectLiteralAsStatement.kt
             PsiWhiteSpace('\n    ')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -139,4 +141,4 @@ JetFile: ParameterNameMising.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -281,4 +283,4 @@ JetFile: ParameterType.kt
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Int')
-        PsiElement(RPAR)(')')
+        PsiElement(RPAR)(')')

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(' ')
@@ -226,4 +228,4 @@ JetFile: ParameterType_ERR.kt
           TYPE_REFERENCE
             PsiErrorElement:Type expected
               <empty list>
-        PsiElement(RPAR)(')')
+        PsiElement(RPAR)(')')

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(' ')
@@ -1182,4 +1184,4 @@ JetFile: Precedence.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -81,4 +83,4 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -447,4 +449,4 @@ JetFile: Properties.kt
     TYPE_REFERENCE
       USER_TYPE
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Int')
+          PsiElement(IDENTIFIER)('Int')

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(' ')
@@ -461,4 +463,4 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('now')
+      PsiElement(IDENTIFIER)('now')

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(' ')
@@ -225,4 +227,4 @@ JetFile: Properties_ERR.kt
         <empty list>
     PsiWhiteSpace(' ')
     PsiErrorElement:Property getter or setter expected
-      PsiElement(MINUS)('-')
+      PsiElement(MINUS)('-')

compiler/testData/psi/QuotedIdentifiers.txt

@@ -1,6 +1,8 @@
 JetFile: QuotedIdentifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     MODIFIER_LIST
       ANNOTATION
@@ -50,4 +52,4 @@ JetFile: QuotedIdentifiers.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`1`')
+    PsiElement(IDENTIFIER)('`1`')

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')
@@ -130,4 +132,4 @@ JetFile: RootPackage.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -90,4 +92,4 @@ JetFile: SemicolonAfterIf.kt
           PsiElement(IDENTIFIER)('x')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace(' ')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -399,4 +401,4 @@ JetFile: SimpleClassMembers.kt
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -71,4 +73,4 @@ JetFile: SimpleClassMembers_ERR.kt
             <empty list>
         PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -726,4 +728,4 @@ JetFile: SimpleExpressions.kt
               PsiElement(AT)('@')
               PsiElement(IDENTIFIER)('la')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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
@@ -163,4 +165,4 @@ JetFile: SimpleModifiers.kt
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('lazy')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -53,4 +55,4 @@ JetFile: SoftKeywordsInTypeArguments.kt
                   PsiElement(IDENTIFIER)('Int')
           PsiElement(GT)('>')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -391,4 +393,4 @@ JetFile: StringTemplates.kt
           PsiElement(REGULAR_STRING_PART)('sdfsdf')
         PsiElement(CLOSING_QUOTE)('"')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -87,4 +89,4 @@ JetFile: Super.kt
             PsiElement(RPAR)(')')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -150,4 +152,4 @@ JetFile: ThisType.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -49,4 +51,4 @@ JetFile: TraitConstructor.kt
     PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
+        PsiElement(RPAR)(')')

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(' ')
@@ -371,4 +373,4 @@ JetFile: TryRecovery.kt
             PsiWhiteSpace('\n    ')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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(' ')
@@ -28,4 +30,4 @@ JetFile: TypeConstraints.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

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')
@@ -225,4 +227,4 @@ JetFile: TypeDef.kt
         REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace(' ')
-    PsiElement(SEMICOLON)(';')
+    PsiElement(SEMICOLON)(';')

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
@@ -191,4 +193,4 @@ JetFile: TypeDef_ERR.kt
     TYPE_REFERENCE
       USER_TYPE
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('bar')
+          PsiElement(IDENTIFIER)('bar')