From c669a06c97eeeb1f0bc2aead89c4b1cfeed0b69d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 18 Sep 2015 20:10:21 +0200 Subject: [PATCH] return null instead of asserting on declarations with null name (EA-69471 - assert: JetSourceNavigationHelper.convertPropertyOrFunction) --- .../decompiler/navigation/JetSourceNavigationHelper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java index dce5787a743..91a12941cac 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.DumbService; 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.*; public class JetSourceNavigationHelper { + private static final Logger LOG = Logger.getInstance(JetSourceNavigationHelper.class); + public enum NavigationKind { CLASS_FILES_TO_SOURCES, SOURCES_TO_CLASS_FILES @@ -162,7 +165,10 @@ public class JetSourceNavigationHelper { } 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); PsiElement decompiledContainer = declaration.getParent();