From 3412febe59ff54c6e2268a2eb36a6853c3d67088 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 17 Jul 2015 16:06:17 +0300 Subject: [PATCH] Minor: better message in assertion --- .../caches/resolve/IDELightClassGenerationSupport.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index d88993b8072..41347685827 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -238,8 +238,8 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport @NotNull JetClassOrObject decompiledClassOrObject, @NotNull PsiClass rootLightClassForDecompiledFile ) { - List relativeClassNameSegments = getClassRelativeName(decompiledClassOrObject).pathSegments(); - Iterator iterator = relativeClassNameSegments.iterator(); + FqName relativeFqName = getClassRelativeName(decompiledClassOrObject); + Iterator iterator = relativeFqName.pathSegments().iterator(); Name base = iterator.next(); assert rootLightClassForDecompiledFile.getName().equals(base.asString()) : "Light class for file:\n" + decompiledClassOrObject.getContainingJetFile().getVirtualFile().getCanonicalPath() @@ -248,7 +248,8 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport while (iterator.hasNext()) { Name name = iterator.next(); PsiClass innerClass = current.findInnerClassByName(name.asString(), false); - assert innerClass != null : "Inner class should be found"; + assert innerClass != null : "Could not find corresponding inner/nested class " + relativeFqName + "in class " + decompiledClassOrObject.getName() + "\n" + + "File: " + decompiledClassOrObject.getContainingJetFile().getVirtualFile().getName(); current = innerClass; } return current;