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

Rearranged methods.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-09 16:36:26 +04:00
parent 5609d2506d
commit 16cad76060
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+10 -16
View File
@@ -85,7 +85,14 @@ public class JetSourceNavigationHelper {
}
@NotNull
private static GlobalSearchScope createLibrarySourcesScopeForFile(@NotNull VirtualFile libraryFile, @NotNull Project project) {
private static GlobalSearchScope createLibrarySourcesScope(@NotNull JetNamedDeclaration decompiledDeclaration) {
JetFile containingFile = (JetFile) decompiledDeclaration.getContainingFile();
VirtualFile libraryFile = containingFile.getVirtualFile();
if (libraryFile == null) {
return GlobalSearchScope.EMPTY_SCOPE;
}
Project project = decompiledDeclaration.getProject();
ProjectFileIndex projectFileIndex = ProjectFileIndex.SERVICE.getInstance(project);
GlobalSearchScope resultScope = GlobalSearchScope.EMPTY_SCOPE;
@@ -97,14 +104,6 @@ public class JetSourceNavigationHelper {
return resultScope;
}
@NotNull
private static GlobalSearchScope createLibrarySourcesScope(@NotNull JetNamedDeclaration decompiledDeclaration) {
JetFile containingFile = (JetFile) decompiledDeclaration.getContainingFile();
VirtualFile libraryFile = containingFile.getVirtualFile();
Project project = decompiledDeclaration.getProject();
return libraryFile == null ? GlobalSearchScope.EMPTY_SCOPE : createLibrarySourcesScopeForFile(libraryFile, project);
}
private static List<JetFile> getContainingFiles(@NotNull Iterable<? extends JetNamedDeclaration> declarations) {
Set<JetFile> result = Sets.newHashSet();
for (JetNamedDeclaration declaration : declarations) {
@@ -167,11 +166,6 @@ public class JetSourceNavigationHelper {
return getTypeShortName(a).equals(getTypeShortName(b));
}
@Nullable
private static <Decl extends JetNamedDeclaration> Decl getUnambiguousCandidate(@NotNull Collection<Decl> candidates) {
return candidates.isEmpty() ? null : candidates.iterator().next();
}
@Nullable
private static JetNamedDeclaration findSpecialProperty(@NotNull Name memberName, @NotNull JetClass containingClass) {
// property constructor parameters
@@ -232,14 +226,14 @@ public class JetSourceNavigationHelper {
candidates = filterByReceiverPresenceAndParametersCount(decompiledDeclaration, navigationStrategy, candidates);
if (candidates.size() <= 1) {
return getUnambiguousCandidate(candidates);
return candidates.isEmpty() ? null : candidates.iterator().next();
}
if (!haveRenamesInImports(getContainingFiles(candidates))) {
candidates = filterByReceiverAndParameterTypes(decompiledDeclaration, navigationStrategy, candidates);
if (candidates.size() <= 1) {
return getUnambiguousCandidate(candidates);
return candidates.isEmpty() ? null : candidates.iterator().next();
}
}
}