fixed testSeveralClassesOnOneLine

2026-09-27 06:05:01 +07:00 · 2015-05-18 17:25:32 +03:00
parent ed2ac12ceb
commit f20cfaa31e
1 changed files with 13 additions and 2 deletions
@@ -530,8 +530,19 @@ public class PositionManagerImpl implements PositionManager, MultiRequestPositio
                return null;
              }
              final int line = Math.min(finalRangeBegin + 1, finalRangeEnd);
-              final SourcePosition candidatePosition = positionLine == line? position : SourcePosition.createFromLine(position.getFile(), line);
-              return classToFind.equals(JVMNameUtil.getClassAt(candidatePosition)) ? fromClass : null;
+              Set<PsiClass> lineClasses = getLineClasses(position.getFile(), line);
+              if (lineClasses.size() > 1) {
+                // if there's more than one class on the line - try to match by name
+                for (PsiClass aClass : lineClasses) {
+                  if (classToFind.equals(aClass)) {
+                    return fromClass;
+                  }
+                }
+              }
+              else if (!lineClasses.isEmpty()){
+                return classToFind.equals(lineClasses.iterator().next())? fromClass : null;
+              }
+              return null;
            }
          });
        }