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 + +fun firstFun() {} \ No newline at end of file