From 1eb38baa28431c7816270e1e9e666d5d69b08ff5 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 4 Apr 2012 17:43:31 +0400 Subject: [PATCH] Introduce AnalyzerFacadeProvider --- .../project/AnalyzerFacadeProvider.java | 53 +++++++++++++++++++ .../project/WholeProjectAnalyzerFacade.java | 8 +-- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java new file mode 100644 index 00000000000..e1b1f54f8ea --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.java @@ -0,0 +1,53 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.plugin.project; + +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.analyzer.AnalyzerFacade; +import org.jetbrains.jet.analyzer.AnalyzerFacadeWithCache; +import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; + +/** + * @author Pavel Talanov + */ +public final class AnalyzerFacadeProvider { + + private AnalyzerFacadeProvider() { + } + + @NotNull + public static AnalyzerFacade getAnalyzerFacadeForFile(@NotNull JetFile file) { + return AnalyzerFacadeForJVM.INSTANCE; + } + + @NotNull + public static AnalyzerFacadeWithCache getAnalyzerFacadeWithCacheForFile(@NotNull JetFile file) { + return AnalyzerFacadeWithCache.getInstance(getAnalyzerFacadeForFile(file)); + } + + @NotNull + public static AnalyzerFacade getAnalyzerFacadeForProject(@NotNull Project project) { + return AnalyzerFacadeForJVM.INSTANCE; + } + + @NotNull + public static AnalyzerFacadeWithCache getAnalyzerFacadeWithCacheForProject(@NotNull Project project) { + return AnalyzerFacadeWithCache.getInstance(getAnalyzerFacadeForProject(project)); + } +} diff --git a/idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java b/idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java index 88d478585c1..51288c1ad41 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java +++ b/idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java @@ -21,7 +21,6 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; /** @@ -35,14 +34,15 @@ public final class WholeProjectAnalyzerFacade { private WholeProjectAnalyzerFacade() { } - @NotNull public static AnalyzeExhaust analyzeProjectWithCacheOnAFile(@NotNull JetFile file) { - return AnalyzerFacadeForJVM.analyzeFileWithCache(file, JetFilesProvider.getInstance(file.getProject()).sampleToAllFilesInModule()); + return AnalyzerFacadeProvider.getAnalyzerFacadeWithCacheForFile(file) + .analyzeFileWithCache(file, JetFilesProvider.getInstance(file.getProject()).sampleToAllFilesInModule()); } @NotNull public static AnalyzeExhaust analyzeProjectWithCache(@NotNull Project project, @NotNull GlobalSearchScope scope) { - return AnalyzerFacadeForJVM.analyzeProjectWithCache(project, JetFilesProvider.getInstance(project).allInScope(scope)); + return AnalyzerFacadeProvider.getAnalyzerFacadeWithCacheForProject(project) + .analyzeProjectWithCache(project, JetFilesProvider.getInstance(project).allInScope(scope)); } }