From 751747011241f0045af853d8633837c3b731c801 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 5 Jun 2012 15:26:40 +0400 Subject: [PATCH] Got rid of AnalyzerFacadeProvider.getAnalyzerFacadeForProject(). Usage in JetSourceNavigationHelper was converted to direct AnalyzerFacadeForJVM usage. --- .../jet/plugin/libraries/JetSourceNavigationHelper.java | 3 ++- .../jet/plugin/project/AnalyzerFacadeProvider.java | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index f89015e9dd7..f34ac402af9 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -38,6 +38,7 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -71,7 +72,7 @@ public class JetSourceNavigationHelper { } final Project project = declaration.getProject(); final List libraryFiles = findAllSourceFilesWhichContainIdentifier(declaration); - BindingContext bindingContext = AnalyzerFacadeProvider.getAnalyzerFacadeForProject().analyzeFiles( + BindingContext bindingContext = AnalyzerFacadeForJVM.INSTANCE.analyzeFiles( project, libraryFiles, Collections.emptyList(), diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java index 4d75740f9a2..ac03602fed1 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java @@ -70,10 +70,4 @@ public final class AnalyzerFacadeProvider { } return AnalyzerFacadeForJVM.INSTANCE; } - - //TODO should remove all calls to this method - @NotNull - public static AnalyzerFacade getAnalyzerFacadeForProject() { - return AnalyzerFacadeForJVM.INSTANCE; - } }