minor refactoring in JetParsing in order to reuse code

.idea/codeStyleSettings.xml

@@ -227,38 +227,7 @@
           </indentOptions>
         </codeStyleSettings>
         <codeStyleSettings language="jet">
-          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-          <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
           <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="5" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="5" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_WRAP" value="5" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="5" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="1" />
-          <option name="DOWHILE_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="1" />
-          <option name="FIELD_ANNOTATION_WRAP" value="0" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
         </codeStyleSettings>
       </value>

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

@@ -97,7 +97,7 @@ public class JetParsing extends AbstractJetParsing {
     void parseFile() {
         PsiBuilder.Marker fileMarker = mark();
 
-        parsePreamble();
+        parsePreamble(true);
 
         parseToplevelDeclarations(false);
 
@@ -107,22 +107,7 @@ public class JetParsing extends AbstractJetParsing {
     void parseScript() {
         PsiBuilder.Marker fileMarker = mark();
 
-        PsiBuilder.Marker namespaceHeader = mark();
+        parsePreamble(false);
-        PsiBuilder.Marker firstEntry = mark();
-        parseModifierList(MODIFIER_LIST, true);
-
-        if (at(PACKAGE_KEYWORD)) {
-            advance(); // PACKAGE_KEYWORD
-
-            parseNamespaceName();
-
-            firstEntry.drop();
-            consumeIf(SEMICOLON);
-        }
-        else {
-            firstEntry.rollbackTo();
-        }
-        namespaceHeader.done(NAMESPACE_HEADER);
 
         PsiBuilder.Marker scriptMarker = mark();
         parseImportDirectives();
@@ -155,7 +140,7 @@ public class JetParsing extends AbstractJetParsing {
      *  : namespaceHeader? import*
      *  ;
      */
-    private void parsePreamble() {
+    private void parsePreamble(boolean imports) {
         /*
          * namespaceHeader
          *   : modifiers "namespace" SimpleName{"."} SEMI?
@@ -187,7 +172,8 @@ public class JetParsing extends AbstractJetParsing {
         }
         namespaceHeader.done(NAMESPACE_HEADER);
 
-        parseImportDirectives();
+        if(imports)
+            parseImportDirectives();
     }
 
     /* SimpleName{"."} */