From da0901053c069544e3ef4dc0c3ddc9a1dd77e636 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <Andrey.Breslav@jetbrains.com>
Date: Mon, 13 Dec 2010 20:40:38 +0300
Subject: [PATCH] Namespace keyword under the root node

---
 idea/idea.iml                                           | 2 +-
 idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java | 2 +-
 idea/testData/psi/BabySteps.txt                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea.iml b/idea/idea.iml
index f96c303d044..45711e25b08 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 90.SNAPSHOT" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IDEA IC-99.18" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
index 2240ce35c61..97267c34727 100644
--- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
@@ -45,9 +45,9 @@ public class JetParsing {
     @Nullable
     private PsiBuilder.Marker parsePreamble() {
         if (at(NAMESPACE_KEYWORD)) {
+            PsiBuilder.Marker namespaceMarker = mark();
             advance();
 
-            PsiBuilder.Marker namespaceMarker = mark();
             parseQualifiedName();
             return namespaceMarker;
         }
diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt
index ec0c6b7a60b..3f26d9550d0 100644
--- a/idea/testData/psi/BabySteps.txt
+++ b/idea/testData/psi/BabySteps.txt
@@ -1,7 +1,7 @@
 JetFile: BabySteps.jet
-  PsiElement(NAMESPACE_KEYWORD)('namespace')
-  PsiWhiteSpace(' ')
   NAMESPACE
+    PsiElement(NAMESPACE_KEYWORD)('namespace')
+    PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     PsiWhiteSpace('\n\n')
     CLASS