JetNamespaceHeader → JetPackageDirective.

compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java

@@ -146,7 +146,7 @@ public interface JetNodeTypes {
     JetNodeType WHEN_CONDITION_IS_PATTERN = new JetNodeType("WHEN_CONDITION_IS_PATTERN", JetWhenConditionIsPattern.class);
     JetNodeType WHEN_CONDITION_EXPRESSION = new JetNodeType("WHEN_CONDITION_WITH_EXPRESSION", JetWhenConditionWithExpression.class);
 
-    JetNodeType NAMESPACE_HEADER = new JetNodeType("NAMESPACE_HEADER", JetNamespaceHeader.class);
+    JetNodeType PACKAGE_DIRECTIVE = new JetNodeType("PACKAGE_DIRECTIVE", JetPackageDirective.class);
     JetNodeType SCRIPT = new JetNodeType("SCRIPT", JetScript.class);
 
     IFileElementType TYPE_CODE_FRAGMENT = new JetTypeCodeFragmentType();

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java

@@ -204,7 +204,7 @@ public class PositioningStrategies {
             }
             else if (element instanceof JetFile) {
                 JetFile file = (JetFile) element;
-                PsiElement nameIdentifier = file.getNamespaceHeader().getNameIdentifier();
+                PsiElement nameIdentifier = file.getPackageDirective().getNameIdentifier();
                 if (nameIdentifier != null) {
                     return markElement(nameIdentifier);
                 }

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

@@ -46,7 +46,7 @@ public class JetParsing extends AbstractJetParsing {
     private static final TokenSet CLASS_NAME_RECOVERY_SET = TokenSet.orSet(TokenSet.create(LT, LPAR, COLON, LBRACE), TOPLEVEL_OBJECT_FIRST);
     private static final TokenSet TYPE_PARAMETER_GT_RECOVERY_SET = TokenSet.create(WHERE_KEYWORD, LPAR, COLON, LBRACE, GT);
     private static final TokenSet PARAMETER_NAME_RECOVERY_SET = TokenSet.create(COLON, EQ, COMMA, RPAR);
-    private static final TokenSet NAMESPACE_NAME_RECOVERY_SET = TokenSet.create(DOT, EOL_OR_SEMICOLON);
+    private static final TokenSet PACKAGE_NAME_RECOVERY_SET = TokenSet.create(DOT, EOL_OR_SEMICOLON);
     private static final TokenSet IMPORT_RECOVERY_SET = TokenSet.create(AS_KEYWORD, DOT, EOL_OR_SEMICOLON);
     /*package*/ static final TokenSet TYPE_REF_FIRST = TokenSet.create(LBRACKET, IDENTIFIER, FUN_KEYWORD, LPAR, CAPITALIZED_THIS_KEYWORD, HASH);
     private static final TokenSet RECEIVER_TYPE_TERMINATORS = TokenSet.create(DOT, SAFE_ACCESS);
@@ -144,16 +144,16 @@ public class JetParsing extends AbstractJetParsing {
 
     /*
      *preamble
-     *  : namespaceHeader? import*
+     *  : packageDirective? import*
      *  ;
      */
     private void parsePreamble(boolean imports) {
         /*
-         * namespaceHeader
+         * packageDirective
-         *   : modifiers "namespace" SimpleName{"."} SEMI?
+         *   : modifiers "package" SimpleName{"."} SEMI?
          *   ;
          */
-        PsiBuilder.Marker namespaceHeader = mark();
+        PsiBuilder.Marker packageDirective = mark();
         PsiBuilder.Marker firstEntry = mark();
         parseModifierList(MODIFIER_LIST, true);
 
@@ -161,12 +161,12 @@ public class JetParsing extends AbstractJetParsing {
             advance(); // PACKAGE_KEYWORD
 
 
-            parseNamespaceName();
+            parsePackageName();
 
             if (at(LBRACE)) {
-                // Because it's blocked namespace and it will be parsed as one of top level objects
+                // Because it's blocked package and it will be parsed as one of top level objects
                 firstEntry.rollbackTo();
-                namespaceHeader.done(NAMESPACE_HEADER);
+                packageDirective.done(PACKAGE_DIRECTIVE);
                 return;
             }
 
@@ -177,22 +177,22 @@ public class JetParsing extends AbstractJetParsing {
         else {
             firstEntry.rollbackTo();
         }
-        namespaceHeader.done(NAMESPACE_HEADER);
+        packageDirective.done(PACKAGE_DIRECTIVE);
 
         if(imports)
             parseImportDirectives();
     }
 
     /* SimpleName{"."} */
-    private void parseNamespaceName() {
+    private void parsePackageName() {
         while (true) {
             if (myBuilder.newlineBeforeCurrentToken()) {
-                errorWithRecovery("Package name must be a '.'-separated identifier list placed on a single line", NAMESPACE_NAME_RECOVERY_SET);
+                errorWithRecovery("Package name must be a '.'-separated identifier list placed on a single line", PACKAGE_NAME_RECOVERY_SET);
                 break;
             }
 
             PsiBuilder.Marker nsName = mark();
-            if (expect(IDENTIFIER, "Package name must be a '.'-separated identifier list", NAMESPACE_NAME_RECOVERY_SET)) {
+            if (expect(IDENTIFIER, "Package name must be a '.'-separated identifier list", PACKAGE_NAME_RECOVERY_SET)) {
                 nsName.done(REFERENCE_EXPRESSION);
             }
             else {
@@ -297,7 +297,7 @@ public class JetParsing extends AbstractJetParsing {
 
     /*
      * toplevelObject
-     *   : namespace
+     *   : package
      *   : class
      *   : extension
      *   : function
@@ -315,7 +315,7 @@ public class JetParsing extends AbstractJetParsing {
         IElementType keywordToken = tt();
         IElementType declType = null;
 //        if (keywordToken == PACKAGE_KEYWORD) {
-//            declType = parseNamespaceBlock();
+//            declType = parsePackageBlock();
 //        }
 //        else
         if (keywordToken == CLASS_KEYWORD || keywordToken == TRAIT_KEYWORD) {
@@ -1481,7 +1481,7 @@ public class JetParsing extends AbstractJetParsing {
 
     /*
      * userType
-     *   : ("namespace" ".")? simpleUserType{"."}
+     *   : ("package" ".")? simpleUserType{"."}
      *   ;
      */
     void parseUserType() {

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

@@ -210,7 +210,7 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
         }
         PsiFile file = getContainingFile();
         if (!(file instanceof JetFile)) return null;
-        String fileQualifiedName = ((JetFile) file).getNamespaceHeader().getQualifiedName();
+        String fileQualifiedName = ((JetFile) file).getPackageDirective().getQualifiedName();
         if (!fileQualifiedName.isEmpty()) {
             parts.add(fileQualifiedName);
         }

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

@@ -89,11 +89,11 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
         return null;
     }
 
-    // scripts has no namespace header
+    // scripts have no package directive
     @Nullable
-    public JetNamespaceHeader getNamespaceHeader() {
+    public JetPackageDirective getPackageDirective() {
-        ASTNode ast = getNode().findChildByType(JetNodeTypes.NAMESPACE_HEADER);
+        ASTNode ast = getNode().findChildByType(JetNodeTypes.PACKAGE_DIRECTIVE);
-        return ast != null ? (JetNamespaceHeader) ast.getPsi() : null;
+        return ast != null ? (JetPackageDirective) ast.getPsi() : null;
     }
 
     @Nullable
@@ -103,8 +103,8 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
             return stub.getPackageName();
         }
 
-        JetNamespaceHeader statement = getNamespaceHeader();
+        JetPackageDirective directive = getPackageDirective();
-        return statement != null ? statement.getQualifiedName() : null;
+        return directive != null ? directive.getQualifiedName() : null;
     }
 
     @Nullable

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

@@ -97,7 +97,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
         PsiElement parent = getParent();
         if (parent instanceof JetFile) {
             // fqname is different in scripts
-            if (((JetFile) parent).getNamespaceHeader() == null) {
+            if (((JetFile) parent).getPackageDirective() == null) {
                 return null;
             }
             JetFile jetFile = (JetFile) parent;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,15 +27,15 @@ import org.jetbrains.jet.lang.resolve.name.SpecialNames;
 
 import java.util.List;
 
-public class JetNamespaceHeader extends JetReferenceExpression {
+public class JetPackageDirective extends JetReferenceExpression {
     private String qualifiedNameCache = null;
 
-    public JetNamespaceHeader(@NotNull ASTNode node) {
+    public JetPackageDirective(@NotNull ASTNode node) {
         super(node);
     }
 
     @NotNull
-    public List<JetSimpleNameExpression> getNamespaceNames() {
+    public List<JetSimpleNameExpression> getPackageNames() {
         return findChildrenByType(JetNodeTypes.REFERENCE_EXPRESSION);
     }
 

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

@@ -187,8 +187,8 @@ public class JetPsiUtil {
 
     @NotNull
     public static FqName getFQName(@NotNull JetFile file) {
-        JetNamespaceHeader header = file.getNamespaceHeader();
+        JetPackageDirective directive = file.getPackageDirective();
-        return header != null ? header.getFqName() : FqName.ROOT;
+        return directive != null ? directive.getFqName() : FqName.ROOT;
     }
 
     @Nullable
@@ -908,14 +908,15 @@ public class JetPsiUtil {
     }
 
     public static NavigatablePsiElement getPackageReference(@NotNull JetFile file, int partIndex) {
-        JetNamespaceHeader header = file.getNamespaceHeader();
+        JetPackageDirective directive = file.getPackageDirective();
-        if (header == null) {
+        if (directive == null) {
-            throw new IllegalArgumentException("Should be called only for files with namespace: " + file);
+            throw new IllegalArgumentException("Should be called only for files with package directive: " + file);
         }
 
-        List<JetSimpleNameExpression> names = header.getNamespaceNames();
+        List<JetSimpleNameExpression> names = directive.getPackageNames();
         if (!(0 <= partIndex && partIndex < names.size())) {
-            throw new IndexOutOfBoundsException(String.format("%s index for file with header %s is out of range", partIndex, header.getText()));
+            throw new IndexOutOfBoundsException(String.format("%s index for file with directive %s is out of range", partIndex,
+                                                              directive.getText()));
         }
 
         return names.get(partIndex);
@@ -1002,7 +1003,7 @@ public class JetPsiUtil {
     @Nullable
     public static String getPackageName(@NotNull JetElement element) {
         JetFile file = (JetFile) element.getContainingFile();
-        JetNamespaceHeader header = PsiTreeUtil.findChildOfType(file, JetNamespaceHeader.class);
+        JetPackageDirective header = PsiTreeUtil.findChildOfType(file, JetPackageDirective.class);
 
         return header != null ? header.getQualifiedName() : null;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java

@@ -91,7 +91,7 @@ public class DeclarationResolver {
 
 
     public void process(@NotNull JetScope rootScope) {
-        checkModifiersAndAnnotationsInNamespaceHeaders();
+        checkModifiersAndAnnotationsInPackageDirectives();
         resolveAnnotationConstructors();
         resolveConstructorHeaders();
         resolveAnnotationStubsOnClassesAndConstructors();
@@ -102,12 +102,12 @@ public class DeclarationResolver {
         checkRedeclarationsInInnerClassNames();
     }
 
-    private void checkModifiersAndAnnotationsInNamespaceHeaders() {
+    private void checkModifiersAndAnnotationsInPackageDirectives() {
         for (JetFile file : context.getPackageFragments().keySet()) {
-            JetNamespaceHeader namespaceHeader = file.getNamespaceHeader();
+            JetPackageDirective packageDirective = file.getPackageDirective();
-            if (namespaceHeader == null) continue;
+            if (packageDirective == null) continue;
 
-            PsiElement firstChild = namespaceHeader.getFirstChild();
+            PsiElement firstChild = packageDirective.getFirstChild();
             if (!(firstChild instanceof JetModifierList)) continue;
             JetModifierList modifierList = (JetModifierList) firstChild;
 
@@ -373,7 +373,7 @@ public class DeclarationResolver {
                 @Override
                 public PsiElement apply(@Nullable JetFile file) {
                     assert file != null : "File is null for aPackage " + aPackage;
-                    return file.getNamespaceHeader().getNameIdentifier();
+                    return file.getPackageDirective().getNameIdentifier();
                 }
             });
         }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java

@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
+import org.jetbrains.jet.lang.psi.JetPackageDirective;
 import org.jetbrains.jet.lang.psi.JetScript;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -119,8 +119,8 @@ public class ScriptHeaderResolver {
 
     public void processScriptHierarchy(@NotNull JetScript script, @NotNull JetScope outerScope) {
         JetFile file = (JetFile) script.getContainingFile();
-        JetNamespaceHeader namespaceHeader = file.getNamespaceHeader();
+        JetPackageDirective packageDirective = file.getPackageDirective();
-        FqName fqName = namespaceHeader != null ? new FqName(namespaceHeader.getQualifiedName()) : FqName.ROOT;
+        FqName fqName = packageDirective != null ? new FqName(packageDirective.getQualifiedName()) : FqName.ROOT;
         PackageFragmentDescriptor ns = packageFragmentProvider.getOrCreateFragment(fqName);
 
         Integer priority = script.getUserData(PRIORITY_KEY);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java

@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
+import org.jetbrains.jet.lang.psi.JetPackageDirective;
 
 public class ScriptNameUtil {
     private ScriptNameUtil() {
@@ -40,9 +40,9 @@ public class ScriptNameUtil {
                 name = name.substring(0,index);
         }
         name = Character.toUpperCase(name.charAt(0)) + (name.length() == 0 ? "" : name.substring(1));
-        JetNamespaceHeader header = file.getNamespaceHeader();
+        JetPackageDirective directive = file.getPackageDirective();
-        if(header != null && header.getName().length() > 0) {
+        if(directive != null && directive.getName().length() > 0) {
-            name = header.getName().replace('.','/') + "/" + name;
+            name = directive.getName().replace('.','/') + "/" + name;
         }
         return name;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java

@@ -541,13 +541,13 @@ public class TypeHierarchyResolver {
 
         @NotNull
         private MutablePackageFragmentDescriptor getOrCreatePackageFragmentForFile(@NotNull JetFile file) {
-            JetNamespaceHeader namespaceHeader = file.getNamespaceHeader();
+            JetPackageDirective packageDirective = file.getPackageDirective();
-            assert namespaceHeader != null : "scripts are not supported";
+            assert packageDirective != null : "scripts are not supported";
 
-            MutablePackageFragmentDescriptor fragment = packageFragmentProvider.getOrCreateFragment(namespaceHeader.getFqName());
+            MutablePackageFragmentDescriptor fragment = packageFragmentProvider.getOrCreateFragment(packageDirective.getFqName());
 
-            for (JetSimpleNameExpression nameExpression : namespaceHeader.getNamespaceNames()) {
+            for (JetSimpleNameExpression nameExpression : packageDirective.getPackageNames()) {
-                FqName fqName = namespaceHeader.getFqName(nameExpression);
+                FqName fqName = packageDirective.getFqName(nameExpression);
 
                 PackageViewDescriptor packageView = packageFragmentProvider.getModule().getPackage(fqName);
                 assert packageView != null : "package not found: " + fqName;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -110,12 +110,12 @@ public class ScopeProvider {
 
     @NotNull
     private PackageViewDescriptor getFilePackageDescriptor(JetFile file) {
-        JetNamespaceHeader header = file.getNamespaceHeader();
+        JetPackageDirective directive = file.getPackageDirective();
-        if (header == null) {
+        if (directive == null) {
             throw new IllegalArgumentException("Scripts are not supported: " + file.getName());
         }
 
-        FqName fqName = new FqName(header.getQualifiedName());
+        FqName fqName = new FqName(directive.getQualifiedName());
         PackageViewDescriptor packageDescriptor = resolveSession.getModuleDescriptor().getPackage(fqName);
 
         if (packageDescriptor == null) {

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java

@@ -61,8 +61,8 @@ public abstract class JetClassOrObjectInfo<E extends JetClassOrObject> implement
         PsiFile file = element.getContainingFile();
         if (file instanceof JetFile) {
             JetFile jetFile = (JetFile) file;
-            JetNamespaceHeader header = jetFile.getNamespaceHeader();
+            JetPackageDirective directive = jetFile.getPackageDirective();
-            return header != null ? header.getFqName() : FqName.ROOT;
+            return directive != null ? directive.getFqName() : FqName.ROOT;
         }
         throw new IllegalArgumentException("Not in a JetFile: " + element);
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java

@@ -27,7 +27,7 @@ import jet.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
+import org.jetbrains.jet.lang.psi.JetPackageDirective;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -83,12 +83,12 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF
     private static Index computeFilesByPackage(@NotNull Collection<JetFile> files) {
         Index index = new Index();
         for (JetFile file : files) {
-            JetNamespaceHeader header = file.getNamespaceHeader();
+            JetPackageDirective directive = file.getPackageDirective();
-            if (header == null) {
+            if (directive == null) {
                 throw new IllegalArgumentException("Scripts are not supported");
             }
 
-            FqName packageFqName = new FqName(header.getQualifiedName());
+            FqName packageFqName = new FqName(directive.getQualifiedName());
             addMeAndParentPackages(index, packageFqName);
             index.filesByPackage.put(packageFqName, file);
         }

compiler/testData/psi/AnnotatedExpressions.txt

@@ -1,5 +1,5 @@
 JetFile: AnnotatedExpressions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/AnonymousInitializer.txt

@@ -1,5 +1,5 @@
 JetFile: AnonymousInitializer.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/AssertNotNull.txt

@@ -1,5 +1,5 @@
 JetFile: AssertNotNull.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Attributes.txt

@@ -1,5 +1,5 @@
 JetFile: Attributes.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/AttributesOnPatterns.txt

@@ -1,5 +1,5 @@
 JetFile: AttributesOnPatterns.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Attributes_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Attributes_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BabySteps.txt

@@ -1,5 +1,5 @@
 JetFile: BabySteps.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BabySteps_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: BabySteps_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile1.kt
   PsiComment(BLOCK_COMMENT)('/*')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile2.kt
   PsiComment(BLOCK_COMMENT)('/*\n/*')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile3.kt
   PsiComment(BLOCK_COMMENT)('/*\n\nfooo')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile4.kt
   PsiComment(BLOCK_COMMENT)('/*\n\n/*foo*/\n\nasdfas')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/ByClauses.txt

@@ -1,5 +1,5 @@
 JetFile: ByClauses.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/CallWithManyClosures.txt

@@ -1,5 +1,5 @@
 JetFile: CallWithManyClosures.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/CallsInWhen.txt

@@ -1,5 +1,5 @@
 JetFile: CallsInWhen.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Constructors.txt

@@ -1,5 +1,5 @@
 JetFile: Constructors.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/ControlStructures.txt

@@ -1,5 +1,5 @@
 JetFile: ControlStructures.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/DoubleColon.txt

@@ -1,5 +1,5 @@
 JetFile: DoubleColon.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EOLsInComments.txt

@@ -1,5 +1,5 @@
 JetFile: EOLsInComments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EOLsOnRollback.txt

@@ -1,5 +1,5 @@
 JetFile: EOLsOnRollback.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EmptyFile.txt

@@ -1,3 +1,3 @@
 JetFile: EmptyFile.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/Enums.txt

@@ -1,5 +1,5 @@
 JetFile: Enums.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Expressions_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Expressions_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ExtensionsWithQNReceiver.txt

@@ -1,5 +1,5 @@
 JetFile: ExtensionsWithQNReceiver.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/FileStart_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FileStart_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(DIV)('/')

compiler/testData/psi/FloatingPointLiteral.txt

@@ -1,5 +1,5 @@
 JetFile: FloatingPointLiteral.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ForWithMultiDecl.txt

@@ -1,5 +1,5 @@
 JetFile: ForWithMultiDecl.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionCalls.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionCalls.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionLiterals.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionLiterals.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionLiterals_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionLiterals_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionNoParameterList.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionNoParameterList.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/FunctionTypes.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionTypes.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/FunctionTypes_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionTypes_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/Functions.txt

@@ -1,5 +1,5 @@
 JetFile: Functions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Functions_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Functions_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/HangOnLonelyModifier.txt

@@ -1,5 +1,5 @@
 JetFile: HangOnLonelyModifier.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/IfWithPropery.txt

@@ -1,5 +1,5 @@
 JetFile: IfWithPropery.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ImportSoftKW.txt

@@ -1,5 +1,5 @@
 JetFile: ImportSoftKW.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
     IMPORT_DIRECTIVE

compiler/testData/psi/Imports.txt

@@ -1,5 +1,5 @@
 JetFile: Imports.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/Imports_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Imports_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/Inner.txt

@@ -1,5 +1,5 @@
 JetFile: Inner.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/IntegerLiteral.txt

@@ -1,5 +1,5 @@
 JetFile: IntegerLiteral.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/Labels.txt

@@ -1,5 +1,5 @@
 JetFile: Labels.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/LocalDeclarations.txt

@@ -1,5 +1,5 @@
 JetFile: LocalDeclarations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ModifierAsSelector.txt

@@ -1,7 +1,7 @@
 JetFile: ModifierAsSelector.kt
   PsiComment(EOL_COMMENT)('// JET-1')
   PsiWhiteSpace('\n\n')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/MultiVariableDeclarations.txt

@@ -1,5 +1,5 @@
 JetFile: MultiVariableDeclarations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NamespaceBlockFirst.txt

@@ -1,5 +1,5 @@
 JetFile: NamespaceBlockFirst.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')

compiler/testData/psi/NamespaceModifiers.txt

@@ -1,5 +1,5 @@
 JetFile: NamespaceModifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     MODIFIER_LIST
       PsiElement(public)('public')
       PsiWhiteSpace(' ')

compiler/testData/psi/NestedComments.txt

@@ -1,5 +1,5 @@
 JetFile: NestedComments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NewLinesValidOperations.txt

@@ -1,5 +1,5 @@
 JetFile: NewLinesValidOperations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NewlinesInParentheses.txt

@@ -1,5 +1,5 @@
 JetFile: NewlinesInParentheses.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NotIsAndNotIn.txt

@@ -1,5 +1,5 @@
 JetFile: NotIsAndNotIn.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ObjectLiteralAsStatement.txt

@@ -1,5 +1,5 @@
 JetFile: ObjectLiteralAsStatement.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ParameterNameMising.txt

@@ -1,5 +1,5 @@
 JetFile: ParameterNameMising.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Precedence.txt

@@ -1,5 +1,5 @@
 JetFile: Precedence.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: PrimaryConstructorModifiers_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Properties.txt

@@ -1,5 +1,5 @@
 JetFile: Properties.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/PropertiesFollowedByInitializers.txt

@@ -1,5 +1,5 @@
 JetFile: PropertiesFollowedByInitializers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/Properties_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Properties_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(var)('var')

compiler/testData/psi/QuotedIdentifiers.txt

@@ -1,5 +1,5 @@
 JetFile: QuotedIdentifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     MODIFIER_LIST

compiler/testData/psi/RootNamespace.txt

@@ -1,5 +1,5 @@
 JetFile: RootNamespace.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SemicolonAfterIf.txt

@@ -1,5 +1,5 @@
 JetFile: SemicolonAfterIf.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ShortAnnotations.txt

@@ -1,5 +1,5 @@
 JetFile: ShortAnnotations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     MODIFIER_LIST
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE

compiler/testData/psi/SimpleClassMembers.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleClassMembers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/SimpleClassMembers_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleClassMembers_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/SimpleExpressions.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleExpressions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/SimpleModifiers.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleModifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SoftKeywords.txt

@@ -1,5 +1,5 @@
 JetFile: SoftKeywords.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SoftKeywordsInTypeArguments.txt

@@ -1,5 +1,5 @@
 JetFile: SoftKeywordsInTypeArguments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/StringTemplates.txt

@@ -1,5 +1,5 @@
 JetFile: StringTemplates.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Super.txt

@@ -1,7 +1,7 @@
 JetFile: Super.kt
   PsiComment(EOL_COMMENT)('// KT-156 Fix the this<Super> syntax')
   PsiWhiteSpace('\n')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ThisType.txt

@@ -1,5 +1,5 @@
 JetFile: ThisType.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TryRecovery.txt

@@ -1,5 +1,5 @@
 JetFile: TryRecovery.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/TypeAnnotations.txt

@@ -1,5 +1,5 @@
 JetFile: TypeAnnotations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TypeConstraints.txt

@@ -1,5 +1,5 @@
 JetFile: TypeConstraints.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TypeDef.txt

@@ -1,5 +1,5 @@
 JetFile: TypeDef.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/TypeDef_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: TypeDef_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: TypeExpressionAmbiguities_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/TypeParametersBeforeName.txt

@@ -1,5 +1,5 @@
 JetFile: TypeParametersBeforeName.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/When.txt

@@ -1,5 +1,5 @@
 JetFile: When.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/When_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: When_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/AnonymousObjects.txt

@@ -1,5 +1,5 @@
 JetFile: AnonymousObjects.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/BinaryTree.txt

@@ -1,5 +1,5 @@
 JetFile: BinaryTree.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/BitArith.txt

@@ -1,5 +1,5 @@
 JetFile: BitArith.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/Builder.txt

@@ -1,5 +1,5 @@
 JetFile: Builder.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')