diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java index 41605e0bd92..af2727bd4ae 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.cli.jvm; import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping; import org.jetbrains.jet.config.CompilerConfigurationKey; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import java.io.File; @@ -36,8 +35,6 @@ public class JVMConfigurationKeys { public static final CompilerConfigurationKey> ANNOTATIONS_PATH_KEY = CompilerConfigurationKey.create("annotations path"); public static final CompilerConfigurationKey> SCRIPT_PARAMETERS = CompilerConfigurationKey.create("script"); - public static final CompilerConfigurationKey BUILTINS_SCOPE_EXTENSION_MODE_KEY = - CompilerConfigurationKey.create("builtins scope extension mode"); public static final CompilerConfigurationKey STUBS = CompilerConfigurationKey.create("stubs"); public static final CompilerConfigurationKey BUILTIN_TO_JAVA_TYPES_MAPPING_KEY = CompilerConfigurationKey.create("builtin to java types mapping"); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java index 2caaa91a2ec..b518f915335 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java @@ -35,7 +35,6 @@ import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping; import org.jetbrains.jet.codegen.CompilationException; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.utils.PathUtil; @@ -104,8 +103,6 @@ public class K2JVMCompiler extends CLICompiler { configuration.put(JVMConfigurationKeys.SCRIPT_PARAMETERS, arguments.script ? CommandLineScriptUtils.scriptParameters() : Collections.emptyList()); - configuration.put(JVMConfigurationKeys.BUILTINS_SCOPE_EXTENSION_MODE_KEY, - builtins? BuiltinsScopeExtensionMode.ONLY_STANDARD_CLASSES : BuiltinsScopeExtensionMode.ALL); configuration.put(JVMConfigurationKeys.STUBS, builtins); configuration.put(JVMConfigurationKeys.BUILTIN_TO_JAVA_TYPES_MAPPING_KEY, builtins ? BuiltinToJavaTypesMapping.DISABLED : BuiltinToJavaTypesMapping.ENABLED); 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 4756ffe63da..d77d98c4a02 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 @@ -38,7 +38,6 @@ import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationStrategy; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.psi.JetFile; @@ -319,9 +318,8 @@ public class KotlinToJVMBytecodeCompiler { environment.getProject(), environment.getSourceFiles(), scriptParameters, - filesToAnalyzeCompletely, - environment.getConfiguration().get(JVMConfigurationKeys.BUILTINS_SCOPE_EXTENSION_MODE_KEY, - BuiltinsScopeExtensionMode.ALL)); + filesToAnalyzeCompletely + ); } }, environment.getSourceFiles() ); 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 a006533dada..fccd4775776 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 @@ -40,7 +40,6 @@ import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.NamespaceLikeBuilderDummy; @@ -98,7 +97,7 @@ public class ReplInterpreter { false, true, Collections.emptyList()); - injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, BuiltinsScopeExtensionMode.ALL); + injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module); List classpath = Lists.newArrayList(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index f047b479581..1afc82d5581 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -20,7 +20,6 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -47,7 +46,6 @@ public class InjectorForJavaDescriptorResolver { private final Project project; private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; - private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode; private JavaBridgeConfiguration javaBridgeConfiguration; private JavaSemanticServices javaSemanticServices; private JavaDescriptorResolver javaDescriptorResolver; @@ -69,13 +67,11 @@ public class InjectorForJavaDescriptorResolver { public InjectorForJavaDescriptorResolver( @NotNull Project project, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode + @NotNull ModuleDescriptor moduleDescriptor ) { this.project = project; this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; - this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.javaSemanticServices = new JavaSemanticServices(); this.javaDescriptorResolver = new JavaDescriptorResolver(); @@ -94,7 +90,6 @@ public class InjectorForJavaDescriptorResolver { this.javaInnerClassResolver = new JavaInnerClassResolver(); this.javaPropertiesResolver = new JavaPropertiesResolver(); - javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setProject(project); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index de90ab693a1..86e50b8e64d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -23,7 +23,6 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; @@ -50,7 +49,6 @@ public class InjectorForJavaSemanticServices { private JavaBridgeConfiguration javaBridgeConfiguration; private PsiClassFinderImpl psiClassFinder; private ModuleDescriptor moduleDescriptor; - private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode; private final Project project; private JavaTypeTransformer javaTypeTransformer; private JavaClassResolver javaClassResolver; @@ -67,7 +65,6 @@ public class InjectorForJavaSemanticServices { private JavaPropertiesResolver javaPropertiesResolver; public InjectorForJavaSemanticServices( - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode, @NotNull Project project ) { this.javaSemanticServices = new JavaSemanticServices(); @@ -76,7 +73,6 @@ public class InjectorForJavaSemanticServices { this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.psiClassFinder = new PsiClassFinderImpl(); this.moduleDescriptor = new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special("")); - this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; this.project = project; this.javaTypeTransformer = new JavaTypeTransformer(); this.javaClassResolver = new JavaClassResolver(); @@ -104,7 +100,6 @@ public class InjectorForJavaSemanticServices { this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); - javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setProject(project); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 50263479238..935f3db38c8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -76,7 +75,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; - private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode; private JavaBridgeConfiguration moduleConfiguration; private JavaDescriptorResolver javaDescriptorResolver; private PsiClassFinderImpl psiClassFinder; @@ -113,8 +111,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly @NotNull Project project, @NotNull TopDownAnalysisParameters topDownAnalysisParameters, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode + @NotNull ModuleDescriptor moduleDescriptor ) { this.topDownAnalyzer = new TopDownAnalyzer(); this.topDownAnalysisContext = new TopDownAnalysisContext(); @@ -126,7 +123,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.topDownAnalysisParameters = topDownAnalysisParameters; this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; - this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; this.moduleConfiguration = new JavaBridgeConfiguration(); this.javaDescriptorResolver = new JavaDescriptorResolver(); this.psiClassFinder = new PsiClassFinderImpl(); @@ -191,7 +187,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.descriptorResolver.setExpressionTypingServices(expressionTypingServices); this.descriptorResolver.setTypeResolver(typeResolver); - this.moduleConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode); this.moduleConfiguration.setJavaSemanticServices(javaSemanticServices); this.moduleConfiguration.setProject(project); 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 9052a9214ab..0dab7912ba9 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 @@ -27,7 +27,6 @@ import org.jetbrains.jet.analyzer.AnalyzerFacade; import org.jetbrains.jet.analyzer.AnalyzerFacadeForEverything; import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; @@ -66,8 +65,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { @NotNull Collection files, @NotNull List scriptParameters, @NotNull Predicate filesToAnalyzeCompletely) { - return analyzeFilesWithJavaIntegration(project, files, scriptParameters, filesToAnalyzeCompletely, - BuiltinsScopeExtensionMode.ALL, true); + return analyzeFilesWithJavaIntegration(project, files, scriptParameters, filesToAnalyzeCompletely, true); } @NotNull @@ -90,8 +88,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { ModuleDescriptor javaModule = new ModuleDescriptor(Name.special("")); BindingTraceContext javaResolverTrace = new BindingTraceContext(); - InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver( - fileProject, javaResolverTrace, javaModule, BuiltinsScopeExtensionMode.ALL); + InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver(fileProject, javaResolverTrace, javaModule); final PsiClassFinder psiClassFinder = injector.getPsiClassFinder(); @@ -146,10 +143,10 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust analyzeOneFileWithJavaIntegrationAndCheckForErrors( - JetFile file, List scriptParameters, @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + JetFile file, List scriptParameters) { AnalyzingUtils.checkForSyntacticErrors(file); - AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file, scriptParameters, builtinsScopeExtensionMode); + AnalyzeExhaust analyzeExhaust = analyzeOneFileWithJavaIntegration(file, scriptParameters); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -157,20 +154,23 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust analyzeOneFileWithJavaIntegration( - JetFile file, List scriptParameters, @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + JetFile file, List scriptParameters) { return analyzeFilesWithJavaIntegration(file.getProject(), Collections.singleton(file), scriptParameters, - Predicates.alwaysTrue(), builtinsScopeExtensionMode); + Predicates.alwaysTrue()); } public static AnalyzeExhaust analyzeFilesWithJavaIntegrationAndCheckForErrors( - Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + Project project, + Collection files, + List scriptParameters, + Predicate filesToAnalyzeCompletely + ) { for (JetFile file : files) { AnalyzingUtils.checkForSyntacticErrors(file); } AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, builtinsScopeExtensionMode, false); + project, files, scriptParameters, filesToAnalyzeCompletely, false); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); @@ -178,15 +178,17 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } public static AnalyzeExhaust analyzeFilesWithJavaIntegration( - Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + Project project, + Collection files, + List scriptParameters, + Predicate filesToAnalyzeCompletely + ) { return analyzeFilesWithJavaIntegration( - project, files, scriptParameters, filesToAnalyzeCompletely, builtinsScopeExtensionMode, false); + project, files, scriptParameters, filesToAnalyzeCompletely, false); } public static AnalyzeExhaust analyzeFilesWithJavaIntegration( Project project, Collection files, List scriptParameters, Predicate filesToAnalyzeCompletely, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode, boolean storeContextForBodiesResolve) { BindingTraceContext bindingTraceContext = new BindingTraceContext(); @@ -197,7 +199,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm( project, topDownAnalysisParameters, - new ObservableBindingTrace(bindingTraceContext), owner, builtinsScopeExtensionMode); + new ObservableBindingTrace(bindingTraceContext), owner); try { injector.getTopDownAnalyzer().analyzeFiles(files, scriptParameters); BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? @@ -209,14 +211,12 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { } } - public static AnalyzeExhaust shallowAnalyzeFiles(Collection files, - @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + public static AnalyzeExhaust shallowAnalyzeFiles(Collection files) { assert files.size() > 0; Project project = files.iterator().next().getProject(); return analyzeFilesWithJavaIntegration(project, - files, Collections.emptyList(), Predicates.alwaysFalse(), - builtinsScopeExtensionMode); + files, Collections.emptyList(), Predicates.alwaysFalse()); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java index 3164c1999d8..d1d968dc90c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.ModuleConfiguration; @@ -46,7 +45,6 @@ public class JavaBridgeConfiguration implements ModuleConfiguration { private Project project; private JavaSemanticServices javaSemanticServices; private ModuleConfiguration delegateConfiguration; - private BuiltinsScopeExtensionMode builtinsScopeExtensionMode; @Inject public void setProject(@NotNull Project project) { @@ -58,14 +56,9 @@ public class JavaBridgeConfiguration implements ModuleConfiguration { this.javaSemanticServices = javaSemanticServices; } - @Inject - public void setBuiltinsScopeExtensionMode(@NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { - this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; - } - @PostConstruct public void init() { - this.delegateConfiguration = DefaultModuleConfiguration.createStandardConfiguration(project, builtinsScopeExtensionMode); + this.delegateConfiguration = DefaultModuleConfiguration.createStandardConfiguration(project); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/BuiltinsScopeExtensionMode.java b/compiler/frontend/src/org/jetbrains/jet/lang/BuiltinsScopeExtensionMode.java deleted file mode 100644 index 01f1cf26e43..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/BuiltinsScopeExtensionMode.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.lang; - -/** - * @author Evgeny Gerashchenko - * @since 7/5/12 - */ -public enum BuiltinsScopeExtensionMode { - ALL, - ONLY_STANDARD_CLASSES -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java index e7d587c98ec..9bdb3cfcf2c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java @@ -37,15 +37,13 @@ public class DefaultModuleConfiguration implements ModuleConfiguration { new ImportPath("kotlin.*"), new ImportPath("kotlin.io.*"), new ImportPath("jet.*"), }; private final Project project; - private final @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode; - public static DefaultModuleConfiguration createStandardConfiguration(Project project, @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { - return new DefaultModuleConfiguration(project, builtinsScopeExtensionMode); + public static DefaultModuleConfiguration createStandardConfiguration(Project project) { + return new DefaultModuleConfiguration(project); } - private DefaultModuleConfiguration(@NotNull Project project, @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { + private DefaultModuleConfiguration(@NotNull Project project) { this.project = project; - this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; } @Override @@ -58,15 +56,7 @@ public class DefaultModuleConfiguration implements ModuleConfiguration { @Override public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { if (DescriptorUtils.getFQName(namespaceDescriptor).equalsTo(KotlinBuiltIns.getInstance().getBuiltInsPackageFqName())) { - switch (builtinsScopeExtensionMode) { - case ALL: - namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope()); - break; - case ONLY_STANDARD_CLASSES: - namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope()); - break; - } - + namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope()); } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java index eaec8477027..eaa6a5e2ae0 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java @@ -44,7 +44,6 @@ import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationStrategy; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; @@ -200,9 +199,7 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa // Otherwise, the analyzer gets confused and can't, for example, tell which files come as sources and which // must be loaded from .class files AnalyzeExhaust context = AnalyzerFacadeForJVM.shallowAnalyzeFiles( - JetFilesProvider.getInstance(project).sampleToAllFilesInModule().fun(file), - // TODO: wrong environment // stepan.koltsov@ 2012-04-09 - BuiltinsScopeExtensionMode.ALL); + JetFilesProvider.getInstance(project).sampleToAllFilesInModule().fun(file)); if (context.isError()) { throw new IllegalStateException("failed to analyze: " + context.getError(), context.getError()); diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 1e1ce1b16cc..8ef47d5366b 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -34,7 +34,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.UnresolvedReferenceDiagnosticFactory; @@ -191,9 +190,8 @@ public class JetTestUtils { private JetTestUtils() { } - public static AnalyzeExhaust analyzeFile(@NotNull JetFile namespace, @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode) { - return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(namespace, Collections.emptyList(), - builtinsScopeExtensionMode); + public static AnalyzeExhaust analyzeFile(@NotNull JetFile namespace) { + return AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(namespace, Collections.emptyList()); } public static JetCoreEnvironment createEnvironmentWithFullJdk(Disposable disposable) { diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index 6448a6d08d4..96fcfe1da91 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -31,7 +31,6 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.cfg.pseudocode.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -74,7 +73,7 @@ public class JetControlFlowTest extends JetLiteFixture { JetFile file = loadPsiFile(myName + ".jet"); final Map data = new LinkedHashMap(); - AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file, BuiltinsScopeExtensionMode.ALL); + AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file); List declarations = file.getDeclarations(); BindingContext bindingContext = analyzeExhaust.getBindingContext(); for (JetDeclaration declaration : declarations) { diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java index 00c5f0ae898..3a0fef8557e 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.checkers; import com.google.common.base.Predicates; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -43,7 +42,7 @@ public abstract class AbstractDiagnosticsTestWithEagerResolve extends AbstractJe BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( getProject(), jetFiles, Collections.emptyList(), - Predicates.alwaysTrue(), BuiltinsScopeExtensionMode.ALL).getBindingContext(); + Predicates.alwaysTrue()).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 e64aad21391..85923461ad8 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; @@ -107,7 +106,7 @@ public class CheckerTestUtilTest extends JetLiteFixture { public void test(final @NotNull PsiFile psiFile) { BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - (JetFile) psiFile,Collections.emptyList(), BuiltinsScopeExtensionMode.ALL) + (JetFile) psiFile,Collections.emptyList()) .getBindingContext(); String expectedText = CheckerTestUtil.addDiagnosticMarkersToText(psiFile, CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, psiFile)).toString(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index cc2105eae7e..cce18b3d220 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -36,7 +36,6 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationStrategy; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; @@ -358,8 +357,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { environment.getProject(), files.getPsiFiles(), files.getScriptParameterTypes(), - Predicates.alwaysTrue(), - BuiltinsScopeExtensionMode.ALL); + Predicates.alwaysTrue()); analyzeExhaust.throwIfError(); AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext()); CompilerConfiguration configuration = environment.getConfiguration(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index 241f88dcf79..e081c74bf6f 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationStrategy; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -31,8 +30,6 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript; - /** * @author Stepan Koltsov */ @@ -49,14 +46,14 @@ public class GenerationUtils { @NotNull public static GenerationState compileFileGetGenerationStateForTest(@NotNull JetFile psiFile) { final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( - psiFile, Collections.emptyList(), BuiltinsScopeExtensionMode.ALL); + psiFile, Collections.emptyList()); return compileFilesGetGenerationState(psiFile.getProject(), analyzeExhaust, Collections.singletonList(psiFile)); } @NotNull public static GenerationState compileManyFilesGetGenerationStateForTest(@NotNull Project project, @NotNull List files) { final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationAndCheckForErrors( - project, files, Collections.emptyList(), Predicates.alwaysTrue(), BuiltinsScopeExtensionMode.ALL); + project, files, Collections.emptyList(), Predicates.alwaysTrue()); return compileFilesGetGenerationState(project,analyzeExhaust, files); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java index fc60c1309f1..d2cc3842c4a 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -234,8 +233,7 @@ public class AnnotationJavaDescriptorResolverTest extends TestCaseWithTmpdir { new JetCoreEnvironment(myTestRootDisposable, CompileCompilerDependenciesTest.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), tmpdir)); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, - jetCoreEnvironment.getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getProject()); javaDescriptorResolver = injector.getJavaDescriptorResolver(); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java index ca4034f2930..ac1fff11e0f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java @@ -36,7 +36,6 @@ import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.CoreExternalAnnotationsManager; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -70,8 +69,7 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment { } public void testNoErrorsInAlternativeSignatures() { - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, - getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(getProject()); final BindingContext bindingContext = injector.getBindingTrace().getBindingContext(); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index bb33624fd7b..75fa70770ae 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -33,7 +33,6 @@ import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; @@ -43,12 +42,9 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.junit.Assert; -import javax.tools.*; import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; import java.util.*; import static org.jetbrains.jet.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations; @@ -100,8 +96,7 @@ public final class LoadDescriptorUtil { configurationKind, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), outDir, ForTestCompileRuntime.runtimeJarForTests()); JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, - jetCoreEnvironment.getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); NamespaceDescriptor namespaceDescriptor = javaDescriptorResolver.resolveNamespace(TEST_PACKAGE_FQNAME, DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN); @@ -144,7 +139,7 @@ public final class LoadDescriptorUtil { JetCoreEnvironment jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable, configurationKind); JetFile jetFile = createFile(jetCoreEnvironment.getProject(), FileUtil.loadFile(kotlinFile, true)); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( - jetFile, Collections.emptyList(), BuiltinsScopeExtensionMode.ALL); + jetFile, Collections.emptyList()); return new JetFileAndExhaust(jetFile, exhaust); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index c284d4fe7a1..6871b50b85c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -30,7 +30,6 @@ import org.jetbrains.jet.*; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -156,7 +155,7 @@ public class ResolveDescriptorsFromExternalLibraries { } - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, jetCoreEnvironment.getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(jetCoreEnvironment.getProject()); boolean hasErrors; try { 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 11ca3e27468..e7f76c75eb3 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver; import org.jetbrains.jet.di.InjectorForTopDownAnalyzer; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.ModuleConfiguration; @@ -63,7 +62,7 @@ public class LazyResolveTestUtil { public static InjectorForTopDownAnalyzer createInjectorForTDA(ModuleDescriptor module, JetCoreEnvironment environment) { TopDownAnalysisParameters params = new TopDownAnalysisParameters( Predicates.alwaysTrue(), false, false, Collections.emptyList()); - return new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, new BindingTraceContext(), module, BuiltinsScopeExtensionMode.ALL); + return new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, new BindingTraceContext(), module); } public static ModuleDescriptor resolveEagerly(List files, JetCoreEnvironment environment) { @@ -78,7 +77,7 @@ public class LazyResolveTestUtil { final Project project = environment.getProject(); InjectorForJavaDescriptorResolver injector = - new InjectorForJavaDescriptorResolver(project, new BindingTraceContext(), javaModule, BuiltinsScopeExtensionMode.ALL); + new InjectorForJavaDescriptorResolver(project, new BindingTraceContext(), javaModule); final PsiClassFinder psiClassFinder = injector.getPsiClassFinder(); final JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java index c8ba582f658..10bac3b8065 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; @@ -91,8 +90,7 @@ public class DescriptorRendererTest extends JetLiteFixture { JetFile psiFile = createPsiFile(null, fileName, loadFile(fileName)); AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - (JetFile) psiFile, Collections.emptyList(), - BuiltinsScopeExtensionMode.ALL); + (JetFile) psiFile, Collections.emptyList()); final BindingContext bindingContext = analyzeExhaust.getBindingContext(); final List descriptors = new ArrayList(); psiFile.acceptChildren(new JetVisitorVoid() { diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 4029a4382a6..495cc601903 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -156,7 +155,7 @@ public abstract class ExpectedResolveData { KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, - Collections.emptyList(), Predicates.alwaysTrue(), BuiltinsScopeExtensionMode.ALL); + Collections.emptyList(), Predicates.alwaysTrue()); BindingContext bindingContext = analyzeExhaust.getBindingContext(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { if (diagnostic.getFactory() instanceof UnresolvedReferenceDiagnosticFactory) { diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index fd5da20e86b..7ca66d02e4c 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.di.InjectorForTests; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; @@ -125,7 +124,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { @NotNull private PsiClass findClass(String qualifiedName) { Project project = getProject(); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, project); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(project); return injector.getPsiClassFinder().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); } diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index f4759ce186f..2148c30d4d3 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -22,7 +22,6 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForTests; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; @@ -74,8 +73,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { JetDeclaration aClass = declarations.get(0); assert aClass instanceof JetClass; AnalyzeExhaust bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(file, - Collections.emptyList(), - BuiltinsScopeExtensionMode.ALL); + Collections.emptyList()); DeclarationDescriptor classDescriptor = bindingContext.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, aClass); WritableScopeImpl scope = new WritableScopeImpl( libraryScope, root, RedeclarationHandler.DO_NOTHING, "JetDefaultModalityModifiersTest"); diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index af944bc117b..5c5f4d4f62d 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -27,7 +27,6 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.di.InjectorForTests; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.psi.*; @@ -598,7 +597,7 @@ public class JetTypeCheckerTest extends JetLiteFixture { WritableScopeImpl writableScope = new WritableScopeImpl( scope, scope.getContainingDeclaration(), RedeclarationHandler.DO_NOTHING, "JetTypeCheckerTest.addImports"); writableScope.importScope(builtIns.getBuiltInsScope()); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, getProject()); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(getProject()); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); writableScope.importScope(javaDescriptorResolver.resolveNamespace(FqName.ROOT, DescriptorSearchRule.INCLUDE_KOTLIN).getMemberScope()); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java index 39eaf17f812..eb16baf90b0 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java @@ -33,7 +33,6 @@ import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -164,7 +163,7 @@ public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements @NotNull private static String getDefaultSignature(@NotNull Project project, @NotNull PsiMember psiMember) { - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, project); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(project); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); PsiClass containingClass = psiMember.getContainingClass(); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index b9308909fb2..e7fc2ea563e 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -27,7 +27,6 @@ import jet.runtime.typeinfo.JetClass; import jet.runtime.typeinfo.JetMethod; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetFile; @@ -61,7 +60,7 @@ class DecompiledDataFactory { private DecompiledDataFactory(ClsFileImpl clsFile) { this.clsFile = clsFile; Project project = this.clsFile.getProject(); - InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, project); + InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(project); bindingContext = injector.getBindingTrace().getBindingContext(); javaDescriptorResolver = injector.getJavaDescriptorResolver(); } diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index 78133e196a2..955119eeafd 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -21,7 +21,6 @@ import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; @@ -99,7 +98,6 @@ public class AllInjectorsGenerator { DependencyInjectorGenerator generator = new DependencyInjectorGenerator(false); generator.implementInterface(InjectorForTopDownAnalyzer.class); generateInjectorForTopDownAnalyzerCommon(generator); - generator.addParameter(BuiltinsScopeExtensionMode.class); generator.addField(true, ModuleConfiguration.class, null, new InstantiateType(JavaBridgeConfiguration.class)); generator.addField(JavaDescriptorResolver.class); generator.addField(PsiClassFinderImpl.class); @@ -114,7 +112,6 @@ public class AllInjectorsGenerator { generator.addPublicParameter(Project.class); generator.addPublicParameter(BindingTrace.class); generator.addPublicParameter(ModuleDescriptor.class); - generator.addParameter(BuiltinsScopeExtensionMode.class); // Fields generator.addField(JavaBridgeConfiguration.class); @@ -184,7 +181,6 @@ public class AllInjectorsGenerator { generator.addField(false, ModuleDescriptor.class, null, new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(" + "org.jetbrains.jet.lang.resolve.name.Name.special(\"\"))")); - generator.addParameter(BuiltinsScopeExtensionMode.class); // Parameters generator.addPublicParameter(Project.class); diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java index 41ab99ba1ea..780b1665cc3 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java @@ -19,7 +19,6 @@ package org.jetbrains.k2js.analyze; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; @@ -76,7 +75,7 @@ public class JsConfiguration implements ModuleConfiguration { @Override public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - DefaultModuleConfiguration.createStandardConfiguration(project, BuiltinsScopeExtensionMode.ALL) + DefaultModuleConfiguration.createStandardConfiguration(project) .extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope); // Extend root namespace with standard classes