azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better method names.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-10 19:04:41 +04:00
parent 04c83b25d4
commit e37f11ae53
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+5 -4
View File
@@ -203,7 +203,7 @@ public class JetSourceNavigationHelper {
Collection<Decl> candidates; Collection<Decl> candidates;
if (decompiledContainer instanceof JetFile) { if (decompiledContainer instanceof JetFile) {
candidates = getInitialCandidates(decompiledDeclaration, navigationStrategy); candidates = getInitialTopLevelCandidates(decompiledDeclaration, navigationStrategy);
} }
else if (decompiledContainer instanceof JetClassBody) { else if (decompiledContainer instanceof JetClassBody) {
JetClassOrObject decompiledClassOrObject = (JetClassOrObject) decompiledContainer.getParent(); JetClassOrObject decompiledClassOrObject = (JetClassOrObject) decompiledContainer.getParent();
@@ -211,7 +211,8 @@ public class JetSourceNavigationHelper {
candidates = sourceClassOrObject == null candidates = sourceClassOrObject == null
? Collections.<Decl>emptyList() ? Collections.<Decl>emptyList()
: getInitialCandidates(sourceClassOrObject, memberName, navigationStrategy.getDeclarationClass()); : getInitialMemberCandidates(sourceClassOrObject, memberName,
navigationStrategy.getDeclarationClass());
if (candidates.isEmpty()) { if (candidates.isEmpty()) {
if (decompiledDeclaration instanceof JetProperty && sourceClassOrObject instanceof JetClass) { if (decompiledDeclaration instanceof JetProperty && sourceClassOrObject instanceof JetClass) {
@@ -286,7 +287,7 @@ public class JetSourceNavigationHelper {
} }
@NotNull @NotNull
private static <Decl extends JetNamedDeclaration, Descr extends CallableDescriptor> Collection<Decl> getInitialCandidates( private static <Decl extends JetNamedDeclaration, Descr extends CallableDescriptor> Collection<Decl> getInitialTopLevelCandidates(
@NotNull Decl decompiledDeclaration, @NotNull Decl decompiledDeclaration,
@NotNull NavigationStrategy<Decl, Descr> navigationStrategy @NotNull NavigationStrategy<Decl, Descr> navigationStrategy
) { ) {
@@ -302,7 +303,7 @@ public class JetSourceNavigationHelper {
} }
@NotNull @NotNull
private static <Decl extends JetNamedDeclaration> List<Decl> getInitialCandidates( private static <Decl extends JetNamedDeclaration> List<Decl> getInitialMemberCandidates(
@NotNull JetClassOrObject sourceClassOrObject, @NotNull JetClassOrObject sourceClassOrObject,
@NotNull final Name name, @NotNull final Name name,
@NotNull Class<Decl> declarationClass @NotNull Class<Decl> declarationClass