diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index 60dfe2cc317..92c6dbbff0e 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -203,7 +203,7 @@ public class JetSourceNavigationHelper { Collection candidates; if (decompiledContainer instanceof JetFile) { - candidates = getInitialCandidates(decompiledDeclaration, navigationStrategy); + candidates = getInitialTopLevelCandidates(decompiledDeclaration, navigationStrategy); } else if (decompiledContainer instanceof JetClassBody) { JetClassOrObject decompiledClassOrObject = (JetClassOrObject) decompiledContainer.getParent(); @@ -211,7 +211,8 @@ public class JetSourceNavigationHelper { candidates = sourceClassOrObject == null ? Collections.emptyList() - : getInitialCandidates(sourceClassOrObject, memberName, navigationStrategy.getDeclarationClass()); + : getInitialMemberCandidates(sourceClassOrObject, memberName, + navigationStrategy.getDeclarationClass()); if (candidates.isEmpty()) { if (decompiledDeclaration instanceof JetProperty && sourceClassOrObject instanceof JetClass) { @@ -286,7 +287,7 @@ public class JetSourceNavigationHelper { } @NotNull - private static Collection getInitialCandidates( + private static Collection getInitialTopLevelCandidates( @NotNull Decl decompiledDeclaration, @NotNull NavigationStrategy navigationStrategy ) { @@ -302,7 +303,7 @@ public class JetSourceNavigationHelper { } @NotNull - private static List getInitialCandidates( + private static List getInitialMemberCandidates( @NotNull JetClassOrObject sourceClassOrObject, @NotNull final Name name, @NotNull Class declarationClass