From 77261330b996282ddf725086f41a8fcb4403f0f1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 28 Mar 2014 23:36:40 +0400 Subject: [PATCH] Only use script parameters from definition Passing parameters of a _single_ script into TopDownAnalyser makes no sense --- .../compiler/KotlinToJVMBytecodeCompiler.java | 10 ++++- .../jet/cli/jvm/repl/ReplInterpreter.java | 4 +- .../resolve/java/AnalyzerFacadeForJVM.java | 37 ++++++------------- .../jet/analyzer/AnalyzerFacade.java | 4 -- .../analyzer/AnalyzerFacadeForEverything.java | 8 ++-- .../lang/resolve/ScriptHeaderResolver.java | 1 - .../lang/resolve/ScriptParameterResolver.java | 7 +--- .../resolve/TopDownAnalysisParameters.java | 13 +------ .../jet/lang/resolve/TopDownAnalyzer.java | 3 +- .../lazy/descriptors/LazyScriptDescriptor.kt | 3 +- compiler/testData/script/fib.kt | 10 ----- .../tests/org/jetbrains/jet/JetTestUtils.java | 3 +- .../tests/org/jetbrains/jet/ScriptTest.java | 7 ---- .../checkers/AbstractJetDiagnosticsTest.java | 4 +- .../jet/checkers/CheckerTestUtilTest.java | 3 +- .../jet/codegen/CodegenTestFiles.java | 25 +++++++------ .../jet/codegen/CodegenTestUtil.java | 1 - .../jet/codegen/GenerationUtils.java | 5 +-- .../jvm/compiler/AbstractLoadJavaTest.java | 3 +- ...ompileKotlinAgainstCustomBinariesTest.java | 7 +--- .../jet/jvm/compiler/LoadDescriptorUtil.java | 3 +- .../resolve/lazy/LazyResolveTestUtil.java | 7 +--- .../jet/renderer/DescriptorRendererTest.java | 4 +- .../jet/resolve/ExpectedResolveData.java | 4 +- .../calls/AbstractResolvedCallsTest.kt | 2 +- .../AbstractConstraintSystemTest.kt | 2 +- .../JetDefaultModalityModifiersTest.java | 6 +-- .../resolve/JvmDeclarationsCacheProvider.java | 4 -- .../project/AnalyzerFacadeWithCache.java | 2 - .../project/JSAnalyzerFacadeForIDEA.java | 4 -- .../plugin/project/ResolveElementCache.java | 3 +- .../quickfix/MigrateSureInProjectFix.java | 4 -- .../references/BuiltInsReferenceResolver.java | 2 +- .../AbstractDiagnosticMessageTest.java | 4 +- .../k2js/analyze/AnalyzerFacadeForJS.java | 5 +-- 35 files changed, 65 insertions(+), 149 deletions(-) delete mode 100644 compiler/testData/script/fib.kt diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index e1e34b6e01a..6bd6ca275e1 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -41,7 +41,10 @@ import org.jetbrains.jet.codegen.state.Progress; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; +import org.jetbrains.jet.lang.parsing.JetScriptDefinition; +import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -221,6 +224,12 @@ public class KotlinToJVMBytecodeCompiler { @Nullable public static Class compileScript(@NotNull KotlinPaths paths, @NotNull JetCoreEnvironment environment) { + List scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS); + if (!scriptParameters.isEmpty()) { + JetScriptDefinitionProvider.getInstance(environment.getProject()).addScriptDefinition( + new JetScriptDefinition(".kts", scriptParameters) + ); + } GenerationState state = analyzeAndGenerate(environment); if (state == null) { return null; @@ -272,7 +281,6 @@ public class KotlinToJVMBytecodeCompiler { environment.getProject(), environment.getSourceFiles(), sharedTrace, - environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS), Predicates.alwaysTrue(), false, sharedModule, diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index ef54201a6fc..6d1b86ac974 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -108,8 +108,8 @@ public class ReplInterpreter { new ExceptionTracker(), // dummy Predicates.alwaysTrue(), false, - true, - Collections.emptyList()); + true + ); injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, MemberFilter.ALWAYS_TRUE); topDownAnalysisContext = new TopDownAnalysisContext(topDownAnalysisParameters); module.addFragmentProvider(SOURCES, injector.getTopDownAnalyzer().getPackageFragmentProvider()); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index ac93445ea7e..7c532e2d9bb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -64,24 +64,22 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { public AnalyzeExhaust analyzeFiles( @NotNull Project project, @NotNull Collection files, - @NotNull List scriptParameters, @NotNull Predicate filesToAnalyzeCompletely ) { - return analyzeFilesWithJavaIntegration(project, files, scriptParameters, filesToAnalyzeCompletely, true); + return analyzeFilesWithJavaIntegration(project, files, filesToAnalyzeCompletely, true); } @NotNull @Override public AnalyzeExhaust analyzeBodiesInFiles( @NotNull Project project, - @NotNull List scriptParameters, @NotNull Predicate filesForBodiesResolve, @NotNull BindingTrace headersTraceContext, @NotNull BodiesResolveContext bodiesResolveContext, @NotNull ModuleDescriptor module ) { return AnalyzerFacadeForEverything.analyzeBodiesInFilesWithJavaIntegration( - project, scriptParameters, filesForBodiesResolve, + project, filesForBodiesResolve, headersTraceContext, bodiesResolveContext, module); } @@ -122,12 +120,10 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } @NotNull - public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors( - JetFile file, List scriptParameters - ) { + public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors(JetFile file) { AnalyzingUtils.checkForSyntacticErrors(file); - AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file, scriptParameters); + AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -135,10 +131,8 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } @NotNull - public static AnalyzeExhaust analyzeOneFileWithJavaIntegration( - JetFile file, List scriptParameters - ) { - return analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), scriptParameters, + public static AnalyzeExhaust analyzeOneFileWithJavaIntegration(JetFile file) { + return analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), Predicates.alwaysTrue()); } @@ -146,7 +140,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { public static AnalyzeExhaust analyzeFilesWithJavaIntegrationAndCheckForErrors( Project project, Collection files, - List scriptParameters, Predicate filesToAnalyzeCompletely ) { for (JetFile file : files) { @@ -154,7 +147,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, false); + project, files, filesToAnalyzeCompletely, false); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -165,24 +158,22 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { public static AnalyzeExhaust analyzeFilesWithJavaIntegration( Project project, Collection files, - List scriptParameters, Predicate filesToAnalyzeCompletely ) { return analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, false); + project, files, filesToAnalyzeCompletely, false); } @NotNull public static AnalyzeExhaust analyzeFilesWithJavaIntegration( Project project, Collection files, - List scriptParameters, Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve ) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); - return analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, scriptParameters, filesToAnalyzeCompletely, + return analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, storeContextForBodiesResolve); } @@ -191,11 +182,10 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Project project, Collection files, BindingTrace trace, - List scriptParameters, Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve ) { - return analyzeFilesWithJavaIntegration(project, files, trace, scriptParameters, filesToAnalyzeCompletely, + return analyzeFilesWithJavaIntegration(project, files, trace, filesToAnalyzeCompletely, storeContextForBodiesResolve, createJavaModule(""), MemberFilter.ALWAYS_TRUE); } @@ -204,14 +194,13 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Project project, Collection files, BindingTrace trace, - List scriptParameters, Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve, ModuleDescriptorImpl module, MemberFilter memberFilter ) { GlobalContext globalContext = ContextPackage.GlobalContext(); - return analyzeFilesWithJavaIntegrationInGlobalContext(project, files, trace, scriptParameters, filesToAnalyzeCompletely, + return analyzeFilesWithJavaIntegrationInGlobalContext(project, files, trace, filesToAnalyzeCompletely, storeContextForBodiesResolve, module, globalContext, memberFilter); } @@ -220,7 +209,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Project project, Collection files, BindingTrace trace, - List scriptParameters, Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve, ModuleDescriptorImpl module, @@ -232,8 +220,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { globalContext.getExceptionTracker(), filesToAnalyzeCompletely, false, - false, - scriptParameters + false ); InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java index 732f6239a3b..b48320ed171 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java @@ -22,13 +22,11 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BodiesResolveContext; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import java.util.Collection; -import java.util.List; public interface AnalyzerFacade { @@ -36,14 +34,12 @@ public interface AnalyzerFacade { AnalyzeExhaust analyzeFiles( @NotNull Project project, @NotNull Collection files, - @NotNull List scriptParameters, @NotNull Predicate filesToAnalyzeCompletely ); @NotNull AnalyzeExhaust analyzeBodiesInFiles( @NotNull Project project, - @NotNull List scriptParameters, @NotNull Predicate filesForBodiesResolve, @NotNull BindingTrace traceContext, @NotNull BodiesResolveContext bodiesResolveContext, diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java index d14fe2dc213..ba9f84aef8a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacadeForEverything.java @@ -32,18 +32,18 @@ public class AnalyzerFacadeForEverything { } public static AnalyzeExhaust analyzeBodiesInFilesWithJavaIntegration( - Project project, List scriptParameters, Predicate filesToAnalyzeCompletely, + Project project, Predicate filesToAnalyzeCompletely, @NotNull BindingTrace traceContext, @NotNull BodiesResolveContext bodiesResolveContext, - @NotNull ModuleDescriptor module) { + @NotNull ModuleDescriptor module + ) { TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( bodiesResolveContext.getStorageManager(), bodiesResolveContext.getExceptionTracker(), filesToAnalyzeCompletely, false, - false, - scriptParameters + false ); bodiesResolveContext.setTopDownAnalysisParameters(topDownAnalysisParameters); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index 9d84e34ec38..6c27e0ff337 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -96,7 +96,6 @@ public class ScriptHeaderResolver { ScriptDescriptorImpl descriptor = (ScriptDescriptorImpl) e.getValue(); List valueParameters = scriptParameterResolver.resolveScriptParameters( - c.getTopDownAnalysisParameters(), declaration, descriptor ); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java index e2ab9bae3e2..39087f4677b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java @@ -49,7 +49,6 @@ public class ScriptParameterResolver { @NotNull public List resolveScriptParameters( - @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull JetScript declaration, @NotNull ScriptDescriptor scriptDescriptor ) { @@ -59,11 +58,7 @@ public class ScriptParameterResolver { JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file); int index = 0; - List scriptParameters = !scriptDefinition.getScriptParameters().isEmpty() - ? scriptDefinition.getScriptParameters() - : topDownAnalysisParameters.getScriptParameters(); - - for (AnalyzerScriptParameter scriptParameter : scriptParameters) { + for (AnalyzerScriptParameter scriptParameter : scriptDefinition.getScriptParameters()) { ValueParameterDescriptor parameter = resolveScriptParameter(scriptParameter, index, scriptDescriptor); valueParameters.add(parameter); ++index; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java index 3e71a608859..fb7df6b01ff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java @@ -23,8 +23,6 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.storage.ExceptionTracker; import org.jetbrains.jet.storage.StorageManager; -import java.util.List; - /** * Various junk that cannot be placed into context (yet). */ @@ -37,23 +35,19 @@ public class TopDownAnalysisParameters implements GlobalContext { private final Predicate analyzeCompletely; private final boolean analyzingBootstrapLibrary; private final boolean declaredLocally; - @NotNull - private final List scriptParameters; public TopDownAnalysisParameters( @NotNull StorageManager storageManager, @NotNull ExceptionTracker exceptionTracker, @NotNull Predicate analyzeCompletely, boolean analyzingBootstrapLibrary, - boolean declaredLocally, - @NotNull List scriptParameters + boolean declaredLocally ) { this.storageManager = storageManager; this.exceptionTracker = exceptionTracker; this.analyzeCompletely = analyzeCompletely; this.analyzingBootstrapLibrary = analyzingBootstrapLibrary; this.declaredLocally = declaredLocally; - this.scriptParameters = scriptParameters; } @Override @@ -80,9 +74,4 @@ public class TopDownAnalysisParameters implements GlobalContext { public boolean isDeclaredLocally() { return declaredLocally; } - - @NotNull - public List getScriptParameters() { - return scriptParameters; - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 5ef2a8273a2..52cbb87ab87 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -389,8 +389,7 @@ public class TopDownAnalyzer { globalContext.getExceptionTracker(), Predicates.equalTo(object.getContainingFile()), false, - true, - Collections.emptyList() + true ); InjectorForTopDownAnalyzerBasic injector = new InjectorForTopDownAnalyzerBasic( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 6f70505cb20..f185af7f70a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -54,7 +54,6 @@ import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace public class LazyScriptDescriptor( val resolveSession: ResolveSession, scriptParameterResolver: ScriptParameterResolver, - topDownAnalysisParameters: TopDownAnalysisParameters, scriptBodyResolver: ScriptBodyResolver, val jetScript: JetScript, val _priority: Int @@ -83,7 +82,7 @@ public class LazyScriptDescriptor( val result = ScriptCodeDescriptor(this) result.initialize( _implicitReceiver, - scriptParameterResolver.resolveScriptParameters(topDownAnalysisParameters, jetScript, this), + scriptParameterResolver.resolveScriptParameters(jetScript, this), DeferredType.create(resolveSession.getStorageManager(), resolveSession.getTrace()) { scriptBodyResolver.resolveScriptReturnType(jetScript, this, resolveSession.getTrace()) } diff --git a/compiler/testData/script/fib.kt b/compiler/testData/script/fib.kt deleted file mode 100644 index 5c714e673d1..00000000000 --- a/compiler/testData/script/fib.kt +++ /dev/null @@ -1,10 +0,0 @@ -// this script expected parameter num : Int - -fun fib(n: Int): Int { - val v = if(n < 2) 1 else fib(n-1) + fib(n-2) - System.out.println("fib($n)=$v") - return v -} - -System.out.println("num: $num") -val result = fib(num) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 3ed2519d239..73c675b1830 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -226,14 +226,13 @@ public class JetTestUtils { @NotNull public static AnalyzeExhaust analyzeFile(@NotNull JetFile file) { - return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file, Collections.emptyList()); + return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file); } @NotNull public static AnalyzeExhaust analyzeFileWithoutBody(@NotNull JetFile file) { return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), - Collections.emptyList(), Predicates.alwaysFalse()); } diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index 6be92f5b5d0..d82be76a10b 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -56,13 +56,6 @@ public class ScriptTest { aClass.getConstructor(int.class).newInstance(4); } - @Test - public void testScriptStandardExt() throws Exception { - Class aClass = compileScript("fib.kt", numIntParam(), Collections.emptyList()); - Assert.assertNotNull(aClass); - aClass.getConstructor(int.class).newInstance(4); - } - @Test public void testScriptWithScriptDefinition() throws Exception { Class aClass = compileScript("fib.fib.kt", null, diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 0a3e2bae181..357eae46063 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -34,7 +33,6 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import java.io.File; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -48,7 +46,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( getProject(), jetFiles, support.getTrace(), - Collections.emptyList(), Predicates.alwaysTrue(), false, support.getModule(), + Predicates.alwaysTrue(), false, support.getModule(), MemberFilter.ALWAYS_TRUE).getBindingContext(); boolean ok = true; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 9a021040250..a26f60b56af 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -109,7 +108,7 @@ public class CheckerTestUtilTest extends JetLiteFixture { public void test(@NotNull PsiFile psiFile) { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - (JetFile) psiFile,Collections.emptyList()) + (JetFile) psiFile) .getBindingContext(); String expectedText = CheckerTestUtil.addDiagnosticMarkersToText(psiFile, CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, psiFile)).toString(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java index 37a6caac12d..077a9c7738c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java @@ -23,6 +23,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.checkers.CheckerTestUtil; +import org.jetbrains.jet.lang.parsing.JetScriptDefinition; +import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; @@ -42,18 +44,15 @@ public class CodegenTestFiles { @NotNull private final List> expectedValues; @NotNull - private final List scriptParameterTypes; - @NotNull private final List scriptParameterValues; private CodegenTestFiles( @NotNull List psiFiles, @NotNull List> expectedValues, - @NotNull List scriptParameterTypes, - @NotNull List scriptParameterValues) { + @NotNull List scriptParameterValues + ) { this.psiFiles = psiFiles; this.expectedValues = expectedValues; - this.scriptParameterTypes = scriptParameterTypes; this.scriptParameterValues = scriptParameterValues; } @@ -68,11 +67,6 @@ public class CodegenTestFiles { return expectedValues; } - @NotNull - public List getScriptParameterTypes() { - return scriptParameterTypes; - } - @NotNull public List getScriptParameterValues() { return scriptParameterValues; @@ -96,7 +90,7 @@ public class CodegenTestFiles { throw new RuntimeException(e); } } - return new CodegenTestFiles(files, Collections.>emptyList(), Collections.emptyList(), Collections.emptyList()); + return new CodegenTestFiles(files, Collections.>emptyList(), Collections.emptyList()); } @NotNull @@ -146,8 +140,15 @@ public class CodegenTestFiles { scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type))); scriptParameterValues.add(value); } + + JetScriptDefinitionProvider.getInstance(project).addScriptDefinition( + new JetScriptDefinition( + ".kts", + scriptParameterTypes + ) + ); } - return new CodegenTestFiles(Collections.singletonList(file), expectedValues, scriptParameterTypes, scriptParameterValues); + return new CodegenTestFiles(Collections.singletonList(file), expectedValues, scriptParameterValues); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java index a192bd27eaa..a90f3682c74 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java @@ -52,7 +52,6 @@ public class CodegenTestUtil { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationAndCheckForErrors( environment.getProject(), files.getPsiFiles(), - files.getScriptParameterTypes(), Predicates.alwaysTrue()); analyzeExhaust.throwIfError(); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index ffff7abfca8..4335585421f 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.common.arguments.CompilerArgumentsUtil; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import java.util.Collections; @@ -43,14 +42,14 @@ public class GenerationUtils { @NotNull public static GenerationState compileFileGetGenerationStateForTest(@NotNull JetFile psiFile) { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( - psiFile, Collections.emptyList()); + psiFile); return compileFilesGetGenerationState(psiFile.getProject(), analyzeExhaust, Collections.singletonList(psiFile)); } @NotNull public static GenerationState compileManyFilesGetGenerationStateForTest(@NotNull Project project, @NotNull List files) { AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationAndCheckForErrors( - project, files, Collections.emptyList(), Predicates.alwaysTrue()); + project, files, Predicates.alwaysTrue()); return compileFilesGetGenerationState(project,analyzeExhaust, files); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 97b8bc14c94..e8427fd1888 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -146,8 +146,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { new ExceptionTracker(), // dummy Predicates.alwaysFalse(), false, - false, - Collections.emptyList() + false ); InjectorForTopDownAnalyzerForJvm injectorForAnalyzer = new InjectorForTopDownAnalyzerForJvm( environment.getProject(), diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index f8125d4db4e..50e6691e644 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -32,7 +32,6 @@ import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.test.TestCaseWithTmpdir; @@ -84,8 +83,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { Project project = createEnvironment(Arrays.asList(extraClassPath)).getProject(); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")), - Collections.emptyList() + JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) ); PackageViewDescriptor packageView = exhaust.getModuleDescriptor().getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME); @@ -177,8 +175,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { Project project = createEnvironment(Collections.singletonList(tmpdir)).getProject(); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")), - Collections.emptyList() + JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) ); exhaust.throwIfError(); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index e215b618836..fa97f8704ca 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -39,7 +39,6 @@ import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver; import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -156,7 +155,7 @@ public final class LoadDescriptorUtil { } }); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - jetCoreEnvironment.getProject(), jetFiles, Collections.emptyList(), Predicates.alwaysTrue()); + jetCoreEnvironment.getProject(), jetFiles, Predicates.alwaysTrue()); return new JetFilesAndExhaust(jetFiles, exhaust); } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 83bab6dcc67..d27fa59785d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -32,17 +32,12 @@ import org.jetbrains.jet.lang.descriptors.DependencyKind; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetPackageDirective; -import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; 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.name.SpecialNames; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -55,7 +50,7 @@ public class LazyResolveTestUtil { GlobalContextImpl globalContext = ContextPackage.GlobalContext(); TopDownAnalysisParameters params = new TopDownAnalysisParameters( - globalContext.getStorageManager(), globalContext.getExceptionTracker(), Predicates.alwaysTrue(), false, false, Collections.emptyList()); + globalContext.getStorageManager(), globalContext.getExceptionTracker(), Predicates.alwaysTrue(), false, false); CliLightClassGenerationSupport support = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()); BindingTrace sharedTrace = support.getTrace(); ModuleDescriptorImpl sharedModule = support.getModule(); diff --git a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java index df7676d0763..5d710002ae7 100644 --- a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java @@ -31,14 +31,12 @@ import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetVisitorVoid; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.FqName; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class DescriptorRendererTest extends JetLiteFixture { @@ -93,7 +91,7 @@ public class DescriptorRendererTest extends JetLiteFixture { String fileName = getTestName(false) + ".kt"; JetFile psiFile = createPsiFile(null, fileName, loadFile(fileName)); AnalyzeExhaust analyzeExhaust = - AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile, Collections.emptyList()); + AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile); final BindingContext bindingContext = analyzeExhaust.getBindingContext(); final List descriptors = new ArrayList(); diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 829b7eb038c..e7f590edfd5 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.Errors; 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; @@ -43,7 +42,6 @@ import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -148,7 +146,7 @@ public abstract class ExpectedResolveData { Project project = files.iterator().next().getProject(); AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - project, files, Collections.emptyList(), Predicates.alwaysTrue()); + project, files, Predicates.alwaysTrue()); return analyzeExhaust.getBindingContext(); } diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index e39c22bd245..72ebe117b79 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -51,7 +51,7 @@ public abstract class AbstractResolvedCallsTest() : JetLiteFixture() { fun analyzeFileAndGetResolvedCallEntries(): Map> { val psiFile = JetTestUtils.loadJetFile(getProject(), file) - val analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile, Collections.emptyList()) + val analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile) val bindingContext = analyzeExhaust.getBindingContext() return bindingContext.getSliceContents(BindingContext.RESOLVED_CALL) } diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index c9b1a0f2117..721fe1ffecf 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -82,7 +82,7 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { val fileName = "declarations/declarations.kt" val psiFile = createPsiFile(null, fileName, loadFile(fileName)) - val analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile, Collections.emptyList())!! + val analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile) val bindingContext = analyzeExhaust.getBindingContext() return MyDeclarations(bindingContext, getProject(), typeResolver) } diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 55ffe72555e..4c6215b6fbd 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.di.InjectorForTests; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; 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.DescriptorResolver; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; @@ -37,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import java.util.Collections; import java.util.List; public class JetDefaultModalityModifiersTest extends JetLiteFixture { @@ -81,8 +79,8 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { List declarations = file.getDeclarations(); JetDeclaration aClass = declarations.get(0); assert aClass instanceof JetClass; - AnalyzeExhaust bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file, - Collections.emptyList()); + AnalyzeExhaust bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file + ); DeclarationDescriptor classDescriptor = bindingContext.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, aClass); WritableScopeImpl scope = new WritableScopeImpl( libraryScope, root, RedeclarationHandler.DO_NOTHING, "JetDefaultModalityModifiersTest"); diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/JvmDeclarationsCacheProvider.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/JvmDeclarationsCacheProvider.java index e6c6126bec7..6be1b3fd215 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/JvmDeclarationsCacheProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/JvmDeclarationsCacheProvider.java @@ -28,7 +28,6 @@ import com.intellij.psi.util.PsiModificationTracker; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalyzeExhaust; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; @@ -36,8 +35,6 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.plugin.project.TargetPlatform; -import java.util.Collections; - class JvmDeclarationsCacheProvider extends DeclarationsCacheProvider { private final CachedValueProvider declarationsProvider; private final Key> cachedKey; @@ -65,7 +62,6 @@ class JvmDeclarationsCacheProvider extends DeclarationsCacheProvider { project, JetFilesProvider.getInstance(project).allInScope(GlobalSearchScope.allScope(project)), incompleteTrace, - Collections.emptyList(), Predicates.alwaysFalse(), true); } diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java index 2972bb4cd6a..795d4831b63 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java @@ -198,7 +198,6 @@ public final class AnalyzerFacadeWithCache { fileToCache.getProject(), Collections.singleton(fileToCache), new BindingTraceContext(), - Collections.emptyList(), Predicates.alwaysFalse(), true, AnalyzerFacadeForJVM.createJavaModule(""), @@ -218,7 +217,6 @@ public final class AnalyzerFacadeWithCache { // Need to resolve bodies in given file and all in the same package return AnalyzerFacadeProvider.getAnalyzerFacadeForFile(file).analyzeBodiesInFiles( file.getProject(), - Collections.emptyList(), new JetFilesProvider.SameJetFilePredicate(file), new DelegatingBindingTrace(analyzeExhaustHeaders.getBindingContext(), "trace to resolve bodies in file", file.getName()), diff --git a/idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java b/idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java index e35742b0669..0313973604e 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java +++ b/idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java @@ -24,14 +24,12 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.analyzer.AnalyzerFacade; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BodiesResolveContext; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS; import java.util.Collection; -import java.util.List; public enum JSAnalyzerFacadeForIDEA implements AnalyzerFacade { @@ -45,7 +43,6 @@ public enum JSAnalyzerFacadeForIDEA implements AnalyzerFacade { public AnalyzeExhaust analyzeFiles( @NotNull Project project, @NotNull Collection files, - @NotNull List scriptParameters, @NotNull Predicate filesToAnalyzeCompletely ) { return AnalyzerFacadeForJS.analyzeFiles(files, filesToAnalyzeCompletely, new IDEAConfig(project), true); @@ -55,7 +52,6 @@ public enum JSAnalyzerFacadeForIDEA implements AnalyzerFacade { @Override public AnalyzeExhaust analyzeBodiesInFiles( @NotNull Project project, - @NotNull List scriptParameters, @NotNull Predicate filesForBodiesResolve, @NotNull BindingTrace traceContext, @NotNull BodiesResolveContext bodiesResolveContext, diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 9fee9eeb42d..b0da682b07f 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -38,7 +38,6 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.storage.ExceptionTracker; import org.jetbrains.jet.storage.LazyResolveStorageManager; @@ -336,7 +335,7 @@ public class ResolveElementCache { private static TopDownAnalysisParameters createParameters(@NotNull ResolveSession resolveSession) { return new TopDownAnalysisParameters( resolveSession.getStorageManager(), resolveSession.getExceptionTracker(), - Predicates.alwaysTrue(), false, true, Collections.emptyList()); + Predicates.alwaysTrue(), false, true); } @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java index 6a3cde31a44..dce489d6cc4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java @@ -28,7 +28,6 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; 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.BodiesResolveContext; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; @@ -37,7 +36,6 @@ import org.jetbrains.jet.plugin.project.AnalyzerFacadeProvider; import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; import java.util.Collection; -import java.util.Collections; public class MigrateSureInProjectFix extends JetIntentionAction { public MigrateSureInProjectFix(@NotNull PsiElement element) { @@ -149,7 +147,6 @@ public class MigrateSureInProjectFix extends JetIntentionAction { AnalyzeExhaust analyzeExhaustHeaders = AnalyzerFacadeProvider.getAnalyzerFacadeForFile(initialFile).analyzeFiles( initialFile.getProject(), files, - Collections.emptyList(), Predicates.alwaysFalse()); BodiesResolveContext context = analyzeExhaustHeaders.getBodiesResolveContext(); @@ -158,7 +155,6 @@ public class MigrateSureInProjectFix extends JetIntentionAction { // Need to resolve bodies in given file and all in the same package return AnalyzerFacadeProvider.getAnalyzerFacadeForFile(initialFile).analyzeBodiesInFiles( initialFile.getProject(), - Collections.emptyList(), Predicates.alwaysTrue(), new DelegatingBindingTrace(analyzeExhaustHeaders.getBindingContext(), "trace in migrate sure fix"), context, diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index 1a65f441aec..2dec186da24 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -91,7 +91,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( globalContext.getStorageManager(), globalContext.getExceptionTracker(), - Predicates.alwaysFalse(), true, false, Collections.emptyList()); + Predicates.alwaysFalse(), true, false); ModuleDescriptorImpl module = new ModuleDescriptorImpl( Name.special(""), Collections.emptyList(), PlatformToKotlinClassMap.EMPTY); BindingTraceContext trace = new BindingTraceContext(); diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index 92a8520efd1..34f23b242fb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -32,14 +32,12 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.io.File; import java.lang.reflect.Field; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -82,7 +80,7 @@ public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { MessageType messageType = getMessageTypeDirective(directives); JetFile psiFile = createPsiFile(null, fileName, loadFile(fileName)); - AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile, Collections.emptyList()); + AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile); BindingContext bindingContext = analyzeExhaust.getBindingContext(); List diagnostics = ContainerUtil.filter(bindingContext.getDiagnostics().all(), new Condition() { diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 71678e6310e..2352ebd9485 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -42,7 +42,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.k2js.config.Config; import java.util.Collection; -import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService.createDeclarationProviderFactory; @@ -93,7 +92,7 @@ public final class AnalyzerFacadeForJS { GlobalContextImpl globalContext = ContextPackage.GlobalContext(); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( - globalContext.getStorageManager(), globalContext.getExceptionTracker(), completely, false, false, Collections.emptyList()); + globalContext.getStorageManager(), globalContext.getExceptionTracker(), completely, false, false); ModuleDescriptor libraryModule = config.getLibraryModule(); if (libraryModule != null) { @@ -131,7 +130,7 @@ public final class AnalyzerFacadeForJS { Predicate completely = Predicates.and(notLibFiles(config.getLibFiles()), filesToAnalyzeCompletely); return AnalyzerFacadeForEverything.analyzeBodiesInFilesWithJavaIntegration( - config.getProject(), Collections.emptyList(), completely, traceContext, bodiesResolveContext, + config.getProject(), completely, traceContext, bodiesResolveContext, module); }