parse imports in scripts

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -107,6 +107,9 @@ public class JetParsing extends AbstractJetParsing {
     void parseScript() {
         PsiBuilder.Marker fileMarker = mark();
         PsiBuilder.Marker scriptMarker = mark();
+
+        parseImportDirectives();
+
         PsiBuilder.Marker blockMarker = mark();
 
         myExpressionParsing.parseStatements();
@@ -167,10 +170,7 @@ public class JetParsing extends AbstractJetParsing {
         }
         namespaceHeader.done(NAMESPACE_HEADER);
 
-        // TODO: Duplicate with parsing imports in parseToplevelDeclarations
+        parseImportDirectives();
-        while (at(IMPORT_KEYWORD)) {
-            parseImportDirective();
-        }
     }
 
     /* SimpleName{"."} */
@@ -248,6 +248,13 @@ public class JetParsing extends AbstractJetParsing {
         importDirective.done(IMPORT_DIRECTIVE);
     }
 
+    private void parseImportDirectives() {
+        // TODO: Duplicate with parsing imports in parseToplevelDeclarations
+        while (at(IMPORT_KEYWORD)) {
+            parseImportDirective();
+        }
+    }
+
     private void handleUselessRename() {
         if (at(AS_KEYWORD)) {
             PsiBuilder.Marker as = mark();

compiler/testData/psi/script/Import.ktscript

@@ -0,0 +1,4 @@
+import aaa.bbb.Ccc
+import ddd.*
+
+fun foo() = 1

compiler/testData/psi/script/Import.txt

@@ -0,0 +1,37 @@
+JetFile: Import.ktscript
+  SCRIPT
+    IMPORT_DIRECTIVE
+      PsiElement(import)('import')
+      PsiWhiteSpace(' ')
+      DOT_QUALIFIED_EXPRESSION
+        DOT_QUALIFIED_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('aaa')
+          PsiElement(DOT)('.')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('bbb')
+        PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('Ccc')
+    PsiWhiteSpace('\n')
+    IMPORT_DIRECTIVE
+      PsiElement(import)('import')
+      PsiWhiteSpace(' ')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('ddd')
+      PsiElement(DOT)('.')
+      PsiElement(MUL)('*')
+    PsiWhiteSpace('\n\n')
+    BLOCK
+      FUN
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
+        INTEGER_CONSTANT
+          PsiElement(INTEGER_LITERAL)('1')