From b767e1a8a614cefe3f8910fafde8141b1b4258dd Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 30 May 2012 17:09:46 +0400
Subject: [PATCH] Failure after typing empty import

---
 .../src/org/jetbrains/jet/lang/psi/JetPsiUtil.java         | 7 +++++--
 .../testData/diagnostics/tests/ProcessingEmptyImport.jet   | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/ProcessingEmptyImport.jet

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index be6f5a329ad..eb00fbb7780 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -17,14 +17,15 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.CheckUtil;
 import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.ImportPath;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -309,7 +310,9 @@ public class JetPsiUtil {
         if (aliasName == null) {
             aliasName = referenceExpression != null ? referenceExpression.getReferencedName() : null;
         }
-        return aliasName != null ? Name.identifier(aliasName) : null;
+
+        //noinspection ConstantConditions
+        return StringUtil.isNotEmpty(aliasName) ? Name.identifier(aliasName) : null;
     }
 
     @Nullable
diff --git a/compiler/testData/diagnostics/tests/ProcessingEmptyImport.jet b/compiler/testData/diagnostics/tests/ProcessingEmptyImport.jet
new file mode 100644
index 00000000000..3ed438400f7
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/ProcessingEmptyImport.jet
@@ -0,0 +1,3 @@
+import
+
+<!SYNTAX!><!>fun firstFun() {}
\ No newline at end of file