Box qualified names of package directives into dot-qualified expressions

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

@@ -185,6 +185,8 @@ public class JetParsing extends AbstractJetParsing {
 
     /* SimpleName{"."} */
     private void parsePackageName() {
+        PsiBuilder.Marker qualifiedExpression = mark();
+        boolean simpleName = true;
         while (true) {
             if (myBuilder.newlineBeforeCurrentToken()) {
                 errorWithRecovery("Package name must be a '.'-separated identifier list placed on a single line", PACKAGE_NAME_RECOVERY_SET);
@@ -199,13 +201,21 @@ public class JetParsing extends AbstractJetParsing {
                 nsName.drop();
             }
 
+            if (!simpleName) {
+                PsiBuilder.Marker precedingMarker = qualifiedExpression.precede();
+                qualifiedExpression.done(DOT_QUALIFIED_EXPRESSION);
+                qualifiedExpression = precedingMarker;
+            }
+
             if (at(DOT)) {
+                simpleName = false;
                 advance(); // DOT
             }
             else {
                 break;
             }
         }
+        qualifiedExpression.drop();
     }
 
     /*

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java

@@ -18,13 +18,15 @@ package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.JetNodeTypes;
+import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.name.SpecialNames;
 
+import java.util.Collections;
 import java.util.List;
 
 public class JetPackageDirective extends JetReferenceExpression {
@@ -34,17 +36,36 @@ public class JetPackageDirective extends JetReferenceExpression {
         super(node);
     }
 
+    // This should be either JetSimpleNameExpression, or JetDotQualifiedExpression
+    @Nullable
+    public JetExpression getPackageNameExpression() {
+        return findChildByClass(JetExpression.class);
+    }
+
     @NotNull
     public List<JetSimpleNameExpression> getPackageNames() {
-        return findChildrenByType(JetNodeTypes.REFERENCE_EXPRESSION);
+        JetExpression nameExpression = getPackageNameExpression();
+        if (nameExpression == null) return Collections.emptyList();
+
+        List<JetSimpleNameExpression> packageNames = ContainerUtil.newArrayList();
+        while (nameExpression instanceof JetQualifiedExpression) {
+            JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) nameExpression;
+            packageNames.add((JetSimpleNameExpression) qualifiedExpression.getSelectorExpression());
+            nameExpression = qualifiedExpression.getReceiverExpression();
+        }
+        packageNames.add((JetSimpleNameExpression) nameExpression);
+        Collections.reverse(packageNames);
+
+        return packageNames;
     }
 
     @Nullable
     public PsiElement getNameIdentifier() {
-        JetSimpleNameExpression lastPart = (JetSimpleNameExpression)findLastChildByType(JetNodeTypes.REFERENCE_EXPRESSION);
+        JetExpression nameExpression = getPackageNameExpression();
-        if (lastPart == null) {
+        if (nameExpression == null) return null;
-            return null;
+
-        }
+        JetSimpleNameExpression lastPart = (JetSimpleNameExpression)PsiUtilPackage.getQualifiedElementSelector(nameExpression);
+        if (lastPart == null) return null;
 
         return lastPart.getIdentifier();
     }
@@ -89,15 +110,13 @@ public class JetPackageDirective extends JetReferenceExpression {
     @NotNull
     private String getQualifiedNameOf(@Nullable JetSimpleNameExpression nameExpression) {
         StringBuilder builder = new StringBuilder();
-        for (JetSimpleNameExpression e : findChildrenByClass(JetSimpleNameExpression.class)) {
+        for (JetSimpleNameExpression e : getPackageNames()) {
             if (builder.length() > 0) {
                 builder.append(".");
             }
             builder.append(e.getReferencedName());
 
-            if (e == nameExpression) {
+            if (e == nameExpression) break;
-                break;
-            }
         }
         return builder.toString();
     }

compiler/testData/psi/Attributes.txt

@@ -2,14 +2,16 @@ JetFile: Attributes.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Attributes_ERR.txt

@@ -2,14 +2,16 @@ JetFile: Attributes_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Imports.txt

@@ -2,14 +2,16 @@ JetFile: Imports.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   IMPORT_LIST
     IMPORT_DIRECTIVE

compiler/testData/psi/Imports_ERR.txt

@@ -2,14 +2,16 @@ JetFile: Imports_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   IMPORT_LIST
     IMPORT_DIRECTIVE

compiler/testData/psi/LongPackageName.kt

@@ -0,0 +1 @@
+package foo.bar.baz.buzz

compiler/testData/psi/LongPackageName.txt

@@ -0,0 +1,18 @@
+JetFile: LongPackageName.kt
+  PACKAGE_DIRECTIVE
+    PsiElement(package)('package')
+    PsiWhiteSpace(' ')
+    DOT_QUALIFIED_EXPRESSION
+      DOT_QUALIFIED_EXPRESSION
+        DOT_QUALIFIED_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('foo')
+          PsiElement(DOT)('.')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('baz')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('buzz')

compiler/testData/psi/RootPackage.txt

@@ -2,11 +2,12 @@ JetFile: RootPackage.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      REFERENCE_EXPRESSION
-    PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('foo')
-    REFERENCE_EXPRESSION
+      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('bar')
     PsiElement(SEMICOLON)(';')
   PsiWhiteSpace('\n\n')
   CLASS

compiler/testData/psi/SimpleModifiers.txt

@@ -2,14 +2,16 @@ JetFile: SimpleModifiers.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST

compiler/testData/psi/SoftKeywords.txt

@@ -2,14 +2,16 @@ JetFile: SoftKeywords.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   IMPORT_LIST
     IMPORT_DIRECTIVE

compiler/testData/psi/TypeDef.txt

@@ -2,14 +2,16 @@ JetFile: TypeDef.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
+    DOT_QUALIFIED_EXPRESSION
-      PsiElement(IDENTIFIER)('foo')
+      DOT_QUALIFIED_EXPRESSION
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('foo')
-      PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
-    PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
-    REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(IDENTIFIER)('goo')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('goo')
   PsiWhiteSpace('\n\n')
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/recovery/PackageNewLineRecovery.kt

@@ -0,0 +1,2 @@
+package foo.bar.baz.buzz.
+test val a = 12

compiler/testData/psi/recovery/PackageNewLineRecovery.txt

@@ -0,0 +1,39 @@
+JetFile: PackageNewLineRecovery.kt
+  PACKAGE_DIRECTIVE
+    PsiElement(package)('package')
+    PsiWhiteSpace(' ')
+    DOT_QUALIFIED_EXPRESSION
+      DOT_QUALIFIED_EXPRESSION
+        DOT_QUALIFIED_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('foo')
+          PsiElement(DOT)('.')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('baz')
+      PsiElement(DOT)('.')
+      REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('buzz')
+    PsiElement(DOT)('.')
+    PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
+      <empty list>
+  PsiWhiteSpace('\n')
+  PROPERTY
+    MODIFIER_LIST
+      ANNOTATION_ENTRY
+        CONSTRUCTOR_CALLEE
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('test')
+    PsiWhiteSpace(' ')
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('a')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    INTEGER_CONSTANT
+      PsiElement(INTEGER_LITERAL)('12')

compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java

@@ -257,6 +257,11 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         doParsingTest("compiler/testData/psi/LocalDeclarations.kt");
     }
     
+    @TestMetadata("LongPackageName.kt")
+    public void testLongPackageName() throws Exception {
+        doParsingTest("compiler/testData/psi/LongPackageName.kt");
+    }
+    
     @TestMetadata("ModifierAsSelector.kt")
     public void testModifierAsSelector() throws Exception {
         doParsingTest("compiler/testData/psi/ModifierAsSelector.kt");
@@ -898,6 +903,11 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt");
         }
         
+        @TestMetadata("PackageNewLineRecovery.kt")
+        public void testPackageNewLineRecovery() throws Exception {
+            doParsingTest("compiler/testData/psi/recovery/PackageNewLineRecovery.kt");
+        }
+        
         @TestMetadata("PackageRecovery.kt")
         public void testPackageRecovery() throws Exception {
             doParsingTest("compiler/testData/psi/recovery/PackageRecovery.kt");