azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getDefaultImports() removed from ModuleConfiguration

Browse Source
This commit is contained in:
Andrey Breslav
2013-04-17 11:09:02 +04:00
parent f3656bcadd
commit 2e710d7462
7 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
-4
View File
@@ -98,10 +98,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
final JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver();
ModuleConfiguration moduleConfiguration = new ModuleConfiguration() {
@Override
public List<ImportPath> getDefaultImports() {
return JavaBridgeConfiguration.ALL_JAVA_IMPORTS;
}
@Override
public void extendNamespaceScope(
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
-5
View File
@@ -45,11 +45,6 @@ public class JavaBridgeConfiguration implements ModuleConfiguration {
this.javaSemanticServices = javaSemanticServices;
}
@Override
public List<ImportPath> getDefaultImports() {
return ALL_JAVA_IMPORTS;
}
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
JetScope javaPackageScope = javaSemanticServices.getDescriptorResolver().getJavaPackageScope(namespaceDescriptor);
compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
-5
View File
@@ -42,11 +42,6 @@ public class DefaultModuleConfiguration implements ModuleConfiguration {
private DefaultModuleConfiguration() {
}
@Override
public List<ImportPath> getDefaultImports() {
return DEFAULT_JET_IMPORTS;
}
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
if (DescriptorUtils.getFQName(namespaceDescriptor).equalsTo(KotlinBuiltIns.getInstance().getBuiltInsPackageFqName())) {
compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java
-10
View File
@@ -19,18 +19,10 @@ package org.jetbrains.jet.lang;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import java.util.Collections;
import java.util.List;
public interface ModuleConfiguration {
ModuleConfiguration EMPTY = new ModuleConfiguration() {
@Override
public List<ImportPath> getDefaultImports() {
return Collections.emptyList();
}
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
@@ -48,8 +40,6 @@ public interface ModuleConfiguration {
}
};
List<ImportPath> getDefaultImports();
/**
* This method is called every time a namespace descriptor is created. Use it to add extra descriptors to the namespace, e.g. merge a
* Java package with a Kotlin one
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
-5
View File
@@ -263,11 +263,6 @@ public class KotlinBuiltIns {
private SpecialModuleConfiguration() {
}
@Override
public List<ImportPath> getDefaultImports() {
return DefaultModuleConfiguration.DEFAULT_JET_IMPORTS;
}
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace,
@NotNull NamespaceDescriptor namespaceDescriptor,
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
+4 -9
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiFile;
@@ -29,7 +28,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.DefaultModuleConfiguration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
@@ -39,7 +37,10 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap;
@@ -110,12 +111,6 @@ public class LazyResolveTestUtil {
});
ModuleConfiguration moduleConfiguration = new ModuleConfiguration() {
@Override
public List<ImportPath> getDefaultImports() {
List<ImportPath> imports = Lists.newArrayList(new ImportPath("java.lang.*"));
imports.addAll(DefaultModuleConfiguration.DEFAULT_JET_IMPORTS);
return imports;
}
@Override
public void extendNamespaceScope(
js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
-5
View File
@@ -55,11 +55,6 @@ public class JsConfiguration implements ModuleConfiguration {
this.preanalyzedContext = preanalyzedContext;
}
@Override
public List<ImportPath> getDefaultImports() {
return DEFAULT_IMPORT_PATHS;
}
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor,
@NotNull WritableScope namespaceMemberScope) {