Rename: AnalyzerFacadeForJvm(Js) -> TopDownAnalyzerFacadeForJvm(Js)
This commit is contained in:
@@ -44,7 +44,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys;
|
|||||||
import org.jetbrains.jet.config.CompilerConfiguration;
|
import org.jetbrains.jet.config.CompilerConfiguration;
|
||||||
import org.jetbrains.jet.config.Services;
|
import org.jetbrains.jet.config.Services;
|
||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
|
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
|
||||||
import org.jetbrains.k2js.config.*;
|
import org.jetbrains.k2js.config.*;
|
||||||
import org.jetbrains.k2js.facade.K2JSTranslator;
|
import org.jetbrains.k2js.facade.K2JSTranslator;
|
||||||
import org.jetbrains.k2js.facade.MainCallParameters;
|
import org.jetbrains.k2js.facade.MainCallParameters;
|
||||||
@@ -179,7 +179,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
|
|||||||
analyzerWithCompilerReport.analyzeAndReport(sources, new Function0<AnalyzeExhaust>() {
|
analyzerWithCompilerReport.analyzeAndReport(sources, new Function0<AnalyzeExhaust>() {
|
||||||
@Override
|
@Override
|
||||||
public AnalyzeExhaust invoke() {
|
public AnalyzeExhaust invoke() {
|
||||||
return AnalyzerFacadeForJS.analyzeFiles(sources, Predicates.<PsiFile>alwaysTrue(), config);
|
return TopDownAnalyzerFacadeForJS.analyzeFiles(sources, Predicates.<PsiFile>alwaysTrue(), config);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return analyzerWithCompilerReport.hasErrors();
|
return analyzerWithCompilerReport.hasErrors();
|
||||||
|
|||||||
+2
-2
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
|
|||||||
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
||||||
import org.jetbrains.jet.lang.psi.*;
|
import org.jetbrains.jet.lang.psi.*;
|
||||||
import org.jetbrains.jet.lang.resolve.*;
|
import org.jetbrains.jet.lang.resolve.*;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
|
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
||||||
@@ -82,7 +82,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
|
|||||||
@NotNull
|
@NotNull
|
||||||
public ModuleDescriptorImpl newModule() {
|
public ModuleDescriptorImpl newModule() {
|
||||||
assert this.module == null : "module already configured: " + module;
|
assert this.module == null : "module already configured: " + module;
|
||||||
module = AnalyzerFacadeForJVM.createJavaModule("<shared-module-for-cli-light-classes>");
|
module = TopDownAnalyzerFacadeForJVM.createJavaModule("<shared-module-for-cli-light-classes>");
|
||||||
module.addDependencyOnModule(module);
|
module.addDependencyOnModule(module);
|
||||||
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
||||||
module.seal();
|
module.seal();
|
||||||
|
|||||||
+2
-2
@@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
|
|||||||
import org.jetbrains.jet.lang.resolve.BindingTrace;
|
import org.jetbrains.jet.lang.resolve.BindingTrace;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
||||||
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
|
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
|
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
|
||||||
import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage;
|
import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage;
|
||||||
import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache;
|
import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache;
|
||||||
@@ -291,7 +291,7 @@ public class KotlinToJVMBytecodeCompiler {
|
|||||||
BindingTrace sharedTrace = support.getTrace();
|
BindingTrace sharedTrace = support.getTrace();
|
||||||
ModuleDescriptorImpl sharedModule = support.newModule();
|
ModuleDescriptorImpl sharedModule = support.newModule();
|
||||||
|
|
||||||
return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
||||||
environment.getProject(),
|
environment.getProject(),
|
||||||
environment.getSourceFiles(),
|
environment.getSourceFiles(),
|
||||||
sharedTrace,
|
sharedTrace,
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.parsing.JetParserDefinition;
|
|||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.jet.lang.psi.JetScript;
|
import org.jetbrains.jet.lang.psi.JetScript;
|
||||||
import org.jetbrains.jet.lang.resolve.*;
|
import org.jetbrains.jet.lang.resolve.*;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
|
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
|
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
|
||||||
@@ -98,7 +98,7 @@ public class ReplInterpreter {
|
|||||||
Project project = environment.getProject();
|
Project project = environment.getProject();
|
||||||
this.psiFileFactory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project);
|
this.psiFileFactory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project);
|
||||||
this.trace = new BindingTraceContext();
|
this.trace = new BindingTraceContext();
|
||||||
this.module = AnalyzerFacadeForJVM.createJavaModule("<repl>");
|
this.module = TopDownAnalyzerFacadeForJVM.createJavaModule("<repl>");
|
||||||
TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.createForLocalDeclarations(
|
TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.createForLocalDeclarations(
|
||||||
new LockBasedStorageManager(),
|
new LockBasedStorageManager(),
|
||||||
new ExceptionTracker(), // dummy
|
new ExceptionTracker(), // dummy
|
||||||
|
|||||||
+2
-1
@@ -19,6 +19,7 @@ package org.jetbrains.jet.di;
|
|||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTrace;
|
import org.jetbrains.jet.lang.resolve.BindingTrace;
|
||||||
import org.jetbrains.jet.context.GlobalContextImpl;
|
import org.jetbrains.jet.context.GlobalContextImpl;
|
||||||
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.storage.LockBasedStorageManager;
|
import org.jetbrains.jet.storage.LockBasedStorageManager;
|
||||||
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
||||||
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
|
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
|
||||||
@@ -82,7 +83,7 @@ public class InjectorForJavaDescriptorResolver {
|
|||||||
this.bindingTrace = bindingTrace;
|
this.bindingTrace = bindingTrace;
|
||||||
this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext();
|
this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext();
|
||||||
this.lockBasedStorageManager = globalContext.getStorageManager();
|
this.lockBasedStorageManager = globalContext.getStorageManager();
|
||||||
this.module = org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM.createJavaModule("<fake-jdr-module>");
|
this.module = TopDownAnalyzerFacadeForJVM.createJavaModule("<fake-jdr-module>");
|
||||||
this.javaClassFinder = new JavaClassFinderImpl();
|
this.javaClassFinder = new JavaClassFinderImpl();
|
||||||
this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder.SERVICE.getInstance(project);
|
this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder.SERVICE.getInstance(project);
|
||||||
this.deserializedDescriptorResolver = new DeserializedDescriptorResolver();
|
this.deserializedDescriptorResolver = new DeserializedDescriptorResolver();
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public object JvmAnalyzerFacade : AnalyzerFacade<JvmResolverForModule, JvmPlatfo
|
|||||||
return JvmResolverForModule(resolveSession, javaDescriptorResolver)
|
return JvmResolverForModule(resolveSession, javaDescriptorResolver)
|
||||||
}
|
}
|
||||||
|
|
||||||
override val defaultImports = AnalyzerFacadeForJVM.DEFAULT_IMPORTS
|
override val defaultImports = TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS
|
||||||
override val platformToKotlinClassMap = JavaToKotlinClassMap.getInstance()
|
override val platformToKotlinClassMap = JavaToKotlinClassMap.getInstance()
|
||||||
|
|
||||||
}
|
}
|
||||||
+2
-2
@@ -42,7 +42,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public enum AnalyzerFacadeForJVM {
|
public enum TopDownAnalyzerFacadeForJVM {
|
||||||
|
|
||||||
INSTANCE;
|
INSTANCE;
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ public enum AnalyzerFacadeForJVM {
|
|||||||
new ImportPath("kotlin.io.*")
|
new ImportPath("kotlin.io.*")
|
||||||
);
|
);
|
||||||
|
|
||||||
private AnalyzerFacadeForJVM() {
|
private TopDownAnalyzerFacadeForJVM() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@@ -58,7 +58,7 @@ import org.jetbrains.jet.lang.diagnostics.Severity;
|
|||||||
import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
|
import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
|
||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.jet.lang.resolve.*;
|
import org.jetbrains.jet.lang.resolve.*;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil;
|
import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil;
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
|
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
@@ -843,7 +843,7 @@ public class JetTestUtils {
|
|||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public static MutablePackageFragmentDescriptor createTestPackageFragment(@NotNull Name testPackageName, @NotNull String moduleName) {
|
public static MutablePackageFragmentDescriptor createTestPackageFragment(@NotNull Name testPackageName, @NotNull String moduleName) {
|
||||||
ModuleDescriptorImpl module = AnalyzerFacadeForJVM.createJavaModule(moduleName);
|
ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule(moduleName);
|
||||||
MutablePackageFragmentProvider provider = new MutablePackageFragmentProvider(module);
|
MutablePackageFragmentProvider provider = new MutablePackageFragmentProvider(module);
|
||||||
module.initialize(provider);
|
module.initialize(provider);
|
||||||
module.addDependencyOnModule(module);
|
module.addDependencyOnModule(module);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
|
|||||||
import org.jetbrains.jet.lang.resolve.*;
|
import org.jetbrains.jet.lang.resolve.*;
|
||||||
import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall;
|
import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall;
|
||||||
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
|
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -88,7 +88,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
|
|||||||
|
|
||||||
// New JavaDescriptorResolver is created for each module, which is good because it emulates different Java libraries for each module,
|
// New JavaDescriptorResolver is created for each module, which is good because it emulates different Java libraries for each module,
|
||||||
// albeit with same class names
|
// albeit with same class names
|
||||||
AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
||||||
getProject(),
|
getProject(),
|
||||||
jetFiles,
|
jetFiles,
|
||||||
moduleTrace,
|
moduleTrace,
|
||||||
@@ -119,7 +119,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
|
|||||||
|
|
||||||
for (TestModule testModule : groupedByModule.keySet()) {
|
for (TestModule testModule : groupedByModule.keySet()) {
|
||||||
if (testModule == null) continue;
|
if (testModule == null) continue;
|
||||||
ModuleDescriptorImpl module = AnalyzerFacadeForJVM.createJavaModule("<" + testModule.getName() + ">");
|
ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule("<" + testModule.getName() + ">");
|
||||||
modules.put(testModule, module);
|
modules.put(testModule, module);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.descriptors.*;
|
|||||||
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
||||||
import org.jetbrains.jet.lang.psi.*;
|
import org.jetbrains.jet.lang.psi.*;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
|
import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
||||||
@@ -62,7 +62,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
|
|||||||
JetFile psiFile = JetPsiFactory(getProject()).createFile(fileText);
|
JetFile psiFile = JetPsiFactory(getProject()).createFile(fileText);
|
||||||
Collection<JetFile> files = Lists.newArrayList(psiFile);
|
Collection<JetFile> files = Lists.newArrayList(psiFile);
|
||||||
|
|
||||||
final ModuleDescriptorImpl lazyModule = AnalyzerFacadeForJVM.createJavaModule("<lazy module>");
|
final ModuleDescriptorImpl lazyModule = TopDownAnalyzerFacadeForJVM.createJavaModule("<lazy module>");
|
||||||
lazyModule.addDependencyOnModule(lazyModule);
|
lazyModule.addDependencyOnModule(lazyModule);
|
||||||
lazyModule.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
lazyModule.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
||||||
lazyModule.seal();
|
lazyModule.seal();
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
|||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
|
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -76,7 +76,7 @@ public class JvmResolveUtil {
|
|||||||
) {
|
) {
|
||||||
BindingTraceContext bindingTraceContext = new BindingTraceContext();
|
BindingTraceContext bindingTraceContext = new BindingTraceContext();
|
||||||
|
|
||||||
ModuleDescriptorImpl module = AnalyzerFacadeForJVM.createJavaModule("<module>");
|
ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createJavaModule("<module>");
|
||||||
module.addDependencyOnModule(module);
|
module.addDependencyOnModule(module);
|
||||||
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
|
||||||
module.seal();
|
module.seal();
|
||||||
@@ -84,7 +84,7 @@ public class JvmResolveUtil {
|
|||||||
if (lightClassGenerationSupport != null) {
|
if (lightClassGenerationSupport != null) {
|
||||||
lightClassGenerationSupport.setModule(module);
|
lightClassGenerationSupport.setModule(module);
|
||||||
}
|
}
|
||||||
return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely,
|
return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely,
|
||||||
module, null, null);
|
module, null, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import org.jetbrains.jet.analyzer.AnalyzerFacade
|
|||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import org.jetbrains.jet.context.GlobalContext
|
import org.jetbrains.jet.context.GlobalContext
|
||||||
import org.jetbrains.jet.analyzer.ResolverForProject
|
import org.jetbrains.jet.analyzer.ResolverForProject
|
||||||
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS
|
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS
|
||||||
import org.jetbrains.jet.lang.PlatformToKotlinClassMap
|
import org.jetbrains.jet.lang.PlatformToKotlinClassMap
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService
|
import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
||||||
@@ -60,7 +60,7 @@ public object JsAnalyzerFacade : AnalyzerFacade<JsResolverForModule, PlatformAna
|
|||||||
return JsResolverForModule(resolveSession)
|
return JsResolverForModule(resolveSession)
|
||||||
}
|
}
|
||||||
|
|
||||||
override val defaultImports = AnalyzerFacadeForJS.DEFAULT_IMPORTS
|
override val defaultImports = TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS
|
||||||
override val platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY
|
override val platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
|
|||||||
import org.jetbrains.jet.lang.psi.*;
|
import org.jetbrains.jet.lang.psi.*;
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
|
||||||
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
|
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
|
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
|
||||||
import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap;
|
import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap;
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
|
import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
|
||||||
@@ -243,7 +243,7 @@ public class JetSourceNavigationHelper {
|
|||||||
);
|
);
|
||||||
|
|
||||||
ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("<library module>"),
|
ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("<library module>"),
|
||||||
AnalyzerFacadeForJVM.DEFAULT_IMPORTS,
|
TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS,
|
||||||
PlatformToKotlinClassMap.EMPTY);
|
PlatformToKotlinClassMap.EMPTY);
|
||||||
|
|
||||||
moduleDescriptor.addDependencyOnModule(moduleDescriptor);
|
moduleDescriptor.addDependencyOnModule(moduleDescriptor);
|
||||||
|
|||||||
@@ -24,13 +24,12 @@ import com.intellij.psi.*;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.jet.lang.psi.*;
|
import org.jetbrains.jet.lang.psi.*;
|
||||||
import org.jetbrains.jet.lang.resolve.ImportPath;
|
import org.jetbrains.jet.lang.resolve.ImportPath;
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||||
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
|
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.resolve.name.NamePackage;
|
import org.jetbrains.jet.lang.resolve.name.NamePackage;
|
||||||
import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
|
import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
|
||||||
import org.jetbrains.jet.plugin.references.JetReference;
|
import org.jetbrains.jet.plugin.references.JetReference;
|
||||||
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
|
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -166,8 +165,8 @@ public class ImportInsertHelper {
|
|||||||
|
|
||||||
public static boolean isImportedWithDefault(@NotNull ImportPath importPath, @NotNull JetFile contextFile) {
|
public static boolean isImportedWithDefault(@NotNull ImportPath importPath, @NotNull JetFile contextFile) {
|
||||||
List<ImportPath> defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile)
|
List<ImportPath> defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile)
|
||||||
? AnalyzerFacadeForJS.DEFAULT_IMPORTS
|
? TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS
|
||||||
: AnalyzerFacadeForJVM.DEFAULT_IMPORTS;
|
: TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS;
|
||||||
return NamePackage.isImported(importPath, defaultImports);
|
return NamePackage.isImported(importPath, defaultImports);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
|
|||||||
import org.jetbrains.jet.lang.resolve.resolveTopLevelClass
|
import org.jetbrains.jet.lang.resolve.resolveTopLevelClass
|
||||||
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
|
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
|
||||||
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
|
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
||||||
|
|
||||||
public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() {
|
public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() {
|
||||||
@@ -57,11 +57,11 @@ public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase(
|
|||||||
|
|
||||||
class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompiler {
|
class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompiler {
|
||||||
val module: ModuleDescriptor = run {
|
val module: ModuleDescriptor = run {
|
||||||
val module = AnalyzerFacadeForJVM.createJavaModule("<module for resolving stdlib with java top down analysis>")
|
val module = TopDownAnalyzerFacadeForJVM.createJavaModule("<module for resolving stdlib with java top down analysis>")
|
||||||
module.addDependencyOnModule(module)
|
module.addDependencyOnModule(module)
|
||||||
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
|
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
|
||||||
module.seal()
|
module.seal()
|
||||||
AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
||||||
project, listOf(), BindingTraceContext(), { false },
|
project, listOf(), BindingTraceContext(), { false },
|
||||||
module, null, null
|
module, null, null
|
||||||
).getModuleDescriptor()
|
).getModuleDescriptor()
|
||||||
|
|||||||
+2
-2
@@ -39,14 +39,14 @@ import org.jetbrains.k2js.config.Config;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public final class AnalyzerFacadeForJS {
|
public final class TopDownAnalyzerFacadeForJS {
|
||||||
public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
|
public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
|
||||||
new ImportPath("js.*"),
|
new ImportPath("js.*"),
|
||||||
new ImportPath("java.lang.*"),
|
new ImportPath("java.lang.*"),
|
||||||
new ImportPath("kotlin.*")
|
new ImportPath("kotlin.*")
|
||||||
);
|
);
|
||||||
|
|
||||||
private AnalyzerFacadeForJS() {
|
private TopDownAnalyzerFacadeForJS() {
|
||||||
}
|
}
|
||||||
|
|
||||||
//NOTE: web demo related method
|
//NOTE: web demo related method
|
||||||
@@ -27,7 +27,7 @@ import org.jetbrains.jet.OutputFileCollection;
|
|||||||
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
|
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
|
||||||
import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
|
import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
|
||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
|
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
|
||||||
import org.jetbrains.k2js.config.Config;
|
import org.jetbrains.k2js.config.Config;
|
||||||
import org.jetbrains.k2js.config.EcmaVersion;
|
import org.jetbrains.k2js.config.EcmaVersion;
|
||||||
import org.jetbrains.k2js.facade.MainCallParameters;
|
import org.jetbrains.k2js.facade.MainCallParameters;
|
||||||
@@ -76,8 +76,8 @@ public final class TranslationUtils {
|
|||||||
return isFileWithCode((JetFile) file);
|
return isFileWithCode((JetFile) file);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
AnalyzeExhaust exhaust = AnalyzerFacadeForJS.analyzeFiles(allLibFiles, filesWithCode, Config.getEmptyConfig(project));
|
AnalyzeExhaust exhaust = TopDownAnalyzerFacadeForJS.analyzeFiles(allLibFiles, filesWithCode, Config.getEmptyConfig(project));
|
||||||
AnalyzerFacadeForJS.checkForErrors(allLibFiles, exhaust.getBindingContext());
|
TopDownAnalyzerFacadeForJS.checkForErrors(allLibFiles, exhaust.getBindingContext());
|
||||||
cachedLibraryExhaust = new SoftReference<AnalyzeExhaust>(exhaust);
|
cachedLibraryExhaust = new SoftReference<AnalyzeExhaust>(exhaust);
|
||||||
return exhaust;
|
return exhaust;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
|
|||||||
import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
|
import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
|
||||||
import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;
|
import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;
|
||||||
import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
|
import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
|
||||||
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
|
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
|
||||||
import org.jetbrains.k2js.config.Config;
|
import org.jetbrains.k2js.config.Config;
|
||||||
import org.jetbrains.k2js.facade.exceptions.TranslationException;
|
import org.jetbrains.k2js.facade.exceptions.TranslationException;
|
||||||
import org.jetbrains.k2js.translate.general.Translation;
|
import org.jetbrains.k2js.translate.general.Translation;
|
||||||
@@ -145,9 +145,9 @@ public final class K2JSTranslator {
|
|||||||
public JsProgram generateProgram(@NotNull List<JetFile> filesToTranslate,
|
public JsProgram generateProgram(@NotNull List<JetFile> filesToTranslate,
|
||||||
@NotNull MainCallParameters mainCallParameters)
|
@NotNull MainCallParameters mainCallParameters)
|
||||||
throws TranslationException {
|
throws TranslationException {
|
||||||
AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJS.analyzeFiles(filesToTranslate, Predicates.<PsiFile>alwaysTrue(), config);
|
AnalyzeExhaust analyzeExhaust = TopDownAnalyzerFacadeForJS.analyzeFiles(filesToTranslate, Predicates.<PsiFile>alwaysTrue(), config);
|
||||||
BindingContext bindingContext = analyzeExhaust.getBindingContext();
|
BindingContext bindingContext = analyzeExhaust.getBindingContext();
|
||||||
AnalyzerFacadeForJS.checkForErrors(Config.withJsLibAdded(filesToTranslate, config), bindingContext);
|
TopDownAnalyzerFacadeForJS.checkForErrors(Config.withJsLibAdded(filesToTranslate, config), bindingContext);
|
||||||
ModuleDescriptor moduleDescriptor = analyzeExhaust.getModuleDescriptor();
|
ModuleDescriptor moduleDescriptor = analyzeExhaust.getModuleDescriptor();
|
||||||
return Translation.generateAst(bindingContext, filesToTranslate, mainCallParameters, moduleDescriptor, config);
|
return Translation.generateAst(bindingContext, filesToTranslate, mainCallParameters, moduleDescriptor, config);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
|
|||||||
import com.intellij.openapi.util.Disposer
|
import com.intellij.openapi.util.Disposer
|
||||||
import org.jetbrains.jet.config.CompilerConfiguration
|
import org.jetbrains.jet.config.CompilerConfiguration
|
||||||
import org.jetbrains.jet.config.CommonConfigurationKeys
|
import org.jetbrains.jet.config.CommonConfigurationKeys
|
||||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM
|
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM
|
||||||
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
||||||
import org.jetbrains.jet.lang.resolve.name.Name
|
import org.jetbrains.jet.lang.resolve.name.Name
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName
|
import org.jetbrains.jet.lang.resolve.name.FqName
|
||||||
@@ -103,10 +103,10 @@ class NoInternalVisibilityInStdLibTest {
|
|||||||
configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "../src/kotlin")
|
configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, "../src/kotlin")
|
||||||
configuration.addAll(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.getJdkClassesRoots())
|
configuration.addAll(JVMConfigurationKeys.CLASSPATH_KEY, PathUtil.getJdkClassesRoots())
|
||||||
val environment = JetCoreEnvironment.createForProduction(disposable, configuration)
|
val environment = JetCoreEnvironment.createForProduction(disposable, configuration)
|
||||||
val module = AnalyzerFacadeForJVM.createJavaModule("<module for validating std lib>")
|
val module = TopDownAnalyzerFacadeForJVM.createJavaModule("<module for validating std lib>")
|
||||||
module.addDependencyOnModule(module)
|
module.addDependencyOnModule(module)
|
||||||
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
|
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
|
||||||
AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
|
||||||
environment.getProject(),
|
environment.getProject(),
|
||||||
environment.getSourceFiles(),
|
environment.getSourceFiles(),
|
||||||
BindingTraceContext(),
|
BindingTraceContext(),
|
||||||
|
|||||||
Reference in New Issue
Block a user