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

Fix NPE because of nullable local name

Browse Source
This commit is contained in:
Nikolay Krasko
2012-02-22 19:28:51 +04:00
parent 19a67c8edf
commit 21b3be0ef0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+7 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.SmartList; import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.JetTypeMapper; import org.jetbrains.jet.codegen.JetTypeMapper;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmAbi;
@@ -122,6 +123,7 @@ public class JavaElementFinder extends PsiElementFinder {
} }
} }
@Nullable
private static String getLocalName(JetDeclaration declaration) { private static String getLocalName(JetDeclaration declaration) {
String given = declaration.getName(); String given = declaration.getName();
if (given != null) return given; if (given != null) return given;
@@ -129,6 +131,7 @@ public class JavaElementFinder extends PsiElementFinder {
if (declaration instanceof JetObjectDeclaration) { if (declaration instanceof JetObjectDeclaration) {
return JetTypeMapper.getLocalNameForObject((JetObjectDeclaration) declaration); return JetTypeMapper.getLocalNameForObject((JetObjectDeclaration) declaration);
} }
return null; return null;
} }
@@ -194,7 +197,10 @@ public class JavaElementFinder extends PsiElementFinder {
answer.add(new JetLightClass(psiManager, file, QualifiedNamesUtil.combine(packageFQN, JvmAbi.PACKAGE_CLASS))); answer.add(new JetLightClass(psiManager, file, QualifiedNamesUtil.combine(packageFQN, JvmAbi.PACKAGE_CLASS)));
for (JetDeclaration declaration : file.getDeclarations()) { for (JetDeclaration declaration : file.getDeclarations()) {
if (declaration instanceof JetClassOrObject) { if (declaration instanceof JetClassOrObject) {
answer.add(new JetLightClass(psiManager, file, QualifiedNamesUtil.combine(packageFQN, getLocalName(declaration)))); String localName = getLocalName(declaration);
if (localName != null) {
answer.add(new JetLightClass(psiManager, file, QualifiedNamesUtil.combine(packageFQN, localName)));
}
} }
} }
} }