diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
index 44147e7fe63..f8d167a7bc6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
+++ b/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
+    }
+}
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
index ceb81b4f45a..72bde262ada 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+++ b/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:
-            packageDirective.setCustomEdgeTokenBinders(PrecedingCommentsBinder.INSTANCE$, null);
+            // this is necessary to allow comments at the start of the file to be bound to the first declaration
+            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();
-            while (at(IMPORT_KEYWORD)) {
-                parseImportDirective();
-            }
-            importList.done(IMPORT_LIST);
+        PsiBuilder.Marker importList = mark();
+        if (!at(IMPORT_KEYWORD)) {
+            // this is necessary to allow comments at the start of the file to be bound to the first declaration
+            importList.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE$, null);
         }
+        while (at(IMPORT_KEYWORD)) {
+            parseImportDirective();
+        }
+        importList.done(IMPORT_LIST);
     }
 
     /*
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
index b7a29fe8451..f4a8ef3f3c2 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+++ b/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";
 
diff --git a/compiler/testData/parseCodeFragment/block/packageDirective.txt b/compiler/testData/parseCodeFragment/block/packageDirective.txt
index 3a8e4031aa1..30ff66c7d63 100644
--- a/compiler/testData/parseCodeFragment/block/packageDirective.txt
+++ b/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')
\ No newline at end of file
+        PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/AbsentInnerType.txt b/compiler/testData/psi/AbsentInnerType.txt
index b0923861b20..9aa103899c2 100644
--- a/compiler/testData/psi/AbsentInnerType.txt
+++ b/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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/AnonymousInitializer.txt b/compiler/testData/psi/AnonymousInitializer.txt
index 939d6afb63d..2ab8ba38053 100644
--- a/compiler/testData/psi/AnonymousInitializer.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/AssertNotNull.txt b/compiler/testData/psi/AssertNotNull.txt
index e526fc7e38b..a002e63ebef 100644
--- a/compiler/testData/psi/AssertNotNull.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/BabySteps.txt b/compiler/testData/psi/BabySteps.txt
index 99a0ce249c3..c9178b8b993 100644
--- a/compiler/testData/psi/BabySteps.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/BabySteps_ERR.txt b/compiler/testData/psi/BabySteps_ERR.txt
index 984052227d8..1ae124ba77c 100644
--- a/compiler/testData/psi/BabySteps_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/BackslashInString.txt b/compiler/testData/psi/BackslashInString.txt
index c652e0c4faa..74bbc8b335e 100644
--- a/compiler/testData/psi/BackslashInString.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
index c890392c91f..8272f460860 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*')
\ No newline at end of file
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
index cbb897d7d6d..8827e015c37 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
@@ -1,4 +1,6 @@
 JetFile: BlockCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PsiComment(BLOCK_COMMENT)('/*\n/*')
\ No newline at end of file
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt
index dbfc5417f81..610b6f178d4 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt
+++ b/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')
\ No newline at end of file
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt
index 78398ef74ea..e16f5e1ab8b 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt
+++ b/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')
\ No newline at end of file
diff --git a/compiler/testData/psi/ByClauses.txt b/compiler/testData/psi/ByClauses.txt
index e879e3b5b5e..3044b491361 100644
--- a/compiler/testData/psi/ByClauses.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/CallWithManyClosures.txt b/compiler/testData/psi/CallWithManyClosures.txt
index ceae1bc2367..72d28d1129a 100644
--- a/compiler/testData/psi/CallWithManyClosures.txt
+++ b/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)('}')
\ No newline at end of file
+            PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/CallsInWhen.txt b/compiler/testData/psi/CallsInWhen.txt
index 98131916f8f..37d924ca01f 100644
--- a/compiler/testData/psi/CallsInWhen.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Constructors.txt b/compiler/testData/psi/Constructors.txt
index ae4ac981fbc..949532f3f0a 100644
--- a/compiler/testData/psi/Constructors.txt
+++ b/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')
\ No newline at end of file
+              PsiElement(IDENTIFIER)('Bar')
diff --git a/compiler/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt
index 4aa36a363fc..3aa5e4677db 100644
--- a/compiler/testData/psi/ControlStructures.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DefaultKeyword.txt b/compiler/testData/psi/DefaultKeyword.txt
index 78874d15df0..bafc2215657 100644
--- a/compiler/testData/psi/DefaultKeyword.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DocCommentAfterFileAnnotations.txt b/compiler/testData/psi/DocCommentAfterFileAnnotations.txt
index 55293c01796..68cfb707559 100644
--- a/compiler/testData/psi/DocCommentAfterFileAnnotations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DocCommentForFirstDeclaration.txt b/compiler/testData/psi/DocCommentForFirstDeclaration.txt
index 847f6418ea0..9a95c8cdf51 100644
--- a/compiler/testData/psi/DocCommentForFirstDeclaration.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt b/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt
index c82fa97d5f3..de584f22adf 100644
--- a/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DocCommentsBinding.txt b/compiler/testData/psi/DocCommentsBinding.txt
index 76dad1cd8bd..e4f9e8f5d14 100644
--- a/compiler/testData/psi/DocCommentsBinding.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DoubleColon.txt b/compiler/testData/psi/DoubleColon.txt
index 3142769b712..714a59f3a71 100644
--- a/compiler/testData/psi/DoubleColon.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DynamicReceiver.txt b/compiler/testData/psi/DynamicReceiver.txt
index a88ae9fe15d..c9e4be3b49b 100644
--- a/compiler/testData/psi/DynamicReceiver.txt
+++ b/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)(')')
\ No newline at end of file
+      PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/DynamicSoftKeyword.txt b/compiler/testData/psi/DynamicSoftKeyword.txt
index 007a5d70f9e..669e88d37c8 100644
--- a/compiler/testData/psi/DynamicSoftKeyword.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/DynamicTypes.txt b/compiler/testData/psi/DynamicTypes.txt
index 180b7f58e48..96ed170e92f 100644
--- a/compiler/testData/psi/DynamicTypes.txt
+++ b/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')
\ No newline at end of file
+        PsiElement(dynamic)('dynamic')
diff --git a/compiler/testData/psi/EOLsInComments.txt b/compiler/testData/psi/EOLsInComments.txt
index 4a71517c269..5e9bc135c14 100644
--- a/compiler/testData/psi/EOLsInComments.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EOLsOnRollback.txt b/compiler/testData/psi/EOLsOnRollback.txt
index a7182b39b83..9f57ac39837 100644
--- a/compiler/testData/psi/EOLsOnRollback.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EmptyFile.txt b/compiler/testData/psi/EmptyFile.txt
index 8e883bb3be9..bb8cef2a12c 100644
--- a/compiler/testData/psi/EmptyFile.txt
+++ b/compiler/testData/psi/EmptyFile.txt
@@ -1,3 +1,5 @@
 JetFile: EmptyFile.kt
   PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
     <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/EnumCommas.txt b/compiler/testData/psi/EnumCommas.txt
index a000f01414f..ee9a6e794f5 100644
--- a/compiler/testData/psi/EnumCommas.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumMissingName.txt b/compiler/testData/psi/EnumMissingName.txt
index bdbd0128257..f3869c692fe 100644
--- a/compiler/testData/psi/EnumMissingName.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumNoAnnotations.txt b/compiler/testData/psi/EnumNoAnnotations.txt
index 61405adde4f..e91cfad7521 100644
--- a/compiler/testData/psi/EnumNoAnnotations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumSemicolonBetween.txt b/compiler/testData/psi/EnumSemicolonBetween.txt
index 4ac708a8527..b2abdb58354 100644
--- a/compiler/testData/psi/EnumSemicolonBetween.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumSemicolonBetweenWithMembers.txt b/compiler/testData/psi/EnumSemicolonBetweenWithMembers.txt
index 9387c30c840..a5be266ba5a 100644
--- a/compiler/testData/psi/EnumSemicolonBetweenWithMembers.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumShortCommas.txt b/compiler/testData/psi/EnumShortCommas.txt
index 10a0891420a..5973a9e43be 100644
--- a/compiler/testData/psi/EnumShortCommas.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumShortNoCommas.txt b/compiler/testData/psi/EnumShortNoCommas.txt
index e3d67f9d434..15642145094 100644
--- a/compiler/testData/psi/EnumShortNoCommas.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumShortWithOverload.txt b/compiler/testData/psi/EnumShortWithOverload.txt
index 08bc961d5e3..223dc280627 100644
--- a/compiler/testData/psi/EnumShortWithOverload.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/EnumShortWithOverloadNoCommas.txt b/compiler/testData/psi/EnumShortWithOverloadNoCommas.txt
index 6c0e5275ef6..027e33c3766 100644
--- a/compiler/testData/psi/EnumShortWithOverloadNoCommas.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Enums.txt b/compiler/testData/psi/Enums.txt
index 51b6d33efad..90fb4977729 100644
--- a/compiler/testData/psi/Enums.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Expressions_ERR.txt b/compiler/testData/psi/Expressions_ERR.txt
index 0339b8d92d6..93266a89a22 100644
--- a/compiler/testData/psi/Expressions_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+          PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/ExtensionsWithQNReceiver.txt b/compiler/testData/psi/ExtensionsWithQNReceiver.txt
index a41fa665c36..3b29ce471a8 100644
--- a/compiler/testData/psi/ExtensionsWithQNReceiver.txt
+++ b/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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/FileStart_ERR.txt b/compiler/testData/psi/FileStart_ERR.txt
index 64eee41a3f6..2cc2fa41a32 100644
--- a/compiler/testData/psi/FileStart_ERR.txt
+++ b/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>
\ No newline at end of file
+    <empty list>
diff --git a/compiler/testData/psi/FloatingPointLiteral.txt b/compiler/testData/psi/FloatingPointLiteral.txt
index a306d798424..81ea951b715 100644
--- a/compiler/testData/psi/FloatingPointLiteral.txt
+++ b/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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/ForWithMultiDecl.txt b/compiler/testData/psi/ForWithMultiDecl.txt
index 50fce4d50bf..5786264a36b 100644
--- a/compiler/testData/psi/ForWithMultiDecl.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionCalls.txt b/compiler/testData/psi/FunctionCalls.txt
index 5923b141ca4..5200fb77ed3 100644
--- a/compiler/testData/psi/FunctionCalls.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionExpressions.txt b/compiler/testData/psi/FunctionExpressions.txt
index a736115c980..6cb7576f921 100644
--- a/compiler/testData/psi/FunctionExpressions.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionExpressions_ERR.txt b/compiler/testData/psi/FunctionExpressions_ERR.txt
index 884f044b297..cde71459324 100644
--- a/compiler/testData/psi/FunctionExpressions_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionLiterals.txt b/compiler/testData/psi/FunctionLiterals.txt
index e254d547bc9..891bed11864 100644
--- a/compiler/testData/psi/FunctionLiterals.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionLiterals_ERR.txt b/compiler/testData/psi/FunctionLiterals_ERR.txt
index 97cb3105bc8..868396a8fd3 100644
--- a/compiler/testData/psi/FunctionLiterals_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionNoParameterList.txt b/compiler/testData/psi/FunctionNoParameterList.txt
index 00322a644cf..21342578541 100644
--- a/compiler/testData/psi/FunctionNoParameterList.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/FunctionTypes.txt b/compiler/testData/psi/FunctionTypes.txt
index 4a644614f6f..299be89c6ef 100644
--- a/compiler/testData/psi/FunctionTypes.txt
+++ b/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')
\ No newline at end of file
+              PsiElement(IDENTIFIER)('Unit')
diff --git a/compiler/testData/psi/FunctionTypes_ERR.txt b/compiler/testData/psi/FunctionTypes_ERR.txt
index e0ebf3cec12..c8fe8f71f30 100644
--- a/compiler/testData/psi/FunctionTypes_ERR.txt
+++ b/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')
\ No newline at end of file
+              PsiElement(IDENTIFIER)('b')
diff --git a/compiler/testData/psi/Functions.txt b/compiler/testData/psi/Functions.txt
index d8068bd49c9..8afdffcdf85 100644
--- a/compiler/testData/psi/Functions.txt
+++ 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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('5')
diff --git a/compiler/testData/psi/FunctionsWithoutName.txt b/compiler/testData/psi/FunctionsWithoutName.txt
index 976238bbca3..6be857e3f52 100644
--- a/compiler/testData/psi/FunctionsWithoutName.txt
+++ b/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)('?')
\ No newline at end of file
+        PsiElement(QUEST)('?')
diff --git a/compiler/testData/psi/FunctionsWithoutName_ERR.txt b/compiler/testData/psi/FunctionsWithoutName_ERR.txt
index 3f2b2030077..a00d6a27365 100644
--- a/compiler/testData/psi/FunctionsWithoutName_ERR.txt
+++ b/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)(';')
\ No newline at end of file
+    PsiElement(SEMICOLON)(';')
diff --git a/compiler/testData/psi/Functions_ERR.txt b/compiler/testData/psi/Functions_ERR.txt
index e4f24094363..0a7f351a212 100644
--- a/compiler/testData/psi/Functions_ERR.txt
+++ b/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)(';')
\ No newline at end of file
+    PsiElement(SEMICOLON)(';')
diff --git a/compiler/testData/psi/HangOnLonelyModifier.txt b/compiler/testData/psi/HangOnLonelyModifier.txt
index 5971d95c24e..b778a51735a 100644
--- a/compiler/testData/psi/HangOnLonelyModifier.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/IfWithPropery.txt b/compiler/testData/psi/IfWithPropery.txt
index 8f7f1a43996..124df8170a7 100644
--- a/compiler/testData/psi/IfWithPropery.txt
+++ b/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)('}')
\ No newline at end of file
+          PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Inner.txt b/compiler/testData/psi/Inner.txt
index f12b27571ef..6413d722a19 100644
--- a/compiler/testData/psi/Inner.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/IntegerLiteral.txt b/compiler/testData/psi/IntegerLiteral.txt
index 2df42f040f8..c10167f62ab 100644
--- a/compiler/testData/psi/IntegerLiteral.txt
+++ b/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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/Interface.txt b/compiler/testData/psi/Interface.txt
index 72154cc7565..f6f52ee7917 100644
--- a/compiler/testData/psi/Interface.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Labels.txt b/compiler/testData/psi/Labels.txt
index 144543a9234..48b2efdfa09 100644
--- a/compiler/testData/psi/Labels.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/LineCommentAfterFileAnnotations.txt b/compiler/testData/psi/LineCommentAfterFileAnnotations.txt
index 0563535c3e8..93ecea35261 100644
--- a/compiler/testData/psi/LineCommentAfterFileAnnotations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/LineCommentForFirstDeclaration.txt b/compiler/testData/psi/LineCommentForFirstDeclaration.txt
index ce474d31813..5a41d489b18 100644
--- a/compiler/testData/psi/LineCommentForFirstDeclaration.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/LocalDeclarations.txt b/compiler/testData/psi/LocalDeclarations.txt
index 3caf07a5552..f3c370a5cd0 100644
--- a/compiler/testData/psi/LocalDeclarations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/LongPackageName.txt b/compiler/testData/psi/LongPackageName.txt
index da7a9e7ea5b..1dc96857196 100644
--- a/compiler/testData/psi/LongPackageName.txt
+++ b/compiler/testData/psi/LongPackageName.txt
@@ -15,4 +15,6 @@ JetFile: LongPackageName.kt
           PsiElement(IDENTIFIER)('baz')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('buzz')
\ No newline at end of file
+        PsiElement(IDENTIFIER)('buzz')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/ModifierAsSelector.txt b/compiler/testData/psi/ModifierAsSelector.txt
index 419854152ca..5072d702d94 100644
--- a/compiler/testData/psi/ModifierAsSelector.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/MultiVariableDeclarations.txt b/compiler/testData/psi/MultiVariableDeclarations.txt
index 42327e79cac..2036e9a90cd 100644
--- a/compiler/testData/psi/MultiVariableDeclarations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/NamedClassObject.txt b/compiler/testData/psi/NamedClassObject.txt
index 4cb96c3eeeb..f59cbf3b72a 100644
--- a/compiler/testData/psi/NamedClassObject.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/NestedComments.txt b/compiler/testData/psi/NestedComments.txt
index 7bc702a1edb..e169b172d73 100644
--- a/compiler/testData/psi/NestedComments.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/NewLinesValidOperations.txt b/compiler/testData/psi/NewLinesValidOperations.txt
index 0c5b866cad6..71c6fc2bb9a 100644
--- a/compiler/testData/psi/NewLinesValidOperations.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/NewlinesInParentheses.txt b/compiler/testData/psi/NewlinesInParentheses.txt
index 6443a3f8c3c..b77bcb144d0 100644
--- a/compiler/testData/psi/NewlinesInParentheses.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/NotIsAndNotIn.txt b/compiler/testData/psi/NotIsAndNotIn.txt
index 65f4e754ff7..fb1273b8417 100644
--- a/compiler/testData/psi/NotIsAndNotIn.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/ObjectLiteralAsStatement.txt b/compiler/testData/psi/ObjectLiteralAsStatement.txt
index d3a7dae5aa3..c14aebf3451 100644
--- a/compiler/testData/psi/ObjectLiteralAsStatement.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/ParameterNameMising.txt b/compiler/testData/psi/ParameterNameMising.txt
index 7223b8d4713..ff90e8b39c4 100644
--- a/compiler/testData/psi/ParameterNameMising.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/ParameterType.txt b/compiler/testData/psi/ParameterType.txt
index 739f748ae1a..073a44c0b61 100644
--- a/compiler/testData/psi/ParameterType.txt
+++ b/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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/ParameterType_ERR.txt b/compiler/testData/psi/ParameterType_ERR.txt
index 438c16a43df..b564ed7ccca 100644
--- a/compiler/testData/psi/ParameterType_ERR.txt
+++ b/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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/Precedence.txt b/compiler/testData/psi/Precedence.txt
index 4cd0db25abc..057fa84ba04 100644
--- a/compiler/testData/psi/Precedence.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
index 1042580c94b..44b15cf9770 100644
--- a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Properties.txt b/compiler/testData/psi/Properties.txt
index 0bb193d2b07..deaf430d772 100644
--- a/compiler/testData/psi/Properties.txt
+++ b/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')
\ No newline at end of file
+          PsiElement(IDENTIFIER)('Int')
diff --git a/compiler/testData/psi/PropertiesFollowedByInitializers.txt b/compiler/testData/psi/PropertiesFollowedByInitializers.txt
index c1afa79e3e9..b3d16824db9 100644
--- a/compiler/testData/psi/PropertiesFollowedByInitializers.txt
+++ b/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')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('now')
diff --git a/compiler/testData/psi/Properties_ERR.txt b/compiler/testData/psi/Properties_ERR.txt
index 2580db6bea8..ecb22594cae 100644
--- a/compiler/testData/psi/Properties_ERR.txt
+++ b/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)('-')
\ No newline at end of file
+      PsiElement(MINUS)('-')
diff --git a/compiler/testData/psi/QuotedIdentifiers.txt b/compiler/testData/psi/QuotedIdentifiers.txt
index 97d86abf76b..fed9cdfb7b3 100644
--- a/compiler/testData/psi/QuotedIdentifiers.txt
+++ b/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`')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('`1`')
diff --git a/compiler/testData/psi/RootPackage.txt b/compiler/testData/psi/RootPackage.txt
index 68f590482e9..ae101516345 100644
--- a/compiler/testData/psi/RootPackage.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SemicolonAfterIf.txt b/compiler/testData/psi/SemicolonAfterIf.txt
index be8ad3c8715..415fbf5f1fb 100644
--- a/compiler/testData/psi/SemicolonAfterIf.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt
index a68dca8ba82..cc0389820e5 100644
--- a/compiler/testData/psi/SimpleClassMembers.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.txt b/compiler/testData/psi/SimpleClassMembers_ERR.txt
index dac6b145ff0..9e6831efab7 100644
--- a/compiler/testData/psi/SimpleClassMembers_ERR.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SimpleExpressions.txt b/compiler/testData/psi/SimpleExpressions.txt
index bae4610a897..902ad4bd58b 100644
--- a/compiler/testData/psi/SimpleExpressions.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SimpleModifiers.txt b/compiler/testData/psi/SimpleModifiers.txt
index 6ff0a067aa1..24d0a897668 100644
--- a/compiler/testData/psi/SimpleModifiers.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt
index b260b9c60ab..570dd2d38af 100644
--- a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/StringTemplates.txt b/compiler/testData/psi/StringTemplates.txt
index 0623021b4b5..3a7b8cbb765 100644
--- a/compiler/testData/psi/StringTemplates.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/Super.txt b/compiler/testData/psi/Super.txt
index d68d377ddce..c806e6d968e 100644
--- a/compiler/testData/psi/Super.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/ThisType.txt b/compiler/testData/psi/ThisType.txt
index 29f3b9456ec..9b771b03330 100644
--- a/compiler/testData/psi/ThisType.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/TraitConstructor.txt b/compiler/testData/psi/TraitConstructor.txt
index f1f0d6e384c..93973edf299 100644
--- a/compiler/testData/psi/TraitConstructor.txt
+++ b/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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/TryRecovery.txt b/compiler/testData/psi/TryRecovery.txt
index 876556e2e5b..779f81a509d 100644
--- a/compiler/testData/psi/TryRecovery.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/TypeConstraints.txt b/compiler/testData/psi/TypeConstraints.txt
index e7487f7d042..5b50c779f58 100644
--- a/compiler/testData/psi/TypeConstraints.txt
+++ b/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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/TypeDef.txt b/compiler/testData/psi/TypeDef.txt
index 15f6f4bbe10..154559544c2 100644
--- a/compiler/testData/psi/TypeDef.txt
+++ b/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)(';')
\ No newline at end of file
+    PsiElement(SEMICOLON)(';')
diff --git a/compiler/testData/psi/TypeDef_ERR.txt b/compiler/testData/psi/TypeDef_ERR.txt
index 6d2273e6c93..25689eba8e8 100644
--- a/compiler/testData/psi/TypeDef_ERR.txt
+++ b/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')
\ No newline at end of file
+          PsiElement(IDENTIFIER)('bar')
diff --git a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
index 2d6196bb6a9..a072aead241 100644
--- a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
+++ b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
@@ -1,6 +1,8 @@
 JetFile: TypeExpressionAmbiguities_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -358,4 +360,4 @@ JetFile: TypeExpressionAmbiguities_ERR.kt
               PsiErrorElement:Expecting a '>'
                 <empty list>
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/TypeParametersBeforeName.txt b/compiler/testData/psi/TypeParametersBeforeName.txt
index 961f89f9fd8..0708a75edb2 100644
--- a/compiler/testData/psi/TypeParametersBeforeName.txt
+++ b/compiler/testData/psi/TypeParametersBeforeName.txt
@@ -1,6 +1,8 @@
 JetFile: TypeParametersBeforeName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -127,4 +129,4 @@ JetFile: TypeParametersBeforeName.kt
                   PsiElement(IDENTIFIER)('A')
           PsiElement(GT)('>')
     PsiElement(DOT)('.')
-    PsiElement(IDENTIFIER)('foo')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('foo')
diff --git a/compiler/testData/psi/When.txt b/compiler/testData/psi/When.txt
index a0c571ac02f..a9128723eb5 100644
--- a/compiler/testData/psi/When.txt
+++ b/compiler/testData/psi/When.txt
@@ -1,6 +1,8 @@
 JetFile: When.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -752,4 +754,4 @@ JetFile: When.kt
         PsiWhiteSpace('\n  ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/When_ERR.txt b/compiler/testData/psi/When_ERR.txt
index b917240394e..802ab587ef4 100644
--- a/compiler/testData/psi/When_ERR.txt
+++ b/compiler/testData/psi/When_ERR.txt
@@ -1,6 +1,8 @@
 JetFile: When_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -208,4 +210,4 @@ JetFile: When_ERR.kt
         PsiWhiteSpace('\n  ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/AnnotatedExpressions.txt b/compiler/testData/psi/annotation/AnnotatedExpressions.txt
index 4443d27a38e..b395b5d4b5d 100644
--- a/compiler/testData/psi/annotation/AnnotatedExpressions.txt
+++ b/compiler/testData/psi/annotation/AnnotatedExpressions.txt
@@ -1,6 +1,8 @@
 JetFile: AnnotatedExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -44,4 +46,4 @@ JetFile: AnnotatedExpressions.kt
           REFERENCE_EXPRESSION
             PsiElement(this)('this')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/Annotations.txt b/compiler/testData/psi/annotation/Annotations.txt
index 2f8b2914ce9..4c292933cf7 100644
--- a/compiler/testData/psi/annotation/Annotations.txt
+++ b/compiler/testData/psi/annotation/Annotations.txt
@@ -12,6 +12,8 @@ JetFile: Annotations.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('goo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST
@@ -327,4 +329,4 @@ JetFile: Annotations.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt b/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
index aef07842e41..04893c117c7 100644
--- a/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
+++ b/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
@@ -1,6 +1,8 @@
 JetFile: AnnotationsOnPatterns.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -48,4 +50,4 @@ JetFile: AnnotationsOnPatterns.kt
         PsiWhiteSpace('\n    ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/Annotations_ERR.txt b/compiler/testData/psi/annotation/Annotations_ERR.txt
index 95e487ecfc4..f71c5c43ba2 100644
--- a/compiler/testData/psi/annotation/Annotations_ERR.txt
+++ b/compiler/testData/psi/annotation/Annotations_ERR.txt
@@ -12,6 +12,8 @@ JetFile: Annotations_ERR.kt
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('goo')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST
@@ -283,4 +285,4 @@ JetFile: Annotations_ERR.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/ShortAnnotations.txt b/compiler/testData/psi/annotation/ShortAnnotations.txt
index cf553e9faa8..7f64d73bf5b 100644
--- a/compiler/testData/psi/annotation/ShortAnnotations.txt
+++ b/compiler/testData/psi/annotation/ShortAnnotations.txt
@@ -53,6 +53,8 @@ JetFile: ShortAnnotations.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('aa')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST
@@ -993,4 +995,4 @@ JetFile: ShortAnnotations.kt
         PsiWhiteSpace('\n  ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/TypeAnnotations.txt b/compiler/testData/psi/annotation/TypeAnnotations.txt
index ff70bb2eb5b..c4ff6c237dd 100644
--- a/compiler/testData/psi/annotation/TypeAnnotations.txt
+++ b/compiler/testData/psi/annotation/TypeAnnotations.txt
@@ -1,6 +1,8 @@
 JetFile: TypeAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -194,4 +196,4 @@ JetFile: TypeAnnotations.kt
             TYPE_REFERENCE
               USER_TYPE
                 REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Unit')
\ No newline at end of file
+                  PsiElement(IDENTIFIER)('Unit')
diff --git a/compiler/testData/psi/annotation/at/annotationAtFileStart.txt b/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
index 30d0539b812..502fb08c75c 100644
--- a/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
+++ b/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
@@ -1,6 +1,8 @@
 JetFile: annotationAtFileStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -13,4 +15,4 @@ JetFile: annotationAtFileStart.kt
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('A')
diff --git a/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt b/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
index c2fcf9ccda7..b0f2f676df7 100644
--- a/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
+++ b/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
@@ -1,6 +1,8 @@
 JetFile: annotationValueArgumentsAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -108,4 +110,4 @@ JetFile: annotationValueArgumentsAmbiguity.kt
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt b/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
index 35a2a4cc850..7031b005b86 100644
--- a/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
+++ b/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
@@ -1,6 +1,8 @@
 JetFile: declarationsJustAtTyped.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(private)('private')
@@ -304,4 +306,4 @@ JetFile: declarationsJustAtTyped.kt
           INTEGER_CONSTANT
             PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/at/enumEntries.txt b/compiler/testData/psi/annotation/at/enumEntries.txt
index 6546763f573..b23acf3a0ab 100644
--- a/compiler/testData/psi/annotation/at/enumEntries.txt
+++ b/compiler/testData/psi/annotation/at/enumEntries.txt
@@ -1,6 +1,8 @@
 JetFile: enumEntries.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')
@@ -169,4 +171,4 @@ JetFile: enumEntries.kt
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt b/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
index 67ce1195e06..77b2779ead7 100644
--- a/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
+++ b/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
@@ -1,6 +1,8 @@
 JetFile: expressionJustAtTyped.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -220,4 +222,4 @@ JetFile: expressionJustAtTyped.kt
       INTEGER_CONSTANT
         PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/at/modifierAtFileStart.txt b/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
index c70d125b82d..c9e22d2585c 100644
--- a/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
+++ b/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
@@ -1,10 +1,12 @@
 JetFile: modifierAtFileStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(public)('@public')
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('A')
diff --git a/compiler/testData/psi/annotation/at/primaryConstructor.txt b/compiler/testData/psi/annotation/at/primaryConstructor.txt
index 0f5ac9ec5c0..d966f6d8617 100644
--- a/compiler/testData/psi/annotation/at/primaryConstructor.txt
+++ b/compiler/testData/psi/annotation/at/primaryConstructor.txt
@@ -1,6 +1,8 @@
 JetFile: primaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -215,4 +217,4 @@ JetFile: primaryConstructor.kt
           PsiElement(RBRACKET)(']')
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/annotation/at/validDeclarations.txt b/compiler/testData/psi/annotation/at/validDeclarations.txt
index 740f0f90789..730a76f2684 100644
--- a/compiler/testData/psi/annotation/at/validDeclarations.txt
+++ b/compiler/testData/psi/annotation/at/validDeclarations.txt
@@ -1,6 +1,8 @@
 JetFile: validDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(private)('private')
@@ -577,4 +579,4 @@ JetFile: validDeclarations.kt
             PsiElement(LBRACE)('{')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/at/validExpressions.txt b/compiler/testData/psi/annotation/at/validExpressions.txt
index 9d94dedae72..9f05391f1b5 100644
--- a/compiler/testData/psi/annotation/at/validExpressions.txt
+++ b/compiler/testData/psi/annotation/at/validExpressions.txt
@@ -1,6 +1,8 @@
 JetFile: validExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -372,4 +374,4 @@ JetFile: validExpressions.kt
                 PsiWhiteSpace('\n    ')
                 PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/forParameters.txt b/compiler/testData/psi/annotation/forParameters.txt
index 924135d76cf..56b01459e7c 100644
--- a/compiler/testData/psi/annotation/forParameters.txt
+++ b/compiler/testData/psi/annotation/forParameters.txt
@@ -1,6 +1,8 @@
 JetFile: forParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -520,4 +522,4 @@ JetFile: forParameters.kt
             PsiElement(LBRACE)('{')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/lambda.txt b/compiler/testData/psi/annotation/lambda.txt
index 0117e66031d..761fb7d1260 100644
--- a/compiler/testData/psi/annotation/lambda.txt
+++ b/compiler/testData/psi/annotation/lambda.txt
@@ -1,6 +1,8 @@
 JetFile: lambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -338,4 +340,4 @@ JetFile: lambda.kt
                 <empty list>
               PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/lambdaRecovery.txt b/compiler/testData/psi/annotation/lambdaRecovery.txt
index f31646fa12d..338faa9b98b 100644
--- a/compiler/testData/psi/annotation/lambdaRecovery.txt
+++ b/compiler/testData/psi/annotation/lambdaRecovery.txt
@@ -1,6 +1,8 @@
 JetFile: lambdaRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -304,4 +306,4 @@ JetFile: lambdaRecovery.kt
                       <empty list>
                     PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/list/basic.txt b/compiler/testData/psi/annotation/list/basic.txt
index 137ca2dbd40..975667498b8 100644
--- a/compiler/testData/psi/annotation/list/basic.txt
+++ b/compiler/testData/psi/annotation/list/basic.txt
@@ -1,6 +1,8 @@
 JetFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       ANNOTATION
@@ -153,4 +155,4 @@ JetFile: basic.kt
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/list/recovery.txt b/compiler/testData/psi/annotation/list/recovery.txt
index b5da51e3e36..c330a104d66 100644
--- a/compiler/testData/psi/annotation/list/recovery.txt
+++ b/compiler/testData/psi/annotation/list/recovery.txt
@@ -1,6 +1,8 @@
 JetFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       ANNOTATION
@@ -132,4 +134,4 @@ JetFile: recovery.kt
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/multiDeclaration.txt b/compiler/testData/psi/annotation/multiDeclaration.txt
index c790cb7adf8..d96f363aadb 100644
--- a/compiler/testData/psi/annotation/multiDeclaration.txt
+++ b/compiler/testData/psi/annotation/multiDeclaration.txt
@@ -1,6 +1,8 @@
 JetFile: multiDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -156,4 +158,4 @@ JetFile: multiDeclaration.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt b/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt
index 278d222eac8..607686a4567 100644
--- a/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt
+++ b/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt
@@ -4,6 +4,8 @@ JetFile: fileAnnotationInWrongPlace.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   PROPERTY
     MODIFIER_LIST
@@ -101,4 +103,4 @@ JetFile: fileAnnotationInWrongPlace.kt
     PsiWhiteSpace('\n')
     PsiElement(trait)('trait')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('T')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('T')
diff --git a/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt b/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt
index 48f6a80a1f5..ccf3eb36b58 100644
--- a/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt
+++ b/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt
@@ -34,4 +34,6 @@ JetFile: manyAnnotationBlocks.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt b/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt
index 3f5ec3522f7..91dd8b88fb1 100644
--- a/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt
+++ b/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt
@@ -32,4 +32,6 @@ JetFile: manyInOneAnnotationBlock.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt b/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt
index 647ea19e7a2..f78b131a605 100644
--- a/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt
+++ b/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt
@@ -57,4 +57,6 @@ JetFile: nonFIleAnnotationBeforePackage.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('boo')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('boo')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFile/single.txt b/compiler/testData/psi/annotation/onFile/single.txt
index 744a6ca7b58..55e9a68f034 100644
--- a/compiler/testData/psi/annotation/onFile/single.txt
+++ b/compiler/testData/psi/annotation/onFile/single.txt
@@ -14,4 +14,6 @@ JetFile: single.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt b/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt
index e5b044602a4..6f56c7d133a 100644
--- a/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt
+++ b/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt
@@ -1,6 +1,8 @@
 JetFile: withoutFileAnnotationAndPackageDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -37,4 +39,4 @@ JetFile: withoutFileAnnotationAndPackageDeclaration.kt
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('ann')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('ann')
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackage.txt b/compiler/testData/psi/annotation/onFile/withoutPackage.txt
index b78d2c90ef9..56221af03c9 100644
--- a/compiler/testData/psi/annotation/onFile/withoutPackage.txt
+++ b/compiler/testData/psi/annotation/onFile/withoutPackage.txt
@@ -9,9 +9,11 @@ JetFile: withoutPackage.kt
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -53,4 +55,4 @@ JetFile: withoutPackage.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt b/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt
index acc7ad0983e..e3b6ab4809d 100644
--- a/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt
+++ b/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt
@@ -9,9 +9,11 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -49,4 +51,4 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt b/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
index 54f5875da84..d08191aa3db 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
@@ -4,6 +4,8 @@ JetFile: fileAnnotationInWrongPlace.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   PROPERTY
     MODIFIER_LIST
@@ -90,4 +92,4 @@ JetFile: fileAnnotationInWrongPlace.kt
     PsiWhiteSpace('\n')
     PsiElement(interface)('interface')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('T')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('T')
diff --git a/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt b/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
index bc2cc8d4275..7fa8d7d5730 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
@@ -36,4 +36,6 @@ JetFile: manyAnnotationBlocks.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt b/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
index b3f7c9f3a39..e0b03c62d92 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
@@ -31,4 +31,6 @@ JetFile: manyInOneAnnotationBlock.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt b/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
index 11b9215fb0d..542ceef7128 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
@@ -83,4 +83,6 @@ JetFile: nonFIleAnnotationBeforePackage.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('boo')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('boo')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFileObsolete/single.txt b/compiler/testData/psi/annotation/onFileObsolete/single.txt
index d9f730d93e5..06c93789e54 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/single.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/single.txt
@@ -17,4 +17,6 @@ JetFile: single.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('bar')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
index 1764e25e736..4ede5dbfe69 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
@@ -1,6 +1,8 @@
 JetFile: withoutFileAnnotationAndPackageDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     MODIFIER_LIST
       ANNOTATION
@@ -39,4 +41,4 @@ JetFile: withoutFileAnnotationAndPackageDeclaration.kt
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('ann')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('ann')
diff --git a/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
index d1cbc54dbff..0f466d01820 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
@@ -12,9 +12,11 @@ JetFile: withoutPackage.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
       PsiElement(RBRACKET)(']')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   FUN
     MODIFIER_LIST
       ANNOTATION
@@ -57,4 +59,4 @@ JetFile: withoutPackage.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
index 2f203c7f8f7..d8dfd73b548 100644
--- a/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
+++ b/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
@@ -12,9 +12,11 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
       PsiElement(RBRACKET)(']')
-  PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiWhiteSpace('\n')
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -54,4 +56,4 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/AnonymousObjects.txt b/compiler/testData/psi/examples/AnonymousObjects.txt
index 4132c9dc9ff..b0118d15501 100644
--- a/compiler/testData/psi/examples/AnonymousObjects.txt
+++ b/compiler/testData/psi/examples/AnonymousObjects.txt
@@ -1,6 +1,8 @@
 JetFile: AnonymousObjects.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -199,4 +201,4 @@ JetFile: AnonymousObjects.kt
               PsiElement(RBRACE)('}')
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/BinaryTree.txt b/compiler/testData/psi/examples/BinaryTree.txt
index b0ab8cc927d..95f7dcbbe15 100644
--- a/compiler/testData/psi/examples/BinaryTree.txt
+++ b/compiler/testData/psi/examples/BinaryTree.txt
@@ -1,6 +1,8 @@
 JetFile: BinaryTree.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -2388,4 +2390,4 @@ JetFile: BinaryTree.kt
               PsiWhiteSpace('\n  ')
               PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/BitArith.txt b/compiler/testData/psi/examples/BitArith.txt
index d5a4efbe197..019b8cb27d3 100644
--- a/compiler/testData/psi/examples/BitArith.txt
+++ b/compiler/testData/psi/examples/BitArith.txt
@@ -1,6 +1,8 @@
 JetFile: BitArith.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -622,4 +624,4 @@ JetFile: BitArith.kt
       PsiWhiteSpace('\n  ')
       PsiComment(EOL_COMMENT)('// ...')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/Builder.txt b/compiler/testData/psi/examples/Builder.txt
index 2d2024e5081..6eb739f7bbd 100644
--- a/compiler/testData/psi/examples/Builder.txt
+++ b/compiler/testData/psi/examples/Builder.txt
@@ -1,6 +1,8 @@
 JetFile: Builder.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -468,4 +470,4 @@ JetFile: Builder.kt
           PsiComment(BLOCK_COMMENT)('/*...*/')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/Color.txt b/compiler/testData/psi/examples/Color.txt
index d28c4709d2a..3d18fbaae71 100644
--- a/compiler/testData/psi/examples/Color.txt
+++ b/compiler/testData/psi/examples/Color.txt
@@ -1,6 +1,8 @@
 JetFile: Color.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')
@@ -143,4 +145,4 @@ JetFile: Color.kt
                   PsiElement(INTEGER_LITERAL)('255')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.txt b/compiler/testData/psi/examples/FunctionsAndTypes.txt
index e64a22a9a50..ab777d2f2dd 100644
--- a/compiler/testData/psi/examples/FunctionsAndTypes.txt
+++ b/compiler/testData/psi/examples/FunctionsAndTypes.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionsAndTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiWhiteSpace(' ')
@@ -646,4 +648,4 @@ JetFile: FunctionsAndTypes.kt
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
-        PsiElement(RBRACE)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/Graph.txt b/compiler/testData/psi/examples/Graph.txt
index 5f7b6c10cfb..6f9b2725797 100644
--- a/compiler/testData/psi/examples/Graph.txt
+++ b/compiler/testData/psi/examples/Graph.txt
@@ -1,6 +1,8 @@
 JetFile: Graph.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -989,4 +991,4 @@ JetFile: Graph.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/IPushPop.txt b/compiler/testData/psi/examples/IPushPop.txt
index 6d3f295236b..1208cc3b270 100644
--- a/compiler/testData/psi/examples/IPushPop.txt
+++ b/compiler/testData/psi/examples/IPushPop.txt
@@ -1,6 +1,8 @@
 JetFile: IPushPop.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -61,4 +63,4 @@ JetFile: IPushPop.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/LINQ.txt b/compiler/testData/psi/examples/LINQ.txt
index 25c7a6723a2..1602e6697b3 100644
--- a/compiler/testData/psi/examples/LINQ.txt
+++ b/compiler/testData/psi/examples/LINQ.txt
@@ -1,6 +1,8 @@
 JetFile: LINQ.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -78,4 +80,4 @@ JetFile: LINQ.kt
                   PsiElement(IDENTIFIER)('b')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/Queue.txt b/compiler/testData/psi/examples/Queue.txt
index d6f3baee73b..aa42984d54f 100644
--- a/compiler/testData/psi/examples/Queue.txt
+++ b/compiler/testData/psi/examples/Queue.txt
@@ -1,6 +1,8 @@
 JetFile: Queue.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -383,4 +385,4 @@ JetFile: Queue.kt
             NULL
               PsiElement(null)('null')
       PsiWhiteSpace('\n\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/Stack.txt b/compiler/testData/psi/examples/Stack.txt
index beb10b7b6ff..00362aa7d0c 100644
--- a/compiler/testData/psi/examples/Stack.txt
+++ b/compiler/testData/psi/examples/Stack.txt
@@ -1,6 +1,8 @@
 JetFile: Stack.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -144,4 +146,4 @@ JetFile: Stack.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('isEmpty')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/UnionFind.txt b/compiler/testData/psi/examples/UnionFind.txt
index 04be8a3f361..7019fcd6386 100644
--- a/compiler/testData/psi/examples/UnionFind.txt
+++ b/compiler/testData/psi/examples/UnionFind.txt
@@ -1,6 +1,8 @@
 JetFile: UnionFind.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -396,4 +398,4 @@ JetFile: UnionFind.kt
           PsiElement(EXCLEQ)('!=')
         PsiWhiteSpace(' ')
         INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('0')
\ No newline at end of file
+          PsiElement(INTEGER_LITERAL)('0')
diff --git a/compiler/testData/psi/examples/UpdateOperation.txt b/compiler/testData/psi/examples/UpdateOperation.txt
index 375e94dbdec..c146984c9d0 100644
--- a/compiler/testData/psi/examples/UpdateOperation.txt
+++ b/compiler/testData/psi/examples/UpdateOperation.txt
@@ -1,6 +1,8 @@
 JetFile: UpdateOperation.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -234,4 +236,4 @@ JetFile: UpdateOperation.kt
   PsiWhiteSpace('\n\n')
   PsiComment(EOL_COMMENT)('// Such copy(...) methods can be automatically generated by the compiler')
   PsiWhiteSpace('\n')
-  PsiComment(EOL_COMMENT)('// whenever there is a primary constructor')
\ No newline at end of file
+  PsiComment(EOL_COMMENT)('// whenever there is a primary constructor')
diff --git a/compiler/testData/psi/examples/With.txt b/compiler/testData/psi/examples/With.txt
index 0c54da2ccbb..37f11f93e73 100644
--- a/compiler/testData/psi/examples/With.txt
+++ b/compiler/testData/psi/examples/With.txt
@@ -1,6 +1,8 @@
 JetFile: With.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     MODIFIER_LIST
       ANNOTATION
@@ -188,4 +190,4 @@ JetFile: With.kt
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/array/MutableArray.txt b/compiler/testData/psi/examples/array/MutableArray.txt
index 086fdc1bbbf..ff88ce35d04 100644
--- a/compiler/testData/psi/examples/array/MutableArray.txt
+++ b/compiler/testData/psi/examples/array/MutableArray.txt
@@ -1,6 +1,8 @@
 JetFile: MutableArray.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     KDoc
       PsiElement(KDOC_START)('/**')
@@ -190,4 +192,4 @@ JetFile: MutableArray.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiComment(BLOCK_COMMENT)('/*...*/')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/ArrayList.txt b/compiler/testData/psi/examples/collections/ArrayList.txt
index 966edc00995..5f1cdfc794a 100644
--- a/compiler/testData/psi/examples/collections/ArrayList.txt
+++ b/compiler/testData/psi/examples/collections/ArrayList.txt
@@ -1,6 +1,8 @@
 JetFile: ArrayList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -897,4 +899,4 @@ JetFile: ArrayList.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/HashMap.txt b/compiler/testData/psi/examples/collections/HashMap.txt
index c9c77b662eb..9401c9c6a25 100644
--- a/compiler/testData/psi/examples/collections/HashMap.txt
+++ b/compiler/testData/psi/examples/collections/HashMap.txt
@@ -1,6 +1,8 @@
 JetFile: HashMap.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -939,4 +941,4 @@ JetFile: HashMap.kt
       PsiWhiteSpace('\n  ')
       PsiComment(EOL_COMMENT)('//...')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IIterable.txt b/compiler/testData/psi/examples/collections/IIterable.txt
index 94afea66c00..33b29dbc705 100644
--- a/compiler/testData/psi/examples/collections/IIterable.txt
+++ b/compiler/testData/psi/examples/collections/IIterable.txt
@@ -1,6 +1,8 @@
 JetFile: IIterable.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -43,4 +45,4 @@ JetFile: IIterable.kt
                       PsiElement(IDENTIFIER)('T')
               PsiElement(GT)('>')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IIterator.txt b/compiler/testData/psi/examples/collections/IIterator.txt
index 8b09d8fb4ad..86261e14164 100644
--- a/compiler/testData/psi/examples/collections/IIterator.txt
+++ b/compiler/testData/psi/examples/collections/IIterator.txt
@@ -1,6 +1,8 @@
 JetFile: IIterator.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -396,4 +398,4 @@ JetFile: IIterator.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IList.txt b/compiler/testData/psi/examples/collections/IList.txt
index b31ba602706..bc3ea037c7b 100644
--- a/compiler/testData/psi/examples/collections/IList.txt
+++ b/compiler/testData/psi/examples/collections/IList.txt
@@ -1,6 +1,8 @@
 JetFile: IList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -91,4 +93,4 @@ JetFile: IList.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IMutableIterable.txt b/compiler/testData/psi/examples/collections/IMutableIterable.txt
index ec6864ab2db..1d5b5bcf3c8 100644
--- a/compiler/testData/psi/examples/collections/IMutableIterable.txt
+++ b/compiler/testData/psi/examples/collections/IMutableIterable.txt
@@ -1,6 +1,8 @@
 JetFile: IMutableIterable.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -60,4 +62,4 @@ JetFile: IMutableIterable.kt
                       PsiElement(IDENTIFIER)('T')
               PsiElement(GT)('>')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IMutableIterator.txt b/compiler/testData/psi/examples/collections/IMutableIterator.txt
index 928b28ff43b..fdb00fcd9c6 100644
--- a/compiler/testData/psi/examples/collections/IMutableIterator.txt
+++ b/compiler/testData/psi/examples/collections/IMutableIterator.txt
@@ -1,6 +1,8 @@
 JetFile: IMutableIterator.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -54,4 +56,4 @@ JetFile: IMutableIterator.kt
       PsiWhiteSpace('\n\n')
       PsiComment(BLOCK_COMMENT)('/*\n  Considerations:\n    pro: why not + non iteration breaking\n    con: counter-intuitive for, e.g., TreeSet\n\n\n  fun addBefore(item : T) : Boolean\n  fun addAfter(item : T) : Boolean\n*/')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IMutableList.txt b/compiler/testData/psi/examples/collections/IMutableList.txt
index e0940a5cae5..2ae24555f11 100644
--- a/compiler/testData/psi/examples/collections/IMutableList.txt
+++ b/compiler/testData/psi/examples/collections/IMutableList.txt
@@ -1,6 +1,8 @@
 JetFile: IMutableList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -159,4 +161,4 @@ JetFile: IMutableList.kt
                       PsiElement(IDENTIFIER)('T')
               PsiElement(GT)('>')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/IMutableSet.txt b/compiler/testData/psi/examples/collections/IMutableSet.txt
index 73137efa3c9..6c83adbc412 100644
--- a/compiler/testData/psi/examples/collections/IMutableSet.txt
+++ b/compiler/testData/psi/examples/collections/IMutableSet.txt
@@ -1,6 +1,8 @@
 JetFile: IMutableSet.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -97,4 +99,4 @@ JetFile: IMutableSet.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/ISet.txt b/compiler/testData/psi/examples/collections/ISet.txt
index e50a80359d9..624008fe583 100644
--- a/compiler/testData/psi/examples/collections/ISet.txt
+++ b/compiler/testData/psi/examples/collections/ISet.txt
@@ -1,6 +1,8 @@
 JetFile: ISet.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -65,4 +67,4 @@ JetFile: ISet.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/ISized.txt b/compiler/testData/psi/examples/collections/ISized.txt
index 618be54dc4c..16e362cb274 100644
--- a/compiler/testData/psi/examples/collections/ISized.txt
+++ b/compiler/testData/psi/examples/collections/ISized.txt
@@ -1,6 +1,8 @@
 JetFile: ISized.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -24,4 +26,4 @@ JetFile: ISized.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/collections/LinkedList.txt b/compiler/testData/psi/examples/collections/LinkedList.txt
index 8c8508c8629..978aa3bf4a7 100644
--- a/compiler/testData/psi/examples/collections/LinkedList.txt
+++ b/compiler/testData/psi/examples/collections/LinkedList.txt
@@ -1,6 +1,8 @@
 JetFile: LinkedList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -893,4 +895,4 @@ JetFile: LinkedList.kt
                       PsiElement(IDENTIFIER)('T')
               PsiElement(GT)('>')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt
index 88cd9f02d04..5d716fca5c0 100644
--- a/compiler/testData/psi/examples/io/IOSamples.txt
+++ b/compiler/testData/psi/examples/io/IOSamples.txt
@@ -1,6 +1,8 @@
 JetFile: IOSamples.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -597,4 +599,4 @@ JetFile: IOSamples.kt
       PsiWhiteSpace(' ')
       PsiComment(EOL_COMMENT)('// throws IOException, you must catch or rethrow explicitly')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/map/IMap.txt b/compiler/testData/psi/examples/map/IMap.txt
index dba9f1bc92c..68296408e27 100644
--- a/compiler/testData/psi/examples/map/IMap.txt
+++ b/compiler/testData/psi/examples/map/IMap.txt
@@ -1,6 +1,8 @@
 JetFile: IMap.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -27,4 +29,4 @@ JetFile: IMap.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n  \n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
index 8a5c7948c9e..5ea99b9e79e 100644
--- a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
+++ b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
@@ -1,6 +1,8 @@
 JetFile: BinaryHeap.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -1109,4 +1111,4 @@ JetFile: BinaryHeap.kt
           PsiElement(MINUS)('-')
         PsiWhiteSpace(' ')
         INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
\ No newline at end of file
+          PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
index 1de24a7724e..aaf74d5c625 100644
--- a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
+++ b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
@@ -1,6 +1,8 @@
 JetFile: IPriorityQueue.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -61,4 +63,4 @@ JetFile: IPriorityQueue.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
index 5967db38171..f5f0b3c4407 100644
--- a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
+++ b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
@@ -1,6 +1,8 @@
 JetFile: PriorityQueueAsPushPop.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -134,4 +136,4 @@ JetFile: PriorityQueueAsPushPop.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('isEmpty')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt
index 3552ac72f64..01f8621cfbc 100644
--- a/compiler/testData/psi/examples/util/Comparison.txt
+++ b/compiler/testData/psi/examples/util/Comparison.txt
@@ -1,6 +1,8 @@
 JetFile: Comparison.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiWhiteSpace(' ')
@@ -420,4 +422,4 @@ JetFile: Comparison.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('GR')
         PsiWhiteSpace('\n')
-        PsiElement(RBRACE)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/examples/util/IComparable.txt b/compiler/testData/psi/examples/util/IComparable.txt
index 3ecc0834e24..be5f4029746 100644
--- a/compiler/testData/psi/examples/util/IComparable.txt
+++ b/compiler/testData/psi/examples/util/IComparable.txt
@@ -1,6 +1,8 @@
 JetFile: IComparable.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(open)('open')
@@ -44,4 +46,4 @@ JetFile: IComparable.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
index e21a1b5a743..267503bc837 100644
--- a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionTypesWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   TYPEDEF
     PsiElement(typealias)('typealias')
     PsiWhiteSpace(' ')
@@ -529,4 +531,4 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('S')
-      PsiElement(RPAR)(')')
\ No newline at end of file
+      PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
index bb4de8e4f53..a6f4d854689 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionsWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -439,4 +441,4 @@ JetFile: FunctionsWithFunctionReceivers.kt
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('C')
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
index bb9f4a0549d..91e94669edd 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionsWithFunctionReceiversAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -318,4 +320,4 @@ JetFile: FunctionsWithFunctionReceiversAnnotations.kt
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
\ No newline at end of file
+      PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
index b059ff009c8..c7acc92c2d2 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionsWithFunctionReceiversRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -635,4 +637,4 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
index 5a6bc4ce471..c81db8807b6 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
@@ -1,6 +1,8 @@
 JetFile: PropertiesWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -536,4 +538,4 @@ JetFile: PropertiesWithFunctionReceivers.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
index b2ba007a0f9..fd1ed74d340 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
@@ -1,6 +1,8 @@
 JetFile: PropertiesWithFunctionReceiversAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -328,4 +330,4 @@ JetFile: PropertiesWithFunctionReceiversAnnotations.kt
     TYPE_REFERENCE
       USER_TYPE
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('P')
\ No newline at end of file
+          PsiElement(IDENTIFIER)('P')
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
index bdffb8ac0d9..3bd7bdeda3e 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
@@ -1,6 +1,8 @@
 JetFile: PropertiesWithFunctionReceiversRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -430,4 +432,4 @@ JetFile: PropertiesWithFunctionReceiversRecovery.kt
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('A')
       PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('B')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('B')
diff --git a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
index 9dca168f2fc..dacc149b5d9 100644
--- a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
+++ b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionTypesAsArguments.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -83,4 +85,4 @@ JetFile: FunctionTypesAsArguments.kt
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
index e2b7ba31944..75e1834c277 100644
--- a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
+++ b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
@@ -1,6 +1,8 @@
 JetFile: functionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -954,4 +956,4 @@ JetFile: functionLiterals.kt
           PsiWhiteSpace('\n')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
index b3db812c3dd..98d012b695c 100644
--- a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
+++ b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
@@ -1,6 +1,8 @@
 JetFile: functionTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -1271,4 +1273,4 @@ JetFile: functionTypes.kt
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/kdoc/AtTags.txt b/compiler/testData/psi/kdoc/AtTags.txt
index ec8e2af4423..e386619a476 100644
--- a/compiler/testData/psi/kdoc/AtTags.txt
+++ b/compiler/testData/psi/kdoc/AtTags.txt
@@ -1,6 +1,8 @@
 JetFile: AtTags.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -16,4 +18,4 @@ JetFile: AtTags.kt
         PsiElement(KDOC_LEADING_ASTERISK)('*')
         PsiElement(KDOC_TEXT)(' @')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
index 80f2a9b0e73..c4a62c14d8e 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
@@ -1,7 +1,9 @@
 JetFile: DocCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     KDOC_SECTION
-      <empty list>
\ No newline at end of file
+      <empty list>
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
index 3bf014c4e16..beba9bf27c5 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
@@ -1,8 +1,10 @@
 JetFile: DocCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n')
     KDOC_SECTION
-      PsiElement(KDOC_TEXT)('/**')
\ No newline at end of file
+      PsiElement(KDOC_TEXT)('/**')
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
index 048dd536e33..ce8cc94e466 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
@@ -1,8 +1,10 @@
 JetFile: DocCommentAtBeginningOfFile3.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n\n')
     KDOC_SECTION
-      PsiElement(KDOC_TEXT)('fooo')
\ No newline at end of file
+      PsiElement(KDOC_TEXT)('fooo')
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
index 78297346043..b216b8b6649 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
@@ -1,10 +1,12 @@
 JetFile: DocCommentAtBeginningOfFile4.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n\n')
     KDOC_SECTION
       PsiElement(KDOC_TEXT)('/**foo*/')
       PsiWhiteSpace('\n\n')
-      PsiElement(KDOC_TEXT)('asdfas')
\ No newline at end of file
+      PsiElement(KDOC_TEXT)('asdfas')
diff --git a/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt b/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
index f46b84cfa81..6cb6d970857 100644
--- a/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
+++ b/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
@@ -1,9 +1,11 @@
 JetFile: EndOnLeadingAsterisks.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
     KDOC_SECTION
       <empty list>
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/EndRightAfterText.txt b/compiler/testData/psi/kdoc/EndRightAfterText.txt
index a3b94b5dfb6..7cd98869479 100644
--- a/compiler/testData/psi/kdoc/EndRightAfterText.txt
+++ b/compiler/testData/psi/kdoc/EndRightAfterText.txt
@@ -1,8 +1,10 @@
 JetFile: EndRightAfterText.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     KDOC_SECTION
       PsiElement(KDOC_TEXT)('text')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/HttpLink.txt b/compiler/testData/psi/kdoc/HttpLink.txt
index 5f3b749ba9f..2c79860417b 100644
--- a/compiler/testData/psi/kdoc/HttpLink.txt
+++ b/compiler/testData/psi/kdoc/HttpLink.txt
@@ -1,6 +1,8 @@
 JetFile: HttpLink.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -13,4 +15,4 @@ JetFile: HttpLink.kt
       PsiElement(KDOC_LEADING_ASTERISK)('*')
       PsiElement(KDOC_TEXT)(' [1]: http://www.jetbrains.com/')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/Incomplete.txt b/compiler/testData/psi/kdoc/Incomplete.txt
index 78dfb42b89b..87b3be828b6 100644
--- a/compiler/testData/psi/kdoc/Incomplete.txt
+++ b/compiler/testData/psi/kdoc/Incomplete.txt
@@ -1,8 +1,10 @@
 JetFile: Incomplete.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n      ')
     KDOC_SECTION
-      PsiElement(KDOC_TEXT)('contents')
\ No newline at end of file
+      PsiElement(KDOC_TEXT)('contents')
diff --git a/compiler/testData/psi/kdoc/Markdown.txt b/compiler/testData/psi/kdoc/Markdown.txt
index 30d0ee62080..f44c038ebf9 100644
--- a/compiler/testData/psi/kdoc/Markdown.txt
+++ b/compiler/testData/psi/kdoc/Markdown.txt
@@ -1,6 +1,8 @@
 JetFile: Markdown.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -33,4 +35,4 @@ JetFile: Markdown.kt
       PsiElement(KDOC_TEXT)(' and ')
       PsiElement(KDOC_MARKDOWN_ESCAPED_CHAR)('\]')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt b/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
index 22ef7b9683f..b3c08b051fa 100644
--- a/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
+++ b/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
@@ -1,6 +1,8 @@
 JetFile: MarkdownLinkWithError.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -51,4 +53,4 @@ JetFile: MarkdownLinkWithError.kt
           <empty list>
         PsiElement(RBRACKET)(']')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt b/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
index ff29e2bd922..b31251a9631 100644
--- a/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
+++ b/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
@@ -1,6 +1,8 @@
 JetFile: MarkdownLinkWithLabel.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -13,4 +15,4 @@ JetFile: MarkdownLinkWithLabel.kt
           PsiElement(IDENTIFIER)('bar')
         PsiElement(RBRACKET)(']')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt b/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
index 0e94c32193c..436b499ed2f 100644
--- a/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
+++ b/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
@@ -1,6 +1,8 @@
 JetFile: MarkdownQualifiedName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -42,4 +44,4 @@ JetFile: MarkdownQualifiedName.kt
           PsiElement(in)('in')
         PsiElement(RBRACKET)(']')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/ParamTag.txt b/compiler/testData/psi/kdoc/ParamTag.txt
index 7b7433c7e2e..cefb2381c70 100644
--- a/compiler/testData/psi/kdoc/ParamTag.txt
+++ b/compiler/testData/psi/kdoc/ParamTag.txt
@@ -1,6 +1,8 @@
 JetFile: ParamTag.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -16,4 +18,4 @@ JetFile: ParamTag.kt
         PsiWhiteSpace(' ')
         PsiElement(KDOC_TEXT)('The description of a.')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/ParamTagAtStart.txt b/compiler/testData/psi/kdoc/ParamTagAtStart.txt
index 08caf4c3ac4..a92758f8bce 100644
--- a/compiler/testData/psi/kdoc/ParamTagAtStart.txt
+++ b/compiler/testData/psi/kdoc/ParamTagAtStart.txt
@@ -1,6 +1,8 @@
 JetFile: ParamTagAtStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     KDOC_SECTION
@@ -13,4 +15,4 @@ JetFile: ParamTagAtStart.kt
             PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(KDOC_TEXT)('this is a ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/ReturnWithBrackets.txt b/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
index 273dbcb3aad..afef72db2ff 100644
--- a/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
+++ b/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
@@ -1,6 +1,8 @@
 JetFile: ReturnWithBrackets.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -23,4 +25,4 @@ JetFile: ReturnWithBrackets.kt
           PsiElement(RBRACKET)(']')
         PsiElement(KDOC_TEXT)(' This is a reference')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/Sections.txt b/compiler/testData/psi/kdoc/Sections.txt
index 723fad9988a..64fcbe521f4 100644
--- a/compiler/testData/psi/kdoc/Sections.txt
+++ b/compiler/testData/psi/kdoc/Sections.txt
@@ -1,6 +1,8 @@
 JetFile: Sections.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -38,4 +40,4 @@ JetFile: Sections.kt
         PsiWhiteSpace(' ')
         PsiElement(KDOC_TEXT)('a constructor parameter.')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/SeeEmpty.txt b/compiler/testData/psi/kdoc/SeeEmpty.txt
index 9655f43e42f..dd2fb2f637f 100644
--- a/compiler/testData/psi/kdoc/SeeEmpty.txt
+++ b/compiler/testData/psi/kdoc/SeeEmpty.txt
@@ -1,6 +1,8 @@
 JetFile: SeeEmpty.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -22,4 +24,4 @@ JetFile: SeeEmpty.kt
           PsiErrorElement:Identifier expected
             <empty list>
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/SeeLink.txt b/compiler/testData/psi/kdoc/SeeLink.txt
index 41acd0a7c4e..5bf4af2756e 100644
--- a/compiler/testData/psi/kdoc/SeeLink.txt
+++ b/compiler/testData/psi/kdoc/SeeLink.txt
@@ -1,6 +1,8 @@
 JetFile: SeeLink.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -17,4 +19,4 @@ JetFile: SeeLink.kt
             PsiElement(DOT)('.')
             PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/Simple.txt b/compiler/testData/psi/kdoc/Simple.txt
index a7be8769ebe..6d7691759ff 100644
--- a/compiler/testData/psi/kdoc/Simple.txt
+++ b/compiler/testData/psi/kdoc/Simple.txt
@@ -1,6 +1,8 @@
 JetFile: Simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     KDOC_SECTION
@@ -21,4 +23,4 @@ JetFile: Simple.kt
       PsiWhiteSpace('\n    ')
       PsiElement(KDOC_LEADING_ASTERISK)('**')
       PsiElement(KDOC_TEXT)(' line 6 ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt b/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
index 96ff061f008..34297bfad48 100644
--- a/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
+++ b/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
@@ -1,6 +1,8 @@
 JetFile: TextRightAfterLeadAsterisks.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n')
@@ -8,4 +10,4 @@ JetFile: TextRightAfterLeadAsterisks.kt
       PsiElement(KDOC_LEADING_ASTERISK)('**')
       PsiElement(KDOC_TEXT)('test')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/kdoc/TwoTags.txt b/compiler/testData/psi/kdoc/TwoTags.txt
index bb2360173e3..24172edb6ee 100644
--- a/compiler/testData/psi/kdoc/TwoTags.txt
+++ b/compiler/testData/psi/kdoc/TwoTags.txt
@@ -1,6 +1,8 @@
 JetFile: TwoTags.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   KDoc
     PsiElement(KDOC_START)('/**')
     PsiWhiteSpace('\n ')
@@ -19,4 +21,4 @@ JetFile: TwoTags.kt
         PsiWhiteSpace(' ')
         PsiElement(KDOC_TEXT)('M12')
     PsiWhiteSpace('\n ')
-    PsiElement(KDOC_END)('*/')
\ No newline at end of file
+    PsiElement(KDOC_END)('*/')
diff --git a/compiler/testData/psi/namelessObjectAsEnumMember.txt b/compiler/testData/psi/namelessObjectAsEnumMember.txt
index 761e69141db..55d87cf2f2e 100644
--- a/compiler/testData/psi/namelessObjectAsEnumMember.txt
+++ b/compiler/testData/psi/namelessObjectAsEnumMember.txt
@@ -1,6 +1,8 @@
 JetFile: namelessObjectAsEnumMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiComment(EOL_COMMENT)('// test that inner keyword is not parsed as enum entry')
     PsiWhiteSpace('\n')
@@ -33,4 +35,4 @@ JetFile: namelessObjectAsEnumMember.kt
         OBJECT_DECLARATION_NAME
           PsiErrorElement:Name expected
             <empty list>
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/newLabels/basic.txt b/compiler/testData/psi/newLabels/basic.txt
index 3bb90f439bf..23248227313 100644
--- a/compiler/testData/psi/newLabels/basic.txt
+++ b/compiler/testData/psi/newLabels/basic.txt
@@ -1,6 +1,8 @@
 JetFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -226,4 +228,4 @@ JetFile: basic.kt
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt b/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
index 69f6f74d6b4..34c69b9fa9e 100644
--- a/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
+++ b/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
@@ -1,6 +1,8 @@
 JetFile: oldSyntaxExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -105,4 +107,4 @@ JetFile: oldSyntaxExpressions.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/newLabels/recovery.txt b/compiler/testData/psi/newLabels/recovery.txt
index 1879cacef8b..dc4d8256728 100644
--- a/compiler/testData/psi/newLabels/recovery.txt
+++ b/compiler/testData/psi/newLabels/recovery.txt
@@ -1,6 +1,8 @@
 JetFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -270,4 +272,4 @@ JetFile: recovery.kt
           INTEGER_CONSTANT
             PsiElement(INTEGER_LITERAL)('1')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt b/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
index bf135a4bfed..48aced5ebe7 100644
--- a/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
+++ b/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
@@ -1,6 +1,8 @@
 JetFile: spaceBeforeLabelReference.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -165,4 +167,4 @@ JetFile: spaceBeforeLabelReference.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('9')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/packages/PackageBlockFirst.txt b/compiler/testData/psi/packages/PackageBlockFirst.txt
index e9dd55931a6..4d073d4a0ee 100644
--- a/compiler/testData/psi/packages/PackageBlockFirst.txt
+++ b/compiler/testData/psi/packages/PackageBlockFirst.txt
@@ -4,6 +4,8 @@ JetFile: PackageBlockFirst.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foobar')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace(' ')
   FUN
     PsiErrorElement:Expecting a top level declaration
@@ -35,4 +37,4 @@ JetFile: PackageBlockFirst.kt
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt b/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
index 90d4c371075..b9c09229f50 100644
--- a/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
+++ b/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
@@ -6,6 +6,8 @@ JetFile: PackageLeadingDotDoubleID.kt
       PsiElement(DOT)('.')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('a')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace(' ')
   MODIFIER_LIST
     ANNOTATION_ENTRY
@@ -15,4 +17,4 @@ JetFile: PackageLeadingDotDoubleID.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
   PsiErrorElement:Expecting a top level declaration
-    <empty list>
\ No newline at end of file
+    <empty list>
diff --git a/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt b/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
index c8c89d4fc9c..1f38e61bd31 100644
--- a/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
+++ b/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
@@ -16,4 +16,6 @@ JetFile: PackageLongNameBetweenDots.kt
         PsiElement(IDENTIFIER)('c')
     PsiElement(DOT)('.')
     PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
-      <empty list>
\ No newline at end of file
+      <empty list>
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageLongNameDoubleID.txt b/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
index a3e2c29c86b..6c7ec22fd9a 100644
--- a/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
+++ b/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
@@ -4,6 +4,8 @@ JetFile: PackageLongNameDoubleID.kt
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('a')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace(' ')
   MODIFIER_LIST
     ANNOTATION_ENTRY
@@ -13,4 +15,4 @@ JetFile: PackageLongNameDoubleID.kt
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
   PsiErrorElement:Expecting a top level declaration
-    <empty list>
\ No newline at end of file
+    <empty list>
diff --git a/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt b/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
index f8473b57bfd..3c188845cc9 100644
--- a/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
+++ b/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
@@ -13,4 +13,6 @@ JetFile: PackageLongNameLeadingDot.kt
           PsiElement(IDENTIFIER)('b')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('c')
\ No newline at end of file
+        PsiElement(IDENTIFIER)('c')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt b/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
index c0b601d3a82..69b38729650 100644
--- a/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
@@ -16,4 +16,6 @@ JetFile: PackageLongNameLeadingDoubleDot.kt
           PsiElement(IDENTIFIER)('b')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('c')
\ No newline at end of file
+        PsiElement(IDENTIFIER)('c')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageModifiers.txt b/compiler/testData/psi/packages/PackageModifiers.txt
index 6616e5b9075..cc55ac8209d 100644
--- a/compiler/testData/psi/packages/PackageModifiers.txt
+++ b/compiler/testData/psi/packages/PackageModifiers.txt
@@ -16,4 +16,6 @@ JetFile: PackageModifiers.kt
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('name')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('name')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageNameDoubleDot.txt b/compiler/testData/psi/packages/PackageNameDoubleDot.txt
index 351a7031a6e..0a9f69eb9e3 100644
--- a/compiler/testData/psi/packages/PackageNameDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageNameDoubleDot.txt
@@ -8,4 +8,6 @@ JetFile: PackageNameDoubleDot.kt
     PsiErrorElement:Package name must be a '.'-separated identifier list
       PsiElement(DOT)('.')
     PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
-      <empty list>
\ No newline at end of file
+      <empty list>
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageNameJustDot.txt b/compiler/testData/psi/packages/PackageNameJustDot.txt
index 5fc43fcfa75..3882d64b97a 100644
--- a/compiler/testData/psi/packages/PackageNameJustDot.txt
+++ b/compiler/testData/psi/packages/PackageNameJustDot.txt
@@ -5,4 +5,6 @@ JetFile: PackageNameJustDot.kt
     PsiErrorElement:Package name must be a '.'-separated identifier list
       PsiElement(DOT)('.')
     PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
-      <empty list>
\ No newline at end of file
+      <empty list>
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt b/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
index 8158225a2fa..788858f52b0 100644
--- a/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
+++ b/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
@@ -5,4 +5,6 @@ JetFile: PackageSimpleNameLeadingDot.kt
     PsiErrorElement:Package name must be a '.'-separated identifier list
       PsiElement(DOT)('.')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('a')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('a')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt b/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
index d84c3d0f30a..e77e4496311 100644
--- a/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
@@ -8,4 +8,6 @@ JetFile: PackageSimpleNameLeadingDoubleDot.kt
     PsiErrorElement:Package name must be a '.'-separated identifier list
       PsiElement(DOT)('.')
     REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('a')
\ No newline at end of file
+      PsiElement(IDENTIFIER)('a')
+  IMPORT_LIST
+    <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/platformTypesRecovery/Array.txt b/compiler/testData/psi/platformTypesRecovery/Array.txt
index 853b060f588..f2712c571a1 100644
--- a/compiler/testData/psi/platformTypesRecovery/Array.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Array.txt
@@ -1,6 +1,8 @@
 JetFile: Array.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -103,4 +105,4 @@ JetFile: Array.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt b/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
index 80770ad8147..144e43f0c6b 100644
--- a/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
+++ b/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
@@ -1,6 +1,8 @@
 JetFile: BeforeDot.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -77,4 +79,4 @@ JetFile: BeforeDot.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/Collections.txt b/compiler/testData/psi/platformTypesRecovery/Collections.txt
index d716b659803..b97e286d15b 100644
--- a/compiler/testData/psi/platformTypesRecovery/Collections.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Collections.txt
@@ -1,6 +1,8 @@
 JetFile: Collections.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -131,4 +133,4 @@ JetFile: Collections.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt b/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
index 4fbc91ca6b5..f417934006a 100644
--- a/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
+++ b/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
@@ -1,6 +1,8 @@
 JetFile: FunctionsNotPlatform.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -161,4 +163,4 @@ JetFile: FunctionsNotPlatform.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/MapEntry.txt b/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
index 613b22d7ce6..0a392cfec71 100644
--- a/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
+++ b/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
@@ -1,6 +1,8 @@
 JetFile: MapEntry.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -100,4 +102,4 @@ JetFile: MapEntry.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt b/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
index 9aace22e624..c542231d22e 100644
--- a/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
+++ b/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
@@ -1,6 +1,8 @@
 JetFile: ParenthesizedNotPlatform.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -51,4 +53,4 @@ JetFile: ParenthesizedNotPlatform.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/Qualified.txt b/compiler/testData/psi/platformTypesRecovery/Qualified.txt
index b2e592474d6..5e49793c696 100644
--- a/compiler/testData/psi/platformTypesRecovery/Qualified.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Qualified.txt
@@ -1,6 +1,8 @@
 JetFile: Qualified.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -96,4 +98,4 @@ JetFile: Qualified.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt b/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
index 766cfb15f88..2152cc3588a 100644
--- a/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
+++ b/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
@@ -1,6 +1,8 @@
 JetFile: QualifiedCollections.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -151,4 +153,4 @@ JetFile: QualifiedCollections.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/Simple.txt b/compiler/testData/psi/platformTypesRecovery/Simple.txt
index 053901e4d11..3434847e404 100644
--- a/compiler/testData/psi/platformTypesRecovery/Simple.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Simple.txt
@@ -1,6 +1,8 @@
 JetFile: Simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -72,4 +74,4 @@ JetFile: Simple.kt
     PsiWhiteSpace(' ')
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt b/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
index bed2825ad00..6f94ae67679 100644
--- a/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
+++ b/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
@@ -1,6 +1,8 @@
 JetFile: WrongWordInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -74,4 +76,4 @@ JetFile: WrongWordInParentheses.kt
       <empty list>
     BLOCK
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/primaryConstructor/local.txt b/compiler/testData/psi/primaryConstructor/local.txt
index b3dd62dfbd8..ef5be00ee0c 100644
--- a/compiler/testData/psi/primaryConstructor/local.txt
+++ b/compiler/testData/psi/primaryConstructor/local.txt
@@ -1,6 +1,8 @@
 JetFile: local.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -131,4 +133,4 @@ JetFile: local.kt
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt b/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
index b1e4cadb45d..0ceaea7d497 100644
--- a/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
+++ b/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
@@ -1,6 +1,8 @@
 JetFile: nestedClassAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -208,4 +210,4 @@ JetFile: nestedClassAmbiguity.kt
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/primaryConstructor/recovery.txt b/compiler/testData/psi/primaryConstructor/recovery.txt
index 331461d40f6..10be3fc00cd 100644
--- a/compiler/testData/psi/primaryConstructor/recovery.txt
+++ b/compiler/testData/psi/primaryConstructor/recovery.txt
@@ -1,6 +1,8 @@
 JetFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -241,4 +243,4 @@ JetFile: recovery.kt
                 PsiElement(IDENTIFIER)('Base')
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
\ No newline at end of file
+          PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt b/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
index c469e786506..75c529c4779 100644
--- a/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
+++ b/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryNestedClassAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -202,4 +204,4 @@ JetFile: recoveryNestedClassAmbiguity.kt
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/primaryConstructor/valid.txt b/compiler/testData/psi/primaryConstructor/valid.txt
index 7cd6af7765a..b3cb1aaaebe 100644
--- a/compiler/testData/psi/primaryConstructor/valid.txt
+++ b/compiler/testData/psi/primaryConstructor/valid.txt
@@ -1,6 +1,8 @@
 JetFile: valid.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -190,4 +192,4 @@ JetFile: valid.kt
     PsiWhiteSpace(' ')
     CLASS_BODY
       PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt b/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
index 1e8860234d1..c78faf4993b 100644
--- a/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
+++ b/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
@@ -1,6 +1,8 @@
 JetFile: BracketsInDelegate.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -19,4 +21,4 @@ JetFile: BracketsInDelegate.kt
               PsiElement(LBRACE)('{')
               BLOCK
                 <empty list>
-              PsiElement(RBRACE)('}')
\ No newline at end of file
+              PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt b/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
index a4ebd1a506d..d52ee27103a 100644
--- a/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
+++ b/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
@@ -1,6 +1,8 @@
 JetFile: DelegateAndInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -81,4 +83,4 @@ JetFile: DelegateAndInitializer.kt
     PsiElement(EQ)('=')
   PsiWhiteSpace(' ')
   PsiErrorElement:Expecting a top level declaration
-    PsiElement(INTEGER_LITERAL)('3')
\ No newline at end of file
+    PsiElement(INTEGER_LITERAL)('3')
diff --git a/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt b/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
index b0057fddf68..e26c5dd9bae 100644
--- a/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
+++ b/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
@@ -1,6 +1,8 @@
 JetFile: GetterInSameLine.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -26,4 +28,4 @@ JetFile: GetterInSameLine.kt
       PsiWhiteSpace(' ')
       INTEGER_CONSTANT
         PsiElement(INTEGER_LITERAL)('1')
-      PsiElement(SEMICOLON)(';')
\ No newline at end of file
+      PsiElement(SEMICOLON)(';')
diff --git a/compiler/testData/psi/propertyDelegate/LocalProperty.txt b/compiler/testData/psi/propertyDelegate/LocalProperty.txt
index 69cdc2ad381..ddaa7a41566 100644
--- a/compiler/testData/psi/propertyDelegate/LocalProperty.txt
+++ b/compiler/testData/psi/propertyDelegate/LocalProperty.txt
@@ -1,6 +1,8 @@
 JetFile: LocalProperty.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -43,4 +45,4 @@ JetFile: LocalProperty.kt
           PsiWhiteSpace('\n  ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/propertyDelegate/OnlyBy.txt b/compiler/testData/psi/propertyDelegate/OnlyBy.txt
index 2f13850ab80..af20eec4539 100644
--- a/compiler/testData/psi/propertyDelegate/OnlyBy.txt
+++ b/compiler/testData/psi/propertyDelegate/OnlyBy.txt
@@ -1,6 +1,8 @@
 JetFile: OnlyBy.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -19,4 +21,4 @@ JetFile: OnlyBy.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('1')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/propertyDelegate/PropertyInClass.txt b/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
index 97630fb371b..f544ff2971c 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
@@ -1,6 +1,8 @@
 JetFile: PropertyInClass.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: PropertyInClass.kt
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt b/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
index 2e3a4e7089e..0aaa0d91087 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
@@ -1,6 +1,8 @@
 JetFile: PropertyWithGetter.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -30,4 +32,4 @@ JetFile: PropertyWithGetter.kt
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       INTEGER_CONSTANT
-        PsiElement(INTEGER_LITERAL)('1')
\ No newline at end of file
+        PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt b/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
index 3cc00ceaeb2..951f105c6bd 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
@@ -1,6 +1,8 @@
 JetFile: PropertyWithInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -27,4 +29,4 @@ JetFile: PropertyWithInitializer.kt
           PsiElement(EQ)('=')
         PsiWhiteSpace(' ')
         INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
\ No newline at end of file
+          PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt b/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
index 39929d11e2b..80356ace7dd 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
@@ -1,6 +1,8 @@
 JetFile: PropertyWithoutTypeRef.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -14,4 +16,4 @@ JetFile: PropertyWithoutTypeRef.kt
           PsiElement(IDENTIFIER)('A')
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
\ No newline at end of file
+          PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt b/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
index b34e182c1e1..dbc161c89f5 100644
--- a/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
+++ b/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
@@ -1,6 +1,8 @@
 JetFile: TopLevelProperty.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -20,4 +22,4 @@ JetFile: TopLevelProperty.kt
           PsiElement(IDENTIFIER)('A')
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
\ No newline at end of file
+          PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/propertyDelegate/TwoProperties.txt b/compiler/testData/psi/propertyDelegate/TwoProperties.txt
index 40ea2c6cb72..143e85cf750 100644
--- a/compiler/testData/psi/propertyDelegate/TwoProperties.txt
+++ b/compiler/testData/psi/propertyDelegate/TwoProperties.txt
@@ -1,6 +1,8 @@
 JetFile: TwoProperties.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
@@ -31,4 +33,4 @@ JetFile: TwoProperties.kt
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
-    PsiElement(SEMICOLON)(';')
\ No newline at end of file
+    PsiElement(SEMICOLON)(';')
diff --git a/compiler/testData/psi/recovery/AbsentLeftHandSide.txt b/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
index dd5b28e78ac..251b6a1b330 100644
--- a/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
+++ b/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/BareVal.txt b/compiler/testData/psi/recovery/BareVal.txt
index eaebe0d2c4a..4d3b2847f15 100644
--- a/compiler/testData/psi/recovery/BareVal.txt
+++ b/compiler/testData/psi/recovery/BareVal.txt
@@ -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)('}')
\ No newline at end of file
diff --git a/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt b/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
index 10ed2aef346..ac0b9b4348b 100644
--- a/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
+++ b/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/CatchKeywordRBrace.txt b/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
index 94638df8123..a939038b4c4 100644
--- a/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
+++ b/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt b/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
index b8a2b22ebf0..9cd3b5ccb2d 100644
--- a/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
+++ b/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt b/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
index 93f2df38e04..054f9390dae 100644
--- a/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt b/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
index 7f9b850ddd0..5410e6255c5 100644
--- a/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/EnumEntryInitList.txt b/compiler/testData/psi/recovery/EnumEntryInitList.txt
index 59729e00e22..a7a37023e22 100644
--- a/compiler/testData/psi/recovery/EnumEntryInitList.txt
+++ b/compiler/testData/psi/recovery/EnumEntryInitList.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForEmptyParentheses.txt b/compiler/testData/psi/recovery/ForEmptyParentheses.txt
index 54637bcd5c6..6dad0208367 100644
--- a/compiler/testData/psi/recovery/ForEmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/ForEmptyParentheses.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt b/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
index a2fb1b359e0..02d867fed3a 100644
--- a/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
+++ b/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt b/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
index 47a3fe600de..ab1ef2bc306 100644
--- a/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
+++ b/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForRecovery.txt b/compiler/testData/psi/recovery/ForRecovery.txt
index 5f29531331b..c046783c363 100644
--- a/compiler/testData/psi/recovery/ForRecovery.txt
+++ b/compiler/testData/psi/recovery/ForRecovery.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt b/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
index f64c5e36c16..8923c8c483a 100644
--- a/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
@@ -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>
\ No newline at end of file
+        <empty list>
diff --git a/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt b/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
index 8fcf670047c..fc7c0507546 100644
--- a/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
@@ -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>
\ No newline at end of file
+          <empty list>
diff --git a/compiler/testData/psi/recovery/ForWithoutLPar.txt b/compiler/testData/psi/recovery/ForWithoutLPar.txt
index b7db1cf5028..b601ff5a022 100644
--- a/compiler/testData/psi/recovery/ForWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/ForWithoutLPar.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt b/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
index b5bb46c5dff..b90d6dd0c27 100644
--- a/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
@@ -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>
\ No newline at end of file
+          <empty list>
diff --git a/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt b/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
index e62d99b1c18..911bc3078f2 100644
--- a/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
+++ b/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ForWithoutRange.txt b/compiler/testData/psi/recovery/ForWithoutRange.txt
index 078249feef5..e091b423394 100644
--- a/compiler/testData/psi/recovery/ForWithoutRange.txt
+++ b/compiler/testData/psi/recovery/ForWithoutRange.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IfKeywordRBrace.txt b/compiler/testData/psi/recovery/IfKeywordRBrace.txt
index ea3b41ea3f4..568100980e9 100644
--- a/compiler/testData/psi/recovery/IfKeywordRBrace.txt
+++ b/compiler/testData/psi/recovery/IfKeywordRBrace.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IfWithEmptyCondition.txt b/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
index 0387edc8c4e..1f8e62b9ffa 100644
--- a/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IfWithoutLPar.txt b/compiler/testData/psi/recovery/IfWithoutLPar.txt
index 7b11eff9b59..99afc7d668d 100644
--- a/compiler/testData/psi/recovery/IfWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/IfWithoutLPar.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IncompleteAccessor1.txt b/compiler/testData/psi/recovery/IncompleteAccessor1.txt
index a75a591f719..9d8e458b6dd 100644
--- a/compiler/testData/psi/recovery/IncompleteAccessor1.txt
+++ b/compiler/testData/psi/recovery/IncompleteAccessor1.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('D')
diff --git a/compiler/testData/psi/recovery/IncompleteAccessor2.txt b/compiler/testData/psi/recovery/IncompleteAccessor2.txt
index ce41fabc500..1353b3b2a95 100644
--- a/compiler/testData/psi/recovery/IncompleteAccessor2.txt
+++ b/compiler/testData/psi/recovery/IncompleteAccessor2.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('D')
diff --git a/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt b/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
index d92f72890da..ffba96ffffd 100644
--- a/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
+++ b/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
index 2d55e73ea6d..9391d552768 100644
--- a/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteForRBrace.txt b/compiler/testData/psi/recovery/IncompleteForRBrace.txt
index b373cf66402..5ed463292f6 100644
--- a/compiler/testData/psi/recovery/IncompleteForRBrace.txt
+++ b/compiler/testData/psi/recovery/IncompleteForRBrace.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IncompleteFun.txt b/compiler/testData/psi/recovery/IncompleteFun.txt
index 704bb48336f..b652aa0e6d8 100644
--- a/compiler/testData/psi/recovery/IncompleteFun.txt
+++ b/compiler/testData/psi/recovery/IncompleteFun.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt b/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
index 849bf1f58fc..b8658a2ae5a 100644
--- a/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
+++ b/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
index c1bd867a171..eefac5eff20 100644
--- a/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
index 02674ae66f0..8dd6a12cd0f 100644
--- a/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt b/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
index bce9e7f37e5..4393e23142e 100644
--- a/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
+++ b/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
index e425d14428e..44b8e33df89 100644
--- a/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('D')
diff --git a/compiler/testData/psi/recovery/IncompleteWhenElse.txt b/compiler/testData/psi/recovery/IncompleteWhenElse.txt
index e0fb02f5490..4a60d136580 100644
--- a/compiler/testData/psi/recovery/IncompleteWhenElse.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhenElse.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/IncompleteWhere.txt b/compiler/testData/psi/recovery/IncompleteWhere.txt
index c2f1ebddf20..ffbbdb52314 100644
--- a/compiler/testData/psi/recovery/IncompleteWhere.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhere.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/IncompleteWhere2.txt b/compiler/testData/psi/recovery/IncompleteWhere2.txt
index 1f5b804b963..ddb01e1f61d 100644
--- a/compiler/testData/psi/recovery/IncompleteWhere2.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhere2.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Next')
diff --git a/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt b/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
index 8ad39a9a8c9..f07b8913739 100644
--- a/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
+++ b/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt b/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
index 56e68844d64..b9525326b80 100644
--- a/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
+++ b/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt b/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
index 47fae2c1510..e9629ede51e 100644
--- a/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt b/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
index 07e56872772..82bee33e309 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
@@ -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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt b/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
index 48a0a86301d..8bf45839d69 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt b/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
index 0fbe5ee1256..a8f8fcc5730 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/NoArrowInWhen.txt b/compiler/testData/psi/recovery/NoArrowInWhen.txt
index 3d46353165b..95a972250bd 100644
--- a/compiler/testData/psi/recovery/NoArrowInWhen.txt
+++ b/compiler/testData/psi/recovery/NoArrowInWhen.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/PackageNewLineRecovery.txt b/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
index 92edbacb991..0059059a08c 100644
--- a/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
+++ b/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
@@ -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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('12')
diff --git a/compiler/testData/psi/recovery/PackageRecovery.txt b/compiler/testData/psi/recovery/PackageRecovery.txt
index 09f8b1341eb..67656c48920 100644
--- a/compiler/testData/psi/recovery/PackageRecovery.txt
+++ b/compiler/testData/psi/recovery/PackageRecovery.txt
@@ -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')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('12')
diff --git a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
index cd5e533067c..e575beeee42 100644
--- a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
+++ b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
index 50ce700c900..ed60ecb6dca 100644
--- a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
+++ b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
@@ -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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/recovery/WhenWithoutBraces.txt b/compiler/testData/psi/recovery/WhenWithoutBraces.txt
index c6f02f30cfa..43b681a164e 100644
--- a/compiler/testData/psi/recovery/WhenWithoutBraces.txt
+++ b/compiler/testData/psi/recovery/WhenWithoutBraces.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt b/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
index 5db6abf0700..57cb2e61772 100644
--- a/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/WhileWithoutLPar.txt b/compiler/testData/psi/recovery/WhileWithoutLPar.txt
index 64606ef4b66..cf20a72f415 100644
--- a/compiler/testData/psi/recovery/WhileWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/WhileWithoutLPar.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt b/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
index 2125b2e4d26..b010d7c44ca 100644
--- a/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
+++ b/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/initRecovery.txt b/compiler/testData/psi/recovery/initRecovery.txt
index d92846c5040..2f05fa8775b 100644
--- a/compiler/testData/psi/recovery/initRecovery.txt
+++ b/compiler/testData/psi/recovery/initRecovery.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/kt2172.txt b/compiler/testData/psi/recovery/kt2172.txt
index 43f1e93cbd1..a69d2cb93db 100644
--- a/compiler/testData/psi/recovery/kt2172.txt
+++ b/compiler/testData/psi/recovery/kt2172.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/kt5102.txt b/compiler/testData/psi/recovery/kt5102.txt
index dd729af3a1e..42f728bdc5d 100644
--- a/compiler/testData/psi/recovery/kt5102.txt
+++ b/compiler/testData/psi/recovery/kt5102.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt b/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
index 819560a3dd2..39252d15a38 100644
--- a/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
@@ -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)(')')
\ No newline at end of file
+        PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
index 7737b2dc0c1..faeb4ea5ab1 100644
--- a/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/Everything.txt b/compiler/testData/psi/recovery/objects/declarations/Everything.txt
index 266a5282937..dc92e4452ad 100644
--- a/compiler/testData/psi/recovery/objects/declarations/Everything.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/Everything.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt b/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
index c2ce4306741..3628051e902 100644
--- a/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
@@ -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')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('Bar')
diff --git a/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
index 7fcc07d2c45..907a29c257c 100644
--- a/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
index 6351ad347bc..a0a5b3f4d1d 100644
--- a/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt b/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
index 0163728c011..3cd0f3dfc11 100644
--- a/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/declarations/Where.txt b/compiler/testData/psi/recovery/objects/declarations/Where.txt
index 2f4e2f049df..56f3e48ad59 100644
--- a/compiler/testData/psi/recovery/objects/declarations/Where.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/Where.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
index 8bbe2f18720..403fb7634c9 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
index 295fa8a53c9..617358a8a4f 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
index ea71da9875a..f0ea1c91778 100644
--- a/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/Everything.txt b/compiler/testData/psi/recovery/objects/expressions/Everything.txt
index d18552df0e3..5e29e903780 100644
--- a/compiler/testData/psi/recovery/objects/expressions/Everything.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/Everything.txt
@@ -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)('}')
\ No newline at end of file
+          PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/expressions/InFunction.txt b/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
index da41856d0f8..59b9f51c284 100644
--- a/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
index b43684c81d8..3475a4e2eb1 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
index b74162ff623..cbf4f6b96bf 100644
--- a/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt b/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
index a18da3ce43d..4725342ce14 100644
--- a/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
@@ -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>
\ No newline at end of file
+            <empty list>
diff --git a/compiler/testData/psi/recovery/objects/expressions/Where.txt b/compiler/testData/psi/recovery/objects/expressions/Where.txt
index 9e05b4ee70f..d3a4abe0e3d 100644
--- a/compiler/testData/psi/recovery/objects/expressions/Where.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/Where.txt
@@ -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)('}')
\ No newline at end of file
+          PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt b/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
index 87e578a50f0..ad01d4bb370 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt b/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
index 9fd500624d8..a8e944139ed 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
index 38eda61fbfd..19ee1a0143c 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
index fe767c56290..e81bce2d967 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
index 3fc68b57feb..d15450745fc 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
index 31a8d330739..615fb499185 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
index 705f550bff3..150841d4388 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
index 1e8e7a76079..9426fdd15bd 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
@@ -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')
\ No newline at end of file
+              PsiElement(IDENTIFIER)('Int')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
index 86704adf1d0..a512ae0f493 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
@@ -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)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
index 34baff7a002..da9f2e59dc3 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
index 122edfde6d8..05c517612e5 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
index c696f5bf9af..95cc714e360 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
@@ -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)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
index a50e0d9e005..c827bce32c4 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
index b55339071f4..7b0849cbbb2 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
@@ -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')
\ No newline at end of file
+              PsiElement(IDENTIFIER)('Int')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
index b1153249e27..2fec8492bcd 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
@@ -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)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
index 3a629c1e68d..7886f6422d4 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
index 4fcd5a24524..a1cfa1c3dd9 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
@@ -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)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/script/ComplexScript.txt b/compiler/testData/psi/script/ComplexScript.txt
index 796104d4afd..0122660a786 100644
--- a/compiler/testData/psi/script/ComplexScript.txt
+++ b/compiler/testData/psi/script/ComplexScript.txt
@@ -1,6 +1,8 @@
 JetFile: ComplexScript.kts
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   SCRIPT
     BLOCK
       FUN
@@ -123,4 +125,4 @@ JetFile: ComplexScript.kts
                     PsiElement(IDENTIFIER)('arg')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace('\n')
-            PsiElement(RBRACE)('}')
\ No newline at end of file
+            PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/script/Shebang.txt b/compiler/testData/psi/script/Shebang.txt
index 7c1c2103f2a..b1829a21469 100644
--- a/compiler/testData/psi/script/Shebang.txt
+++ b/compiler/testData/psi/script/Shebang.txt
@@ -1,8 +1,10 @@
 JetFile: Shebang.kts
-  PsiComment(SHEBANG_COMMENT)('#!/usr/bin/env kotlin')
-  PsiWhiteSpace('\n\n')
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
+  PsiComment(SHEBANG_COMMENT)('#!/usr/bin/env kotlin')
+  PsiWhiteSpace('\n\n')
   SCRIPT
     BLOCK
       CALL_EXPRESSION
@@ -13,4 +15,4 @@ JetFile: Shebang.kts
           VALUE_ARGUMENT
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('args')
-          PsiElement(RPAR)(')')
\ No newline at end of file
+          PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/script/ShebangIncorrect.txt b/compiler/testData/psi/script/ShebangIncorrect.txt
index 1d53b7aa58c..b7abfe89664 100644
--- a/compiler/testData/psi/script/ShebangIncorrect.txt
+++ b/compiler/testData/psi/script/ShebangIncorrect.txt
@@ -1,6 +1,8 @@
 JetFile: ShebangIncorrect.kts
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   SCRIPT
     BLOCK
       CALL_EXPRESSION
@@ -34,4 +36,4 @@ JetFile: ShebangIncorrect.kts
         OPERATION_REFERENCE
           PsiElement(DIV)('/')
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('hi')
\ No newline at end of file
+          PsiElement(IDENTIFIER)('hi')
diff --git a/compiler/testData/psi/script/SimpleScript.txt b/compiler/testData/psi/script/SimpleScript.txt
index 3a2f51fdf50..2e81e94cbac 100644
--- a/compiler/testData/psi/script/SimpleScript.txt
+++ b/compiler/testData/psi/script/SimpleScript.txt
@@ -1,6 +1,8 @@
 JetFile: SimpleScript.kts
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   SCRIPT
     BLOCK
       CALL_EXPRESSION
@@ -11,4 +13,4 @@ JetFile: SimpleScript.kts
           VALUE_ARGUMENT
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
-          PsiElement(RPAR)(')')
\ No newline at end of file
+          PsiElement(RPAR)(')')
diff --git a/compiler/testData/psi/script/manyAnnotationsOnFile.txt b/compiler/testData/psi/script/manyAnnotationsOnFile.txt
index 88b0d81ef64..93a96576936 100644
--- a/compiler/testData/psi/script/manyAnnotationsOnFile.txt
+++ b/compiler/testData/psi/script/manyAnnotationsOnFile.txt
@@ -37,6 +37,8 @@ JetFile: manyAnnotationsOnFile.kts
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('bar')
+  IMPORT_LIST
+    <empty list>
   SCRIPT
     BLOCK
       <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/script/unexpectedSymbol.txt b/compiler/testData/psi/script/unexpectedSymbol.txt
index 9b131578c1a..94df8e465ec 100644
--- a/compiler/testData/psi/script/unexpectedSymbol.txt
+++ b/compiler/testData/psi/script/unexpectedSymbol.txt
@@ -1,6 +1,8 @@
 JetFile: unexpectedSymbol.kts
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   SCRIPT
     BLOCK
       CALL_EXPRESSION
@@ -14,4 +16,4 @@ JetFile: unexpectedSymbol.kts
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
       PsiErrorElement:unexpected symbol
-        PsiElement(RBRACE)('}')
\ No newline at end of file
+        PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt b/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
index e55fa80d6af..d4a1176903a 100644
--- a/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
+++ b/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
@@ -1,6 +1,8 @@
 JetFile: anonymousInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -58,4 +60,4 @@ JetFile: anonymousInitializer.kt
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/secondaryConstructors/basic.txt b/compiler/testData/psi/secondaryConstructors/basic.txt
index 613a07ebc53..728ace1b86e 100644
--- a/compiler/testData/psi/secondaryConstructors/basic.txt
+++ b/compiler/testData/psi/secondaryConstructors/basic.txt
@@ -1,6 +1,8 @@
 JetFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -197,4 +199,4 @@ JetFile: basic.kt
     PsiWhiteSpace(' ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('B')
diff --git a/compiler/testData/psi/secondaryConstructors/emptyBody.txt b/compiler/testData/psi/secondaryConstructors/emptyBody.txt
index 18ae977f0ec..91235005040 100644
--- a/compiler/testData/psi/secondaryConstructors/emptyBody.txt
+++ b/compiler/testData/psi/secondaryConstructors/emptyBody.txt
@@ -1,6 +1,8 @@
 JetFile: emptyBody.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -94,4 +96,4 @@ JetFile: emptyBody.kt
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('4')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/secondaryConstructors/enumParsing.txt b/compiler/testData/psi/secondaryConstructors/enumParsing.txt
index 81353373e85..ebd3f8bc1e9 100644
--- a/compiler/testData/psi/secondaryConstructors/enumParsing.txt
+++ b/compiler/testData/psi/secondaryConstructors/enumParsing.txt
@@ -1,6 +1,8 @@
 JetFile: enumParsing.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     MODIFIER_LIST
       PsiElement(enum)('enum')
@@ -138,4 +140,4 @@ JetFile: enumParsing.kt
           PsiWhiteSpace('\n\n   ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt b/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
index 51af980c4a7..92dcd3cb130 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryEmptyDelegationType.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -154,4 +156,4 @@ JetFile: recoveryEmptyDelegationType.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('4')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('4')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
index 1e7fe098c53..ae46ae78126 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryJustConstructorKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -82,4 +84,4 @@ JetFile: recoveryJustConstructorKeyword.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('B')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
index 4fc9d729ea0..08ae1b20b33 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryJustConstructorKeywordSameLineBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -86,4 +88,4 @@ JetFile: recoveryJustConstructorKeywordSameLineBrace.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt b/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
index f85c30c00c2..4f17b14273c 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryNoDelegationCallAfterColon.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -85,4 +87,4 @@ JetFile: recoveryNoDelegationCallAfterColon.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('B')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt b/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
index 9466b0fbb44..59d6cdf0f5f 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryWithoutBodyWrongDelegationName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -113,4 +115,4 @@ JetFile: recoveryWithoutBodyWrongDelegationName.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
\ No newline at end of file
+    PsiElement(IDENTIFIER)('B')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt b/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
index 548c62a80ec..ff1175ea156 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryWithoutParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -104,4 +106,4 @@ JetFile: recoveryWithoutParameterList.kt
     TYPE_REFERENCE
       USER_TYPE
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Int')
\ No newline at end of file
+          PsiElement(IDENTIFIER)('Int')
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt b/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
index bc4d601877d..b6de067b306 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
@@ -1,6 +1,8 @@
 JetFile: recoveryWrongDelegationName.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
@@ -63,4 +65,4 @@ JetFile: recoveryWrongDelegationName.kt
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
     INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('1')
\ No newline at end of file
+      PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/semicolonBetweenDeclarations.txt b/compiler/testData/psi/semicolonBetweenDeclarations.txt
index 258ecac9bda..cb8f18effad 100644
--- a/compiler/testData/psi/semicolonBetweenDeclarations.txt
+++ b/compiler/testData/psi/semicolonBetweenDeclarations.txt
@@ -5,6 +5,8 @@ JetFile: semicolonBetweenDeclarations.kt
     REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
     PsiElement(SEMICOLON)(';')
+  IMPORT_LIST
+    <empty list>
   PsiWhiteSpace('\n\n')
   FUN
     PsiElement(fun)('fun')
@@ -176,4 +178,4 @@ JetFile: semicolonBetweenDeclarations.kt
             <empty list>
       PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt b/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
index deaa6f7fa50..49f153e6e71 100644
--- a/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
+++ b/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
@@ -1,6 +1,8 @@
 JetFile: RawStringsWithManyQuotes.kt
   PACKAGE_DIRECTIVE
     <empty list>
+  IMPORT_LIST
+    <empty list>
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
@@ -120,4 +122,4 @@ JetFile: RawStringsWithManyQuotes.kt
           PsiElement(REGULAR_STRING_PART)('""')
         PsiElement(CLOSING_QUOTE)('"""')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
+      PsiElement(RBRACE)('}')
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index f293392be76..f35d64d8230 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -60,6 +60,7 @@ fun createFileStub(packageFqName: FqName): KotlinFileStubImpl {
     val fileStub = KotlinFileStubImpl(null, packageFqName.asString(), packageFqName.isRoot())
     val packageDirectiveStub = KotlinPlaceHolderStubImpl<JetPackageDirective>(fileStub, JetStubElementTypes.PACKAGE_DIRECTIVE)
     createStubForPackageName(packageDirectiveStub, packageFqName)
+    KotlinPlaceHolderStubImpl<JetImportList>(fileStub, JetStubElementTypes.IMPORT_LIST)
     return fileStub
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
index 29d3be5677f..c602b2f86be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
@@ -389,11 +389,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
                 }
             }
             else {
-                val newImportList = psiFactory.createImportDirectiveWithImportList(importPath)
-                val packageDirective = file.getPackageDirective()
-                                       ?: throw IllegalStateException("Scripts are not supported: " + file.getName())
-                val addedImportList = packageDirective.getParent().addAfter(newImportList, packageDirective) as JetImportList
-                return addedImportList.getImports().single()
+                error("Trying to insert import $fqName into a file ${file.getName()} of type ${file.javaClass} with no import list.")
             }
         }
     }
diff --git a/idea/testData/addImport/Comments.kt b/idea/testData/addImport/Comments.kt
new file mode 100644
index 00000000000..b90ccedae2e
--- /dev/null
+++ b/idea/testData/addImport/Comments.kt
@@ -0,0 +1,5 @@
+// IMPORT: java.util.ArrayList
+package p
+
+// comment
+fun foo() {}
diff --git a/idea/testData/addImport/Comments.kt.after b/idea/testData/addImport/Comments.kt.after
new file mode 100644
index 00000000000..67a3c14f16c
--- /dev/null
+++ b/idea/testData/addImport/Comments.kt.after
@@ -0,0 +1,7 @@
+// IMPORT: java.util.ArrayList
+package p
+
+import java.util.*
+
+// comment
+fun foo() {}
diff --git a/idea/testData/addImport/CommentsNoPackageDirective.kt b/idea/testData/addImport/CommentsNoPackageDirective.kt
new file mode 100644
index 00000000000..0a9f1830b58
--- /dev/null
+++ b/idea/testData/addImport/CommentsNoPackageDirective.kt
@@ -0,0 +1,4 @@
+// IMPORT: java.util.ArrayList
+
+// comment
+fun foo() {}
diff --git a/idea/testData/addImport/CommentsNoPackageDirective.kt.after b/idea/testData/addImport/CommentsNoPackageDirective.kt.after
new file mode 100644
index 00000000000..1ed62d128c4
--- /dev/null
+++ b/idea/testData/addImport/CommentsNoPackageDirective.kt.after
@@ -0,0 +1,6 @@
+import java.util.*
+
+// IMPORT: java.util.ArrayList
+
+// comment
+fun foo() {}
diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
index 96bbf18f645..b95ed36e1ce 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]]
     MODIFIER_LIST:[public final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
index a4bc94681f4..fe8754994bf 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
@@ -3,6 +3,7 @@ PsiJetFileStubImpl[package=test.a]
     DOT_QUALIFIED_EXPRESSION:
       REFERENCE_EXPRESSION:[referencedName=test]
       REFERENCE_EXPRESSION:[referencedName=a]
+  IMPORT_LIST:
   CLASS:[fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]]
     MODIFIER_LIST:[annotation public final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
index 7668be75fe8..6b4276b48be 100644
--- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
+++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Annotations, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Annotations, superNames=[]]
     MODIFIER_LIST:[public final]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
index f3fa1910934..c0de39503ba 100644
--- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
+++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]]
     MODIFIER_LIST:[abstract internal]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
index 843502aabfa..018c213880e 100644
--- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
+++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
@@ -3,6 +3,7 @@ PsiJetFileStubImpl[package=test.class_object]
     DOT_QUALIFIED_EXPRESSION:
       REFERENCE_EXPRESSION:[referencedName=test]
       REFERENCE_EXPRESSION:[referencedName=class_object]
+  IMPORT_LIST:
   CLASS:[fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]]
     MODIFIER_LIST:[internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
index 1e50acba900..1f0d2d18d08 100644
--- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
+++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
@@ -5,6 +5,7 @@ PsiJetFileStubImpl[package=a.b.c]
         REFERENCE_EXPRESSION:[referencedName=a]
         REFERENCE_EXPRESSION:[referencedName=b]
       REFERENCE_EXPRESSION:[referencedName=c]
+  IMPORT_LIST:
   CLASS:[fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]]
     MODIFIER_LIST:[public final]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=data]
diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
index c5d6f159e20..bf019fac44a 100644
--- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
+++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]]
     MODIFIER_LIST:[internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
index c4a01022205..0880c80e743 100644
--- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DependencyOnNestedClasses, superNames=[Nested]]
     MODIFIER_LIST:[public final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt
index c0ef3039a33..b57226a6784 100644
--- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt
+++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt
@@ -9,6 +9,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum]
           REFERENCE_EXPRESSION:[referencedName=c]
         REFERENCE_EXPRESSION:[referencedName=test]
       REFERENCE_EXPRESSION:[referencedName=enum]
+  IMPORT_LIST:
   CLASS:[fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]]
     MODIFIER_LIST:[enum internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
index 3955d12ef18..58b4e3552bb 100644
--- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
+++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.FlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FlexibleTypes, superNames=[]]
     MODIFIER_LIST:[abstract internal]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
index 480517802b5..169aff9721f 100644
--- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=a]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=a]
+  IMPORT_LIST:
   CLASS:[fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]]
     MODIFIER_LIST:[internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt
index 5cb31c512eb..031358bcefa 100644
--- a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt
+++ b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]]
     MODIFIER_LIST:[internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
index 3e8285ad53a..ba138121848 100644
--- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.NestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NestedClasses, superNames=[]]
     MODIFIER_LIST:[internal final]
     TYPE_PARAMETER_LIST:
diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
index c0110be0bda..e96c3bfff10 100644
--- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
+++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   OBJECT_DECLARATION:[fqName=Objects, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Objects, superNames=[]]
     MODIFIER_LIST:[public]
     CLASS_BODY:
diff --git a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt
index 6acbbd80da0..72797c2df2d 100644
--- a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt
+++ b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=p]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=p]
+  IMPORT_LIST:
   CLASS:[fqName=p.PrivateToThis, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateToThis, superNames=[]]
     MODIFIER_LIST:[internal final]
     TYPE_PARAMETER_LIST:
diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
index e9302d6fd92..5c8b6c47460 100644
--- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
+++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]]
     MODIFIER_LIST:[internal final]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
index 6e0a4404491..5c0f9d5af06 100644
--- a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
+++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
@@ -7,6 +7,7 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated]
           REFERENCE_EXPRESSION:[referencedName=b]
         REFERENCE_EXPRESSION:[referencedName=c]
       REFERENCE_EXPRESSION:[referencedName=topLevelMembersAnnotated]
+  IMPORT_LIST:
   PROPERTY:[fqName=a.b.c.topLevelMembersAnnotated.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=i]
     MODIFIER_LIST:[internal]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
index b46f10d85e6..121d20e8b85 100644
--- a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
+++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
@@ -3,6 +3,7 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers]
     DOT_QUALIFIED_EXPRESSION:
       REFERENCE_EXPRESSION:[referencedName=foo]
       REFERENCE_EXPRESSION:[referencedName=TopLevelMembers]
+  IMPORT_LIST:
   PROPERTY:[fqName=foo.TopLevelMembers.certainlyNothing, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=certainlyNothing]
     MODIFIER_LIST:[private]
     TYPE_REFERENCE:
diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
index e377336c682..63d18eeae56 100644
--- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]]
     MODIFIER_LIST:[internal final]
     TYPE_PARAMETER_LIST:
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index fdfd75d9c0b..fa26f18da2e 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.TypeParams, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeParams, superNames=[]]
     MODIFIER_LIST:[internal final]
     TYPE_PARAMETER_LIST:
diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt
index 9080548485a..d46bda4d0b3 100644
--- a/idea/testData/decompiler/stubBuilder/Types/Types.txt
+++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]]
     MODIFIER_LIST:[abstract internal]
     PRIMARY_CONSTRUCTOR:
diff --git a/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after b/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after
index 5c4f4cf5446..22b10d579fb 100644
--- a/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after
+++ b/idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after
@@ -1,7 +1,7 @@
-// WITH_RUNTIME
-
 import java.net.URI
 
+// WITH_RUNTIME
+
 fun foo(): URI {
     return java.io.File("x").toURI()
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt
index 7f1bffeaf9b..d11f9c00516 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt
+++ b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt
@@ -4,4 +4,4 @@ fun getEntry() : Map.Entry<kotlin.Array<String>, java.sql.Array> {
     throw Error()
 }
 
-val <caret>x = getEntry()
\ No newline at end of file
+val <caret>x = getEntry()
diff --git a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after
index 83d9ec6f01c..6d7576d9876 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after
+++ b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after
@@ -1,9 +1,9 @@
-// WITH_RUNTIME
-
 import java.sql
 
+// WITH_RUNTIME
+
 fun getEntry() : Map.Entry<kotlin.Array<String>, java.sql.Array> {
     throw Error()
 }
 
-val x: Map.Entry<Array<String>, sql.Array> = getEntry()
\ No newline at end of file
+val x: Map.Entry<Array<String>, sql.Array> = getEntry()
diff --git a/idea/testData/quickfix/autoImports/classImport.after.kt b/idea/testData/quickfix/autoImports/classImport.after.kt
index c9cca3295d4..5f20b1a6b48 100644
--- a/idea/testData/quickfix/autoImports/classImport.after.kt
+++ b/idea/testData/quickfix/autoImports/classImport.after.kt
@@ -1,8 +1,8 @@
+import TestData.TestSample
+
 // "Import" "true"
 // ERROR: Unresolved reference: TestSample
 
-import TestData.TestSample
-
 fun test() {
     val a = TestSample
 }
diff --git a/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.after.kt b/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.after.kt
index 49a6b1a0903..9c8fdc7a765 100644
--- a/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.after.kt
+++ b/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.after.kt
@@ -1,8 +1,8 @@
+import ppp.XXX
+
 // "Import" "true"
 // ERROR: Unresolved reference: XXX
 
-import ppp.XXX
-
 fun f() {
     XXX { 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/importTrait.after.kt b/idea/testData/quickfix/autoImports/importTrait.after.kt
index ef35443f576..fd2ed286f34 100644
--- a/idea/testData/quickfix/autoImports/importTrait.after.kt
+++ b/idea/testData/quickfix/autoImports/importTrait.after.kt
@@ -1,8 +1,8 @@
+import importTrait.data.TestTrait
+
 // "Import" "true"
 // ERROR: Unresolved reference: TestTrait
 
-import importTrait.data.TestTrait
-
 fun test() {
     val a = <caret>TestTrait
 }
diff --git a/idea/testData/quickfix/autoImports/nestedClass.after.kt b/idea/testData/quickfix/autoImports/nestedClass.after.kt
index bf4250525d2..90489aae7fe 100644
--- a/idea/testData/quickfix/autoImports/nestedClass.after.kt
+++ b/idea/testData/quickfix/autoImports/nestedClass.after.kt
@@ -1,6 +1,6 @@
+import test.Test
+
 // "Import" "true"
 // ERROR: Unresolved reference: Nested
 
-import test.Test
-
 val a = <caret>Test.Nested
diff --git a/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after b/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after
index 5aee2c1851a..e59e5562a80 100644
--- a/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after
@@ -1,8 +1,8 @@
+import java.util.LinkedHashSet
+
 // "Add parameter to function 'foo'" "true"
 // DISABLE-ERRORS
 
-import java.util.LinkedHashSet
-
 fun foo(x: Int, linkedHashSet: LinkedHashSet<Int>) {
     foo(, java.util.LinkedHashSet<Int>());
     foo(1, java.util.LinkedHashSet<Int>());
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
index c5b7a879d1f..e02d315a67f 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.ReadOnlyProperty
+
 // "Create class 'Foo'" "true"
 // ERROR: <html>Class 'Foo' must be declared abstract or implement abstract member<br/><b>public</b> <b>abstract</b> <b>fun</b> get(thisRef: A&lt;T&gt;, desc: kotlin.PropertyMetadata): B <i>defined in</i> kotlin.properties.ReadOnlyProperty</html>
 
-import kotlin.properties.ReadOnlyProperty
-
 open class B
 
 class A<T>(val t: T) {
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after
index 721be40b610..bef86c68660 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.ReadWriteProperty
+
 // "Create class 'Foo'" "true"
 // DISABLE-ERRORS
 
-import kotlin.properties.ReadWriteProperty
-
 open class B
 
 class A<T>(val t: T) {
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after
index 23aed189f38..c9da7e403f3 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.ReadOnlyProperty
+
 // "Create object 'Foo'" "true"
 // DISABLE-ERRORS
 
-import kotlin.properties.ReadOnlyProperty
-
 open class B
 
 class A {
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after
index 9fe3307bd8b..f19c1c65c1e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.ReadWriteProperty
+
 // "Create object 'Foo'" "true"
 // DISABLE-ERRORS
 
-import kotlin.properties.ReadWriteProperty
-
 open class B
 
 class A {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
index b592d84b8f2..ef6af47d014 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
@@ -1,7 +1,7 @@
-// "Create function 'foo'" "true"
-
 import kotlin.properties.ReadOnlyProperty
 
+// "Create function 'foo'" "true"
+
 class A<T>(val t: T) {
     val x: A<Int> by foo(t, "")
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
index 2e57d442f10..ab8b64c791a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
@@ -1,7 +1,7 @@
-// "Create function 'foo'" "true"
-
 import kotlin.properties.ReadWriteProperty
 
+// "Create function 'foo'" "true"
+
 class A<T>(val t: T) {
     var x: A<Int> by foo(t, "")
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index 8c9e7e9802b..9ffeb5266db 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -1,7 +1,7 @@
-// "Create extension function 'set'" "true"
-
 import java.util.ArrayList
 
+// "Create extension function 'set'" "true"
+
 class Foo<T> {
     fun <T> x (y: Any, w: java.util.ArrayList<T>) {
         y["", w] = w
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after
index 902cd133c5f..f1725e172d1 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after
@@ -1,9 +1,9 @@
+import kotlin.properties.ReadOnlyProperty
+
 // "Create property 'foo'" "true"
 // ERROR: Property must be initialized or be abstract
 // ERROR: Variable 'foo' must be initialized
 
-import kotlin.properties.ReadOnlyProperty
-
 class A<T> {
     private val foo: ReadOnlyProperty<A<T>, A<Int>>
     val x: A<Int> by foo
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after
index beb5231e298..963eaee61d3 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after
@@ -1,9 +1,9 @@
+import kotlin.properties.ReadWriteProperty
+
 // "Create property 'foo'" "true"
 // ERROR: Property must be initialized or be abstract
 // ERROR: Variable 'foo' must be initialized
 
-import kotlin.properties.ReadWriteProperty
-
 class A<T> {
     private val foo: ReadWriteProperty<A<T>, A<Int>>
     var x: A<Int> by foo
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt.after b/idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt.after
index 13689241b55..5507fd3f144 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt.after
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt.after
@@ -1,12 +1,12 @@
-// "Replace with 'newFun(java.io.File.separatorChar)'" "true"
-
 import java.io.File
 
+// "Replace with 'newFun(java.io.File.separatorChar)'" "true"
+
 @deprecated("", ReplaceWith("newFun(java.io.File.separatorChar)"))
 fun oldFun() { }
 
 fun newFun(separator: Char){}
 
 fun foo() {
-    <caret>newFun(File.separatorChar)
+    newFun(File.separatorChar)
 }
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.after.kt b/idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.after.kt
index f2e3df1218c..944907d6d00 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.after.kt
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.after.kt
@@ -1,7 +1,7 @@
-// "Replace with 'newFun(this)'" "true"
-
 import dependency.C
 
+// "Replace with 'newFun(this)'" "true"
+
 fun foo(c: dependency.C) {
     C.<caret>newFun(c)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after
index b39fab6bcdd..5d20f5e8151 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> in whole annotation" "true"
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann(val arg: Array<KClass<*>>)
 
 Ann(arg = array(String::class, Double::class)) class MyClass
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after
index 9d04888540b..093654a8778 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> in whole annotation" "true"
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann(val arg1: KClass<*>, val arg2: KClass<out Any?>)
 
 Ann(String::class, Int::class) class MyClass
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after
index 909dacc0876..e89072b9d8b 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> in whole annotation" "true"
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann(
     val arg1: Int,
     val arg2: KClass<*> = Int::class,
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.kt
index fe4f68a886a..7c5d3cc8cbe 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.kt
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.kt
@@ -1,8 +1,8 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> for each annotation in project" "true"
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann1(val arg: KClass<*>)
 
 Ann1(String::class) class MyClass1
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after
index f9ddd526115..f785ad7255d 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after
@@ -1,3 +1,5 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> in whole annotation" "true"
 // ERROR: <html>Type inference failed. Expected type mismatch: <table><tr><td>required: </td><td><b>kotlin.reflect.KClass&lt;*&gt;</b></td></tr><tr><td>found: </td><td><font color=red><b>java.lang.Class&lt;???&gt;</b></font></td></tr></table></html>
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.reflect.KClass&lt;*&gt;</td></tr><tr><td>Found:</td><td>java.lang.Class&lt;[ERROR : Err]&gt;</td></tr></table></html>
@@ -5,8 +7,6 @@
 // ERROR: Unresolved reference: Err
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann(vararg val arg: KClass<*>)
 
 Ann(String::class, javaClass<Err>()) class MyClass1
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after
index 7657f371a75..a69bc90e6f5 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after
+++ b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after
@@ -1,8 +1,8 @@
+import kotlin.reflect.KClass
+
 // "Replace Class<T> with KClass<T> in whole annotation" "true"
 // WITH_RUNTIME
 
-import kotlin.reflect.KClass
-
 annotation class Ann(vararg val arg: KClass<*>)
 
 Ann(String::class, Double::class, *array(Char::class)) class MyClass
diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.after.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.after.kt
index 24e9847f22e..8e8a01b6529 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.after.kt
+++ b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.after.kt
@@ -1,8 +1,8 @@
+import java.lang.Number
+
 // "Replace javaClass<T>() with T::class in whole project" "true"
 // WITH_RUNTIME
 
-import java.lang.Number
-
 Ann(arg = array(Int::class, String::class)) class MyClass1
 
 Ann(arg = array<java.lang.Class<*>>(Number::class, String::class)) class MyClass2
diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.after.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.after.kt
index b928bf1974d..64a56c7bb09 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.after.kt
+++ b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.after.kt
@@ -1,6 +1,6 @@
+import java.util.Random
+
 // "Replace javaClass<T>() with T::class" "true"
 // WITH_RUNTIME
 
-import java.util.Random
-
 Ann(A::class, A::class, *array(A::class), arg1 = A.B::class, arg2 = Random::class) class MyClass
diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.after.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.after.kt
index 9bae86ea5dc..69c094c17fd 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.after.kt
+++ b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.after.kt
@@ -1,6 +1,6 @@
+import java.lang
+
 // "Replace javaClass<T>() with T::class" "true"
 // WITH_RUNTIME
 
-import java.lang
-
 Ann(String::class, x = 2, arg = (Int::class), args = array((Any::class), lang.String::class)) class MyClass
diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.after.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.after.kt
index 63c6152cb1a..f1549c518d4 100644
--- a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.after.kt
+++ b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.after.kt
@@ -1,8 +1,8 @@
+import java.lang
+
 // "Replace javaClass<T>() with T::class" "true"
 // WITH_RUNTIME
 
-import java.lang
-
 Ann(
         String::class,
         Int::class,
diff --git a/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after b/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
index 83901a35fa0..60f38e54d26 100644
--- a/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
@@ -1,7 +1,7 @@
-// "Change getter type to HashSet<Int>" "true"
-
 import java.util.HashSet
 
+// "Change getter type to HashSet<Int>" "true"
+
 class A() {
     val i: java.util.HashSet<Int>
         get(): HashSet<Int> = java.util.LinkedHashSet<Int>()
diff --git a/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after
index cb6916de012..1a5fec6e9ea 100644
--- a/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after
@@ -1,8 +1,8 @@
+import java.util.LinkedHashSet
+
 // "Cast expression 'module' to 'LinkedHashSet<Int>'" "true"
 // DISABLE-ERRORS
 
-import java.util.LinkedHashSet
-
 fun foo(): java.util.LinkedHashSet<Int> {
     val module: java.util.HashSet<Int> = java.util.LinkedHashSet<Int>()
     return module as LinkedHashSet<Int>
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
index 561adf2f89a..9c54b5f1bda 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
@@ -1,8 +1,8 @@
-// "Change type from 'String' to '(LinkedHashSet<Int>) -> HashSet<Int>'" "true"
-
 import java.util.HashSet
 import java.util.LinkedHashSet
 
+// "Change type from 'String' to '(LinkedHashSet<Int>) -> HashSet<Int>'" "true"
+
 fun foo(f: ((java.util.LinkedHashSet<Int>) -> java.util.HashSet<Int>) -> String) {
     foo {
         (f: (LinkedHashSet<Int>) -> HashSet<Int>) -> "42"
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after
index 3c680718e8e..08aed72f2e7 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after
@@ -1,6 +1,6 @@
-// "Change 'bar' function return type to 'HashSet<Int>'" "true"
-
 import java.util.HashSet
 
+// "Change 'bar' function return type to 'HashSet<Int>'" "true"
+
 fun bar(): HashSet<Int> = java.util.LinkedHashSet<Int>()
 fun foo(): java.util.HashSet<Int> = bar()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
index 71047972818..9d101bd8c0f 100644
--- a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
@@ -1,7 +1,7 @@
-// "Change type from 'String' to 'HashSet<Int>'" "true"
-
 import java.util.HashSet
 
+// "Change type from 'String' to 'HashSet<Int>'" "true"
+
 fun foo(f: (java.util.HashSet<Int>) -> String) {
     foo {
         (x: HashSet<Int>) -> ""
diff --git a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
index c9551a9695b..f2f5d044e8b 100644
--- a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
@@ -1,7 +1,7 @@
-// "Change 'f' type to '(Delegates) -> Unit'" "true"
-
 import kotlin.properties.Delegates
 
+// "Change 'f' type to '(Delegates) -> Unit'" "true"
+
 fun foo() {
-    var f: (Delegates) -> Unit = { (x: kotlin.properties.Delegates) ->  }<caret>
+    var f: (Delegates) -> Unit = { (x: kotlin.properties.Delegates) ->  }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceProperty/extractLazyToClass.kt.after b/idea/testData/refactoring/introduceProperty/extractLazyToClass.kt.after
index edbc594a214..5fc62363706 100644
--- a/idea/testData/refactoring/introduceProperty/extractLazyToClass.kt.after
+++ b/idea/testData/refactoring/introduceProperty/extractLazyToClass.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.Delegates
+
 // WITH_RUNTIME
 // EXTRACTION_TARGET: lazy property
 
-import kotlin.properties.Delegates
-
 class A(val n: Int = 1) {
     val m: Int = 2
 
diff --git a/idea/testData/refactoring/introduceProperty/extractLazyToFile.kt.after b/idea/testData/refactoring/introduceProperty/extractLazyToFile.kt.after
index 7be7932a678..eee2047edc5 100644
--- a/idea/testData/refactoring/introduceProperty/extractLazyToFile.kt.after
+++ b/idea/testData/refactoring/introduceProperty/extractLazyToFile.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.Delegates
+
 // WITH_RUNTIME
 // EXTRACTION_TARGET: lazy property
 
-import kotlin.properties.Delegates
-
 val n: Int = 1
 
 private val i: Int by Delegates.lazy {
@@ -11,4 +11,4 @@ private val i: Int by Delegates.lazy {
 
 fun foo(): Int {
     return i
-}
\ No newline at end of file
+}
diff --git a/idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt.after b/idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt.after
index 35a93ac3187..3b8fdc22f0c 100644
--- a/idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt.after
+++ b/idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt.after
@@ -1,8 +1,8 @@
+import kotlin.properties.Delegates
+
 // WITH_RUNTIME
 // EXTRACTION_TARGET: lazy property
 
-import kotlin.properties.Delegates
-
 class A(val n: Int = 1) {
     val m: Int = 2
 
diff --git a/idea/testData/shortenRefs/PackagesToUseStarImports.kt b/idea/testData/shortenRefs/PackagesToUseStarImports.kt
index b7eaf52d658..bc9f9171d97 100644
--- a/idea/testData/shortenRefs/PackagesToUseStarImports.kt
+++ b/idea/testData/shortenRefs/PackagesToUseStarImports.kt
@@ -7,5 +7,3 @@ val v: java.io.File
 val v: java.util.concurrent.atomic.AtomicBoolean
 val v: java.util.ArrayList<String>
 </selection>
-
-
diff --git a/idea/testData/shortenRefs/PackagesToUseStarImports.kt.after b/idea/testData/shortenRefs/PackagesToUseStarImports.kt.after
index 819e323b281..a64ff80b0c1 100644
--- a/idea/testData/shortenRefs/PackagesToUseStarImports.kt.after
+++ b/idea/testData/shortenRefs/PackagesToUseStarImports.kt.after
@@ -1,12 +1,12 @@
+import java.io.*
+import java.util.ArrayList
+import java.util.concurrent.atomic.*
+
 // PACKAGE_TO_USE_STAR_IMPORTS: java.io
 // PACKAGE_TO_USE_STAR_IMPORTS: java
 // PACKAGES_TO_USE_STAR_IMPORTS: java.util.concurrent
 
 
-import java.io.*
-import java.util.ArrayList
-import java.util.concurrent.atomic.*
-
 val v: File
 val v: AtomicBoolean
 val v: ArrayList<String>
diff --git a/idea/testData/shortenRefs/java/innerClassImport.kt b/idea/testData/shortenRefs/java/innerClassImport.kt
index 3a1abec750a..65681ce72fd 100644
--- a/idea/testData/shortenRefs/java/innerClassImport.kt
+++ b/idea/testData/shortenRefs/java/innerClassImport.kt
@@ -2,4 +2,4 @@
 
 fun bar(s: String) {
     <selection>val t: A.B = A().B(s)</selection>
-}
\ No newline at end of file
+}
diff --git a/idea/testData/shortenRefs/java/innerClassImport.kt.after b/idea/testData/shortenRefs/java/innerClassImport.kt.after
index 86e1dc2651c..69c59a62dd8 100644
--- a/idea/testData/shortenRefs/java/innerClassImport.kt.after
+++ b/idea/testData/shortenRefs/java/innerClassImport.kt.after
@@ -1,7 +1,7 @@
-// IMPORT_NESTED_CLASSES: true
-
 import A.B
 
+// IMPORT_NESTED_CLASSES: true
+
 fun bar(s: String) {
     val t: B = A().B(s)
 }
diff --git a/idea/testData/stubs/AnnotationClass.expected b/idea/testData/stubs/AnnotationClass.expected
index 9e7e93eaaca..03b373d2a49 100644
--- a/idea/testData/stubs/AnnotationClass.expected
+++ b/idea/testData/stubs/AnnotationClass.expected
@@ -1,4 +1,5 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]]
     MODIFIER_LIST:[annotation]
diff --git a/idea/testData/stubs/AnnotationOnClass.expected b/idea/testData/stubs/AnnotationOnClass.expected
index d40cb071a53..5dd56933b58 100644
--- a/idea/testData/stubs/AnnotationOnClass.expected
+++ b/idea/testData/stubs/AnnotationOnClass.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]]
     MODIFIER_LIST:[]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated]
diff --git a/idea/testData/stubs/AnnotationOnFunction.expected b/idea/testData/stubs/AnnotationOnFunction.expected
index ed648f8133e..7bb735c7d55 100644
--- a/idea/testData/stubs/AnnotationOnFunction.expected
+++ b/idea/testData/stubs/AnnotationOnFunction.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
     MODIFIER_LIST:[]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated]
diff --git a/idea/testData/stubs/AnnotationOnLocalFunction.expected b/idea/testData/stubs/AnnotationOnLocalFunction.expected
index 489d6a4d6a3..5583e5a50a4 100644
--- a/idea/testData/stubs/AnnotationOnLocalFunction.expected
+++ b/idea/testData/stubs/AnnotationOnLocalFunction.expected
@@ -1,4 +1,5 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
     VALUE_PARAMETER_LIST:
diff --git a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected
index 0fa4cfbe6a2..7a2458033f4 100644
--- a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected
+++ b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[private]
diff --git a/idea/testData/stubs/AnonymousObject.expected b/idea/testData/stubs/AnonymousObject.expected
index 09b595a2be9..502024cdc45 100644
--- a/idea/testData/stubs/AnonymousObject.expected
+++ b/idea/testData/stubs/AnonymousObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
   CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]]
   PROPERTY:[fqName=obj, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=obj]
diff --git a/idea/testData/stubs/ClassObject.expected b/idea/testData/stubs/ClassObject.expected
index cf47338ca11..30a375ab01c 100644
--- a/idea/testData/stubs/ClassObject.expected
+++ b/idea/testData/stubs/ClassObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]]
     CLASS_BODY:
       OBJECT_DECLARATION:[fqName=C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
diff --git a/idea/testData/stubs/ClassProperty.expected b/idea/testData/stubs/ClassProperty.expected
index 92fb23562fe..d042844a114 100644
--- a/idea/testData/stubs/ClassProperty.expected
+++ b/idea/testData/stubs/ClassProperty.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=More, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=More, superNames=[]]
     CLASS_BODY:
       PROPERTY:[fqName=More.test, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=test]
diff --git a/idea/testData/stubs/ClassTypeParameters.expected b/idea/testData/stubs/ClassTypeParameters.expected
index 732c00ca124..0682c3d607d 100644
--- a/idea/testData/stubs/ClassTypeParameters.expected
+++ b/idea/testData/stubs/ClassTypeParameters.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]]
     TYPE_PARAMETER_LIST:
       TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T]
diff --git a/idea/testData/stubs/DanglingAnnotations.expected b/idea/testData/stubs/DanglingAnnotations.expected
index ac8e32d1143..cb57d273961 100644
--- a/idea/testData/stubs/DanglingAnnotations.expected
+++ b/idea/testData/stubs/DanglingAnnotations.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]]
     CLASS_BODY:
       MODIFIER_LIST:[]
diff --git a/idea/testData/stubs/DynamicType.expected b/idea/testData/stubs/DynamicType.expected
index fc8e2df06b3..73b7e45686e 100644
--- a/idea/testData/stubs/DynamicType.expected
+++ b/idea/testData/stubs/DynamicType.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=foo, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=foo]
     TYPE_REFERENCE:
       DYNAMIC_TYPE:
diff --git a/idea/testData/stubs/FilePackage.expected b/idea/testData/stubs/FilePackage.expected
index 5f97fba7b06..0a2fc455585 100644
--- a/idea/testData/stubs/FilePackage.expected
+++ b/idea/testData/stubs/FilePackage.expected
@@ -3,3 +3,4 @@ PsiJetFileStubImpl[package=some.test]
     DOT_QUALIFIED_EXPRESSION:
       REFERENCE_EXPRESSION:[referencedName=some]
       REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
diff --git a/idea/testData/stubs/FunctionInNotNamedObject.expected b/idea/testData/stubs/FunctionInNotNamedObject.expected
index 9f9315c6138..c8d4761d901 100644
--- a/idea/testData/stubs/FunctionInNotNamedObject.expected
+++ b/idea/testData/stubs/FunctionInNotNamedObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   OBJECT_DECLARATION:[fqName=<no name>, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=null, superNames=[]]
     CLASS_BODY:
       FUN:[fqName=null, hasBlockBody=false, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=testing]
diff --git a/idea/testData/stubs/FunctionParameters.expected b/idea/testData/stubs/FunctionParameters.expected
index 6c93ed89c3b..aa2fa15577e 100644
--- a/idea/testData/stubs/FunctionParameters.expected
+++ b/idea/testData/stubs/FunctionParameters.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=some, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=some]
     VALUE_PARAMETER_LIST:
       VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=t]
diff --git a/idea/testData/stubs/InnerClass.expected b/idea/testData/stubs/InnerClass.expected
index 86a94987f46..3e535cd3fd6 100644
--- a/idea/testData/stubs/InnerClass.expected
+++ b/idea/testData/stubs/InnerClass.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
     CLASS_BODY:
       CLASS:[fqName=A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]]
diff --git a/idea/testData/stubs/LocalClass.expected b/idea/testData/stubs/LocalClass.expected
index c11ef812f0b..71393d39bc9 100644
--- a/idea/testData/stubs/LocalClass.expected
+++ b/idea/testData/stubs/LocalClass.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
   CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]]
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
diff --git a/idea/testData/stubs/LocalClassInLocalFunction.expected b/idea/testData/stubs/LocalClassInLocalFunction.expected
index c11ef812f0b..71393d39bc9 100644
--- a/idea/testData/stubs/LocalClassInLocalFunction.expected
+++ b/idea/testData/stubs/LocalClassInLocalFunction.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
   CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]]
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
diff --git a/idea/testData/stubs/LocalNamedObject.expected b/idea/testData/stubs/LocalNamedObject.expected
index 9e4b218aaf7..cb70662e95b 100644
--- a/idea/testData/stubs/LocalNamedObject.expected
+++ b/idea/testData/stubs/LocalNamedObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
   CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]]
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
diff --git a/idea/testData/stubs/ManyAnnotationsOnFunction.expected b/idea/testData/stubs/ManyAnnotationsOnFunction.expected
index a8627a56594..53fae791e4e 100644
--- a/idea/testData/stubs/ManyAnnotationsOnFunction.expected
+++ b/idea/testData/stubs/ManyAnnotationsOnFunction.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
     MODIFIER_LIST:[]
       ANNOTATION:
diff --git a/idea/testData/stubs/MembersInLocalClass.expected b/idea/testData/stubs/MembersInLocalClass.expected
index cc7f2a1b4d8..01e90ede95d 100644
--- a/idea/testData/stubs/MembersInLocalClass.expected
+++ b/idea/testData/stubs/MembersInLocalClass.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=f]
     MODIFIER_LIST:[public]
     CLASS:[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=C, superNames=[]]
diff --git a/idea/testData/stubs/MembersInLocalObject.expected b/idea/testData/stubs/MembersInLocalObject.expected
index b6f3b209e86..927d9f80726 100644
--- a/idea/testData/stubs/MembersInLocalObject.expected
+++ b/idea/testData/stubs/MembersInLocalObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=f]
     VALUE_PARAMETER_LIST:
     OBJECT_DECLARATION:[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=foo, superNames=[]]
diff --git a/idea/testData/stubs/NamedObject.expected b/idea/testData/stubs/NamedObject.expected
index adde223b79f..c0cdd9b763c 100644
--- a/idea/testData/stubs/NamedObject.expected
+++ b/idea/testData/stubs/NamedObject.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
   CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]]
   OBJECT_DECLARATION:[fqName=Test, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Test, superNames=[A, T]]
diff --git a/idea/testData/stubs/NotStorePropertiesFrom.expected b/idea/testData/stubs/NotStorePropertiesFrom.expected
index 46a13c49509..593fa1a55b4 100644
--- a/idea/testData/stubs/NotStorePropertiesFrom.expected
+++ b/idea/testData/stubs/NotStorePropertiesFrom.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
diff --git a/idea/testData/stubs/NotStorePropertyFromDelegate.expected b/idea/testData/stubs/NotStorePropertyFromDelegate.expected
index 8a159479426..9ce1ac7c48f 100644
--- a/idea/testData/stubs/NotStorePropertyFromDelegate.expected
+++ b/idea/testData/stubs/NotStorePropertyFromDelegate.expected
@@ -1,3 +1,4 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=a, hasDelegate=true, hasDelegateExpression=true, hasInitializer=false, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=a]
diff --git a/idea/testData/stubs/NotStorePropertyFromInitializer.expected b/idea/testData/stubs/NotStorePropertyFromInitializer.expected
index a079f2494f4..bb910f73734 100644
--- a/idea/testData/stubs/NotStorePropertyFromInitializer.expected
+++ b/idea/testData/stubs/NotStorePropertyFromInitializer.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=some, hasBlockBody=false, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=some]
     TYPE_REFERENCE:
       USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/stubs/ObjectInInitializer.expected b/idea/testData/stubs/ObjectInInitializer.expected
index 58adfe152ee..6e8653365d2 100644
--- a/idea/testData/stubs/ObjectInInitializer.expected
+++ b/idea/testData/stubs/ObjectInInitializer.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=p, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=p]
     OBJECT_DECLARATION:[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]]
       CLASS_BODY:
diff --git a/idea/testData/stubs/ObjectInPropertyDelegate.expected b/idea/testData/stubs/ObjectInPropertyDelegate.expected
index 5a9b8aeee56..bc31ac06e24 100644
--- a/idea/testData/stubs/ObjectInPropertyDelegate.expected
+++ b/idea/testData/stubs/ObjectInPropertyDelegate.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=p, hasDelegate=true, hasDelegateExpression=true, hasInitializer=false, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=p]
     OBJECT_DECLARATION:[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]]
       CLASS_BODY:
diff --git a/idea/testData/stubs/PackageProperty.expected b/idea/testData/stubs/PackageProperty.expected
index a82c62080c4..168cf6b5984 100644
--- a/idea/testData/stubs/PackageProperty.expected
+++ b/idea/testData/stubs/PackageProperty.expected
@@ -3,4 +3,5 @@ PsiJetFileStubImpl[package=test.testing]
     DOT_QUALIFIED_EXPRESSION:
       REFERENCE_EXPRESSION:[referencedName=test]
       REFERENCE_EXPRESSION:[referencedName=testing]
+  IMPORT_LIST:
   PROPERTY:[fqName=test.testing.some, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=some]
diff --git a/idea/testData/stubs/ParametersWithFqName.expected b/idea/testData/stubs/ParametersWithFqName.expected
index 65ec13f9db0..dffadba6c46 100644
--- a/idea/testData/stubs/ParametersWithFqName.expected
+++ b/idea/testData/stubs/ParametersWithFqName.expected
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
diff --git a/idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.expected b/idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.expected
index 304c0ac4fd6..fedb725ed94 100644
--- a/idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.expected
+++ b/idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.expected
@@ -1,3 +1,4 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=c]
diff --git a/idea/testData/stubs/QualifiedAnnotationOnFunction.expected b/idea/testData/stubs/QualifiedAnnotationOnFunction.expected
index d5f84bafa24..d18ce973e44 100644
--- a/idea/testData/stubs/QualifiedAnnotationOnFunction.expected
+++ b/idea/testData/stubs/QualifiedAnnotationOnFunction.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo]
     MODIFIER_LIST:[]
       ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated]
diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected
index d47f36f9c59..278b03e45a1 100644
--- a/idea/testData/stubs/SecondaryConstructors.expected
+++ b/idea/testData/stubs/SecondaryConstructors.expected
@@ -1,6 +1,7 @@
 PsiJetFileStubImpl[package=test]
   PACKAGE_DIRECTIVE:
     REFERENCE_EXPRESSION:[referencedName=test]
+  IMPORT_LIST:
   CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
diff --git a/idea/testData/stubs/SimpleEnumBuild.expected b/idea/testData/stubs/SimpleEnumBuild.expected
index d35abc82e7a..bcbaa4fcd2d 100644
--- a/idea/testData/stubs/SimpleEnumBuild.expected
+++ b/idea/testData/stubs/SimpleEnumBuild.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]]
     MODIFIER_LIST:[enum]
     CLASS_BODY:
diff --git a/idea/testData/stubs/StarProjection.expected b/idea/testData/stubs/StarProjection.expected
index 986720ebd06..588f90d9652 100644
--- a/idea/testData/stubs/StarProjection.expected
+++ b/idea/testData/stubs/StarProjection.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   PROPERTY:[fqName=v, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=v]
     TYPE_REFERENCE:
       USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/stubs/TypeAnnotation.expected b/idea/testData/stubs/TypeAnnotation.expected
index 75be256ad60..ecf82fcfa4f 100644
--- a/idea/testData/stubs/TypeAnnotation.expected
+++ b/idea/testData/stubs/TypeAnnotation.expected
@@ -1,5 +1,6 @@
 PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
+  IMPORT_LIST:
   CLASS:[fqName=a, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=a, superNames=[]]
     MODIFIER_LIST:[annotation]
   CLASS:[fqName=b, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=b, superNames=[]]
diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
index bd21706542f..bcdaa72004a 100644
--- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
@@ -59,6 +59,18 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
         doTest(fileName);
     }
 
+    @TestMetadata("Comments.kt")
+    public void testComments() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/Comments.kt");
+        doTest(fileName);
+    }
+
+    @TestMetadata("CommentsNoPackageDirective.kt")
+    public void testCommentsNoPackageDirective() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/CommentsNoPackageDirective.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("ConflictingNameAppearsAndHasUsage1.kt")
     public void testConflictingNameAppearsAndHasUsage1() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ConflictingNameAppearsAndHasUsage1.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
index ffbea479fb9..ab09af4f8a9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
@@ -104,7 +104,6 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
             enableInspections(beforeFileName);
 
             doSingleTest(getTestName(false) + ".kt");
-            checkForUnexpectedActions();
             checkForUnexpectedErrors();
         }
         finally {
@@ -120,7 +119,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
 
     private static QuickFixTestCase myWrapper;
 
-    private static void doTestFor(final String testName, final QuickFixTestCase quickFixTestCase) {
+    private void doTestFor(final String testName, final QuickFixTestCase quickFixTestCase) {
         String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + KotlinPackage.decapitalize(testName);
         final String testFullPath = quickFixTestCase.getTestDataPath().replace(File.separatorChar, '/') + relativePath;
         final File testFile = new File(testFullPath);
@@ -132,20 +131,10 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
                     String contents = StringUtil.convertLineSeparators(FileUtil.loadFile(testFile, CharsetToolkit.UTF8_CHARSET));
                     quickFixTestCase.configureFromFileText(testFile.getName(), contents);
                     quickFixTestCase.bringRealEditorBack();
-                    Pair<String, Boolean> pair = quickFixTestCase.parseActionHintImpl(quickFixTestCase.getFile(), contents);
-                    String text = pair.getFirst();
-                    boolean actionShouldBeAvailable = pair.getSecond().booleanValue();
 
-                    quickFixTestCase.beforeActionStarted(testName, contents);
+                    checkForUnexpectedActions();
 
-                    try {
-                        myWrapper = quickFixTestCase;
-                        quickFixTestCase.doAction(text, actionShouldBeAvailable, testFullPath, testName);
-                    }
-                    finally {
-                        myWrapper = null;
-                        quickFixTestCase.afterActionCompleted(testName, contents);
-                    }
+                    applyAction(contents, quickFixTestCase, testName, testFullPath);
                 }
                 catch (FileComparisonFailure e) {
                     throw e;
@@ -158,6 +147,23 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
         }, "", "");
     }
 
+    private static void applyAction(String contents, QuickFixTestCase quickFixTestCase, String testName, String testFullPath) throws Exception {
+        Pair<String, Boolean> pair = quickFixTestCase.parseActionHintImpl(quickFixTestCase.getFile(), contents);
+        String text = pair.getFirst();
+        boolean actionShouldBeAvailable = pair.getSecond().booleanValue();
+
+        quickFixTestCase.beforeActionStarted(testName, contents);
+
+        try {
+            myWrapper = quickFixTestCase;
+            quickFixTestCase.doAction(text, actionShouldBeAvailable, testFullPath, testName);
+        }
+        finally {
+            myWrapper = null;
+            quickFixTestCase.afterActionCompleted(testName, contents);
+        }
+    }
+
     @Override
     protected void doAction(String text, boolean actionShouldBeAvailable, String testFullPath, String testName)
             throws Exception {