From d9c98c95374f67c18957a5f34cc7a4a5cea59a9b Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 18 Jul 2017 14:29:43 +0200
Subject: [PATCH] try to find containing class by range in navigation
 (IDEA-175907)

---
 .../intellij/byteCodeViewer/ByteCodeViewerManager.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
index aa203e0b2dda..c8baa768ca80 100644
--- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
+++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.presentation.java.SymbolPresentationUtil;
@@ -212,6 +213,15 @@ public class ByteCodeViewerManager extends DockablePopupManager<ByteCodeViewerCo
       if (containingFile instanceof PsiClassOwner) {
         PsiClass[] classes = ((PsiClassOwner)containingFile).getClasses();
         if (classes.length == 1) return classes[0];
+
+        TextRange textRange = psiElement.getTextRange();
+        if (textRange != null) {
+          for (PsiClass aClass : classes) {
+            PsiElement navigationElement = aClass.getNavigationElement();
+            TextRange classRange = navigationElement != null ? navigationElement.getTextRange() : null;
+            if (classRange != null && classRange.contains(textRange)) return aClass;
+          }
+        }
       }
       return null;
     }