From 7c44938151d1c6892bd08c13393c1f85ad8c244d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 May 2014 18:03:02 +0400 Subject: [PATCH] Drop unused AnalyzerFacadeForEverything --- .../analyzer/AnalyzerFacadeForEverything.java | 62 ------------------- .../lang/resolve/BodiesResolveContext.java | 1 - .../resolve/CachedBodiesResolveContext.java | 5 -- .../lang/resolve/TopDownAnalysisContext.java | 9 +-- .../plugin/project/ResolveElementCache.java | 4 -- 5 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java deleted file mode 100644 index d0dee12b351..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2010-2013 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.analyzer; - -import com.google.common.base.Predicate; -import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.di.InjectorForBodyResolve; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.resolve.*; - -public class AnalyzerFacadeForEverything { - - private AnalyzerFacadeForEverything() { - } - - public static AnalyzeExhaust analyzeBodiesInFilesWithJavaIntegration( - Project project, Predicate filesToAnalyzeCompletely, - @NotNull BindingTrace traceContext, - @NotNull BodiesResolveContext bodiesResolveContext, - @NotNull ModuleDescriptor module - ) { - - TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create( - bodiesResolveContext.getStorageManager(), - bodiesResolveContext.getExceptionTracker(), - filesToAnalyzeCompletely, - false, - false - ); - - bodiesResolveContext.setTopDownAnalysisParameters(topDownAnalysisParameters); - - InjectorForBodyResolve injector = new InjectorForBodyResolve( - project, topDownAnalysisParameters, - new ObservableBindingTrace(traceContext), - module); - - try { - injector.getBodyResolver().resolveBodies(bodiesResolveContext); - return AnalyzeExhaust.success(traceContext.getBindingContext(), module); - } finally { - injector.destroy(); - } - } - -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java index 24542e9dbe0..0cfed7885b7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java @@ -63,7 +63,6 @@ public interface BodiesResolveContext extends GlobalContext { @NotNull TopDownAnalysisParameters getTopDownAnalysisParameters(); - void setTopDownAnalysisParameters(TopDownAnalysisParameters parameters); boolean completeAnalysisNeeded(@NotNull PsiElement element); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java index 3588d9d05ab..82018a00dd9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java @@ -121,11 +121,6 @@ public class CachedBodiesResolveContext implements BodiesResolveContext { return topDownAnalysisParameters; } - @Override - public void setTopDownAnalysisParameters(@NotNull TopDownAnalysisParameters parameters) { - topDownAnalysisParameters = parameters; - } - @Override public boolean completeAnalysisNeeded(@NotNull PsiElement element) { PsiFile containingFile = element.getContainingFile(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index 44fb218ced1..d250c4d33d3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -62,9 +62,9 @@ public class TopDownAnalysisContext implements BodiesResolveContext { private final Map scripts = Maps.newLinkedHashMap(); - private StringBuilder debugOutput; + private final TopDownAnalysisParameters topDownAnalysisParameters; - private TopDownAnalysisParameters topDownAnalysisParameters; + private StringBuilder debugOutput; public TopDownAnalysisContext(@NotNull TopDownAnalysisParameters topDownAnalysisParameters) { this.topDownAnalysisParameters = topDownAnalysisParameters; @@ -76,11 +76,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext { return topDownAnalysisParameters; } - @Override - public void setTopDownAnalysisParameters(TopDownAnalysisParameters topDownAnalysisParameters) { - this.topDownAnalysisParameters = topDownAnalysisParameters; - } - public void debug(Object message) { if (debugOutput != null) { debugOutput.append(message).append("\n"); diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 9481042d373..d408d9166da 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -537,10 +537,6 @@ public class ResolveElementCache { return topDownAnalysisParameters; } - @Override - public void setTopDownAnalysisParameters(TopDownAnalysisParameters parameters) { - } - @Override public boolean completeAnalysisNeeded(@NotNull PsiElement element) { return true;