Minor fix in JetNamedFunction

This caused NullPointerException while running JetParsingTest when I changed some test.
JetBrains · Feb 27, 2013 · 6020fc2 · 6020fc2
1 parent a3eae3d
commit 6020fc2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
@@ -29,6 +29,7 @@
 import org.jetbrains.jet.lang.psi.stubs.PsiJetFunctionStub;
 import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lexer.JetTokens;
 
 import java.util.Collections;
@@ -83,7 +84,7 @@ public JetExpression getInitializer() {
 
     /**
     * Returns full qualified name for function "package_fqn.function_name"
-    * Not null for top level functions.
+    * Not null for top level functions unless syntax errors are present.
     * @return
     */
     @Nullable
@@ -101,7 +102,10 @@ public FqName getFqName() {
             }
             JetFile jetFile = (JetFile) parent;
             final FqName fileFQN = JetPsiUtil.getFQName(jetFile);
-            return fileFQN.child(getNameAsName());
+            Name nameAsName = getNameAsName();
+            if (nameAsName != null) {
+                return fileFQN.child(nameAsName);
+            }
         }
 
         return null;