Script refactoring, parser: wrap statements in script as if they are init blocks of a class

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

@@ -1181,13 +1181,21 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
      *   : SEMI* statement{SEMI+} SEMI*
      */
     public void parseStatements() {
+        parseStatements(false);
+    }
+
+    /*
+         * expressions
+         *   : SEMI* statement{SEMI+} SEMI*
+         */
+    public void parseStatements(boolean isScriptTopLevel) {
         while (at(SEMICOLON)) advance(); // SEMICOLON
         while (!eof() && !at(RBRACE)) {
             if (!atSet(STATEMENT_FIRST)) {
                 errorAndAdvance("Expecting an element");
             }
             if (atSet(STATEMENT_FIRST)) {
-                parseStatement();
+                parseStatement(isScriptTopLevel);
             }
             if (at(SEMICOLON)) {
                 while (at(SEMICOLON)) advance(); // SEMICOLON
@@ -1214,11 +1222,16 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
      *  : declaration
      *  ;
      */
-    private void parseStatement() {
+    private void parseStatement(boolean isScriptTopLevel) {
         if (!parseLocalDeclaration()) {
             if (!atSet(EXPRESSION_FIRST)) {
                 errorAndAdvance("Expecting a statement");
             }
+            else if (isScriptTopLevel){
+                PsiBuilder.Marker scriptInitializer = mark();
+                parseExpression();
+                scriptInitializer.done(ANONYMOUS_INITIALIZER);
+            }
             else {
                 parseExpression();
             }

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

@@ -160,7 +160,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
 
         PsiBuilder.Marker blockMarker = mark();
 
-        myExpressionParsing.parseStatements();
+        myExpressionParsing.parseStatements(/*isScriptTopLevel = */true);
 
         checkForUnexpectedSymbols();
 

compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassInitializer.java

@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.KtTokens;
@@ -59,4 +60,15 @@ public class KtClassInitializer extends KtDeclarationStub<KotlinPlaceHolderStub<
     public PsiElement getInitKeyword() {
         return findChildByType(KtTokens.INIT_KEYWORD);
     }
+
+    @NotNull
+    public KtDeclaration getContainingDeclaration() {
+        KtClassOrObject classOrObject = PsiTreeUtil.getParentOfType(this, KtClassOrObject.class, true);
+        if (classOrObject != null) {
+            return classOrObject;
+        }
+        KtScript type = PsiTreeUtil.getParentOfType(this, KtScript.class, true);
+        assert type != null : "Should only be present in class, object or script";
+        return type;
+    }
 }

compiler/testData/psi/script/ComplexScript.txt

@@ -58,6 +58,7 @@ JetFile: ComplexScript.kts
           PsiWhiteSpace('\n')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n')
+      ANONYMOUS_INITIALIZER
         IF
           PsiElement(if)('if')
           PsiWhiteSpace(' ')
@@ -97,6 +98,7 @@ JetFile: ComplexScript.kts
               PsiWhiteSpace('\n')
               PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n')
+      ANONYMOUS_INITIALIZER
         FOR
           PsiElement(for)('for')
           PsiWhiteSpace(' ')

compiler/testData/psi/script/Shebang.txt

@@ -7,6 +7,7 @@ JetFile: Shebang.kts
   PsiWhiteSpace('\n\n')
   SCRIPT
     BLOCK
+      ANONYMOUS_INITIALIZER
         CALL_EXPRESSION
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('println')

compiler/testData/psi/script/ShebangIncorrect.txt

@@ -5,6 +5,7 @@ JetFile: ShebangIncorrect.kts
     <empty list>
   SCRIPT
     BLOCK
+      ANONYMOUS_INITIALIZER
         CALL_EXPRESSION
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('println')
@@ -18,6 +19,7 @@ JetFile: ShebangIncorrect.kts
       PsiWhiteSpace(' ')
       PsiErrorElement:Expecting an element
         PsiElement(HASH)('#')
+      ANONYMOUS_INITIALIZER
         BINARY_EXPRESSION
           PREFIX_EXPRESSION
             OPERATION_REFERENCE

compiler/testData/psi/script/SimpleScript.txt

@@ -5,6 +5,7 @@ JetFile: SimpleScript.kts
     <empty list>
   SCRIPT
     BLOCK
+      ANONYMOUS_INITIALIZER
         CALL_EXPRESSION
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('println')

compiler/testData/psi/script/unexpectedSymbol.txt

@@ -5,6 +5,7 @@ JetFile: unexpectedSymbol.kts
     <empty list>
   SCRIPT
     BLOCK
+      ANONYMOUS_INITIALIZER
         CALL_EXPRESSION
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('println')

compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java

@@ -41,6 +41,12 @@ public abstract class AbstractParsingTest extends ParsingTestCase {
         System.setProperty("idea.platform.prefix", "Idea");
     }
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        getProject().registerService(KotlinScriptDefinitionProvider.class);
+    }
+
     @Override
     protected String getTestDataPath() {
         return KotlinTestUtils.getHomeDirectory();