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

Configuration renamed into ModuleConfiguration

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-11 18:57:38 +04:00
parent efece992eb
commit 61aac5d544
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
+5 -5
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetImportDirective;
@@ -33,19 +33,19 @@ import java.util.Collections;
/**
* @author abreslav
*/
public class JavaBridgeConfiguration implements Configuration {
public class JavaBridgeConfiguration implements ModuleConfiguration {
public static final String[] DEFAULT_JAVA_IMPORTS = new String[] { "java.lang.*" };
public static Configuration createJavaBridgeConfiguration(@NotNull Project project, @NotNull BindingTrace trace, Configuration delegateConfiguration) {
public static ModuleConfiguration createJavaBridgeConfiguration(@NotNull Project project, @NotNull BindingTrace trace, ModuleConfiguration delegateConfiguration) {
return new JavaBridgeConfiguration(project, trace, delegateConfiguration);
}
private final Project project;
private final JavaSemanticServices javaSemanticServices;
private final Configuration delegateConfiguration;
private final ModuleConfiguration delegateConfiguration;
private JavaBridgeConfiguration(Project project, BindingTrace trace, Configuration delegateConfiguration) {
private JavaBridgeConfiguration(Project project, BindingTrace trace, ModuleConfiguration delegateConfiguration) {
this.project = project;
this.javaSemanticServices = new JavaSemanticServices(project, trace);
this.delegateConfiguration = delegateConfiguration;
compiler/frontend/src/org/jetbrains/jet/lang/Configuration.java → compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java
+2 -2
View File
@@ -27,8 +27,8 @@ import java.util.Collection;
/**
* @author abreslav
*/
public interface Configuration {
Configuration EMPTY = new Configuration() {
public interface ModuleConfiguration {
ModuleConfiguration EMPTY = new ModuleConfiguration() {
@Override
public void addDefaultImports(@NotNull WritableScope rootScope, @NotNull Collection<JetImportDirective> directives) {
}
compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java
+1 -1
View File
@@ -29,7 +29,7 @@ import java.util.Collection;
/**
* @author svtk
*/
public class StandardConfiguration implements Configuration {
public class StandardConfiguration implements ModuleConfiguration {
public static final String[] DEFAULT_JET_IMPORTS = new String[] { "kotlin.*", "kotlin.io.*" };
private Project project;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java
+3 -3
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
@@ -86,7 +86,7 @@ public class AnalyzingUtils {
public static BindingContext analyzeFiles(
@NotNull Project project,
@NotNull Configuration configuration,
@NotNull ModuleConfiguration configuration,
@NotNull Collection<JetFile> files,
@NotNull Predicate<PsiFile> filesToAnalyzeCompletely,
@NotNull JetControlFlowDataTraceFactory flowDataTraceFactory) {
@@ -96,7 +96,7 @@ public class AnalyzingUtils {
public static BindingContext analyzeFilesWithGivenTrace(
@NotNull Project project,
@NotNull Configuration configuration,
@NotNull ModuleConfiguration configuration,
@NotNull Collection<JetFile> files,
@NotNull Predicate<PsiFile> filesToAnalyzeCompletely,
@NotNull JetControlFlowDataTraceFactory flowDataTraceFactory,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+3 -3
View File
@@ -23,7 +23,7 @@ import com.google.common.collect.Maps;
import com.google.inject.Inject;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -45,7 +45,7 @@ public class ImportsResolver {
@NotNull
private TopDownAnalysisContext context;
@NotNull
private Configuration configuration;
private ModuleConfiguration configuration;
@Inject
public void setContext(@NotNull TopDownAnalysisContext context) {
@@ -53,7 +53,7 @@ public class ImportsResolver {
}
@Inject
public void setConfiguration(@NotNull Configuration configuration) {
public void setConfiguration(@NotNull ModuleConfiguration configuration) {
this.configuration = configuration;
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
+3 -3
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
import org.jetbrains.jet.lang.descriptors.MutableClassDescriptor;
@@ -77,7 +77,7 @@ public class TopDownAnalysisContext {
final Project project,
final BindingTrace trace,
Predicate<PsiFile> analyzeCompletely,
@NotNull final Configuration configuration,
@NotNull final ModuleConfiguration configuration,
boolean declaredLocally,
boolean analyzingBootstrapLibrary,
@Nullable final JetControlFlowDataTraceFactory jetControlFlowDataTraceFactory) {
@@ -91,7 +91,7 @@ public class TopDownAnalysisContext {
@Override
protected void configureAfter() {
bind(TopDownAnalysisContext.class).toInstance(TopDownAnalysisContext.this);
bind(Configuration.class).toInstance(configuration);
bind(ModuleConfiguration.class).toInstance(configuration);
if (jetControlFlowDataTraceFactory != null) {
bind(JetControlFlowDataTraceFactory.class).toInstance(jetControlFlowDataTraceFactory);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+5 -5
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetDeclaration;
@@ -88,7 +88,7 @@ public class TopDownAnalyzer {
@NotNull Collection<JetFile> files,
@NotNull Predicate<PsiFile> analyzeCompletely,
@NotNull JetControlFlowDataTraceFactory flowDataTraceFactory,
@NotNull Configuration configuration
@NotNull ModuleConfiguration configuration
) {
process(project, trace, outerScope, owner, files, analyzeCompletely, flowDataTraceFactory, configuration, false);
}
@@ -101,7 +101,7 @@ public class TopDownAnalyzer {
@NotNull Collection<? extends PsiElement> declarations,
@NotNull Predicate<PsiFile> analyzeCompletely,
@NotNull JetControlFlowDataTraceFactory flowDataTraceFactory,
@NotNull Configuration configuration,
@NotNull ModuleConfiguration configuration,
boolean declaredLocally) {
TopDownAnalysisContext context = new TopDownAnalysisContext(project, trace, analyzeCompletely, configuration, declaredLocally, false, flowDataTraceFactory);
context.getInjector().getInstance(TopDownAnalyzer.class).doProcess(context, outerScope, owner, declarations);
@@ -153,7 +153,7 @@ public class TopDownAnalyzer {
@NotNull WritableScope outerScope,
@NotNull NamespaceDescriptorImpl standardLibraryNamespace,
@NotNull List<JetFile> files) {
TopDownAnalysisContext context = new TopDownAnalysisContext(project, trace, Predicates.<PsiFile>alwaysTrue(), Configuration.EMPTY, false, true, null);
TopDownAnalysisContext context = new TopDownAnalysisContext(project, trace, Predicates.<PsiFile>alwaysTrue(), ModuleConfiguration.EMPTY, false, true, null);
ArrayList<JetDeclaration> toAnalyze = new ArrayList<JetDeclaration>();
for(JetFile file : files) {
context.getNamespaceDescriptors().put(file, standardLibraryNamespace);
@@ -207,7 +207,7 @@ public class TopDownAnalyzer {
public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) {
return ClassObjectStatus.NOT_ALLOWED;
}
}, Collections.<PsiElement>singletonList(object), Predicates.equalTo(object.getContainingFile()), JetControlFlowDataTraceFactory.EMPTY, Configuration.EMPTY, true);
}, Collections.<PsiElement>singletonList(object), Predicates.equalTo(object.getContainingFile()), JetControlFlowDataTraceFactory.EMPTY, ModuleConfiguration.EMPTY, true);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+3 -3
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNameIdentifierOwner;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.*;
@@ -55,7 +55,7 @@ public class TypeHierarchyResolver {
@NotNull
private DescriptorResolver descriptorResolver;
@NotNull
private Configuration configuration;
private ModuleConfiguration configuration;
// state
@@ -78,7 +78,7 @@ public class TypeHierarchyResolver {
}
@Inject
public void setConfiguration(@NotNull Configuration configuration) {
public void setConfiguration(@NotNull ModuleConfiguration configuration) {
this.configuration = configuration;
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+3 -3
View File
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetLiteFixture;
import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -152,7 +152,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
});
boolean importJdk = expectedText.contains("+JDK");
// Configuration configuration = importJdk ? JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject()) : Configuration.EMPTY;
// ModuleConfiguration configuration = importJdk ? JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject()) : ModuleConfiguration.EMPTY;
if (hasJavaFiles) {
// According to yole@ the only way to import java files is to write them on disk
// -- stepan.koltsov@ 2012-02-29
@@ -171,7 +171,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
}
else {
bindingContext = AnalyzingUtils.analyzeFiles(getProject(), Configuration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
bindingContext = AnalyzingUtils.analyzeFiles(getProject(), ModuleConfiguration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
}
boolean ok = true;
js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -104,7 +104,7 @@ public final class AnalyzerFacadeForJS {
);
}
private static final class JsConfiguration implements Configuration {
private static final class JsConfiguration implements ModuleConfiguration {
@NotNull
private final Project project;