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

Removed ModuleConfiguration.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-10-30 11:46:53 +04:00
parent 67f06c816b
commit d0605009ae
21 changed files with 9 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
+1 -4
View File
@@ -93,7 +93,6 @@ public final class AnalyzerFacadeForJS {
BindingTrace trace = libraryContext == null
? new BindingTraceContext()
: new DelegatingBindingTrace(libraryContext, "trace with preanalyzed library");
owner.setModuleConfiguration(new JsConfiguration());
InjectorForTopDownAnalyzerForJs injector = new InjectorForTopDownAnalyzerForJs(project, topDownAnalysisParameters, trace, owner);
try {
Collection<JetFile> allFiles = libraryModule != null ?
@@ -148,9 +147,7 @@ public final class AnalyzerFacadeForJS {
LockBasedLazyResolveStorageManager storageManager = new LockBasedLazyResolveStorageManager();
FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory(
storageManager, Config.withJsLibAdded(files, config), Predicates.<FqName>alwaysFalse());
ModuleDescriptorImpl lazyModule = createJsModule("<lazy module>");
lazyModule.setModuleConfiguration(new JsConfiguration());
return new ResolveSession(config.getProject(), storageManager, lazyModule, declarationProviderFactory);
return new ResolveSession(config.getProject(), storageManager, createJsModule("<lazy module>"), declarationProviderFactory);
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
+1 -8
View File
@@ -18,15 +18,12 @@ package org.jetbrains.k2js.analyze;
import com.google.common.collect.ImmutableList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.util.List;
public class JsConfiguration implements ModuleConfiguration {
public class JsConfiguration {
@NotNull
public static final List<ImportPath> DEFAULT_IMPORT_PATHS = ImmutableList.of(
@@ -37,8 +34,4 @@ public class JsConfiguration implements ModuleConfiguration {
JsConfiguration() {
}
@Override
public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
}
}