From 7716feee71163f9bab35754c54253d064e796005 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 31 Jan 2013 13:34:44 +0400
Subject: [PATCH] Fix NPE in JetPsiUtil (EA-43298)

---
 .../frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java  | 3 +--
 compiler/testData/diagnostics/tests/regressions/ea43298.kt   | 3 +++
 .../jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java  | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/regressions/ea43298.kt

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 6dbf6d625f3..64d66416c95 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -362,8 +362,7 @@ public class JetPsiUtil {
             aliasName = referenceExpression != null ? referenceExpression.getReferencedName() : null;
         }
 
-        //noinspection ConstantConditions
-        return !aliasName.isEmpty() ? Name.identifier(aliasName) : null;
+        return aliasName != null && !aliasName.isEmpty() ? Name.identifier(aliasName) : null;
     }
 
     @Nullable
diff --git a/compiler/testData/diagnostics/tests/regressions/ea43298.kt b/compiler/testData/diagnostics/tests/regressions/ea43298.kt
new file mode 100644
index 00000000000..7a68643cae8
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/regressions/ea43298.kt
@@ -0,0 +1,3 @@
+import A.<!SYNTAX!><!>;
+
+class A
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 6586b0479d4..e26e668826a 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3319,6 +3319,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/regressions/ea40964.kt");
             }
             
+            @TestMetadata("ea43298.kt")
+            public void testEa43298() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/regressions/ea43298.kt");
+            }
+            
             @TestMetadata("ErrorsOnIbjectExpressionsAsParameters.kt")
             public void testErrorsOnIbjectExpressionsAsParameters() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.kt");