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

return null instead of asserting on declarations with null name (EA-69471 - assert: JetSourceNavigationHelper.convertPropertyOrFunction)

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-09-18 20:10:21 +02:00
parent 0febe3322b
commit c669a06c97
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
+7 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
@@ -76,6 +77,8 @@ import static org.jetbrains.kotlin.descriptors.DescriptorsPackage.ModuleParamete
import static org.jetbrains.kotlin.idea.decompiler.navigation.MemberMatching.*; import static org.jetbrains.kotlin.idea.decompiler.navigation.MemberMatching.*;
public class JetSourceNavigationHelper { public class JetSourceNavigationHelper {
private static final Logger LOG = Logger.getInstance(JetSourceNavigationHelper.class);
public enum NavigationKind { public enum NavigationKind {
CLASS_FILES_TO_SOURCES, CLASS_FILES_TO_SOURCES,
SOURCES_TO_CLASS_FILES SOURCES_TO_CLASS_FILES
@@ -162,7 +165,10 @@ public class JetSourceNavigationHelper {
} }
String memberNameAsString = declaration.getName(); String memberNameAsString = declaration.getName();
assert memberNameAsString != null; if (memberNameAsString == null) {
LOG.debug("JetSourceNavigationHelper.convertPropertyOrFunction(): null name for declaration " + declaration);
return null;
}
Name memberName = Name.identifier(memberNameAsString); Name memberName = Name.identifier(memberNameAsString);
PsiElement decompiledContainer = declaration.getParent(); PsiElement decompiledContainer = declaration.getParent();