From 16cad760602da74ea97f8c9e884183e68a15ad62 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 9 Jan 2013 16:36:26 +0400
Subject: [PATCH] Rearranged methods.

---
 .../libraries/JetSourceNavigationHelper.java  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
index e3c689f7186..bff3bd75fb0 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
@@ -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();
                 }
             }
         }