azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fix in JetNamedFunction

Browse Source 
This caused NullPointerException while running JetParsingTest when I changed some test.
This commit is contained in:
Wojciech Lopata
2013-02-27 17:40:26 +01:00
parent a3eae3d5c1
commit 6020fc216b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
+6 -2
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.psi.stubs.PsiJetFunctionStub; import org.jetbrains.jet.lang.psi.stubs.PsiJetFunctionStub;
import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import java.util.Collections; import java.util.Collections;
@@ -83,7 +84,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
/** /**
* Returns full qualified name for function "package_fqn.function_name" * 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 * @return
*/ */
@Nullable @Nullable
@@ -101,7 +102,10 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
} }
JetFile jetFile = (JetFile) parent; JetFile jetFile = (JetFile) parent;
final FqName fileFQN = JetPsiUtil.getFQName(jetFile); final FqName fileFQN = JetPsiUtil.getFQName(jetFile);
return fileFQN.child(getNameAsName()); Name nameAsName = getNameAsName();
if (nameAsName != null) {
return fileFQN.child(nameAsName);
}
} }
return null; return null;