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

Rename Config -> JsConfig

Browse Source
This commit is contained in:
Alexander Udalov
2016-05-23 18:26:32 +03:00
parent 2bd3211ba8
commit 116e4a5ced
12 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java
+5 -8
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.frontend.js.di.InjectionKt;
import org.jetbrains.kotlin.js.analyzer.JsAnalysisResult;
import org.jetbrains.kotlin.js.config.Config;
import org.jetbrains.kotlin.js.config.JsConfig;
import org.jetbrains.kotlin.js.resolve.JsPlatform;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtFile;
@@ -41,10 +41,7 @@ public final class TopDownAnalyzerFacadeForJS {
}
@NotNull
public static JsAnalysisResult analyzeFiles(
@NotNull Collection<KtFile> files,
@NotNull Config config
) {
public static JsAnalysisResult analyzeFiles(@NotNull Collection<KtFile> files, @NotNull JsConfig config) {
BindingTrace trace = new BindingTraceContext();
MutableModuleContext newModuleContext = ContextKt.ContextForNewModule(
@@ -56,7 +53,7 @@ public final class TopDownAnalyzerFacadeForJS {
}
@NotNull
private static List<ModuleDescriptorImpl> computeDependencies(ModuleDescriptorImpl module, @NotNull Config config) {
private static List<ModuleDescriptorImpl> computeDependencies(ModuleDescriptorImpl module, @NotNull JsConfig config) {
List<ModuleDescriptorImpl> allDependencies = new ArrayList<ModuleDescriptorImpl>();
allDependencies.add(module);
allDependencies.addAll(config.getModuleDescriptors());
@@ -69,9 +66,9 @@ public final class TopDownAnalyzerFacadeForJS {
@NotNull Collection<KtFile> files,
@NotNull BindingTrace trace,
@NotNull ModuleContext moduleContext,
@NotNull Config config
@NotNull JsConfig config
) {
Collection<KtFile> allFiles = Config.withJsLibAdded(files, config);
Collection<KtFile> allFiles = JsConfig.withJsLibAdded(files, config);
LazyTopDownAnalyzerForTopLevel analyzerForJs = InjectionKt.createTopDownAnalyzerForJs(
moduleContext, trace,
js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java → js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java
+3 -3
View File
@@ -41,7 +41,7 @@ import java.util.List;
/**
* Base class representing a configuration of translator.
*/
public abstract class Config {
public abstract class JsConfig {
private final boolean inlineEnabled;
@NotNull
private final Project project;
@@ -67,7 +67,7 @@ public abstract class Config {
private boolean initialized = false;
protected Config(
protected JsConfig(
@NotNull Project project,
@NotNull String moduleId,
@NotNull EcmaVersion ecmaVersion,
@@ -176,7 +176,7 @@ public abstract class Config {
}
@NotNull
public static Collection<KtFile> withJsLibAdded(@NotNull Collection<KtFile> files, @NotNull Config config) {
public static Collection<KtFile> withJsLibAdded(@NotNull Collection<KtFile> files, @NotNull JsConfig config) {
Collection<KtFile> allFiles = Lists.newArrayList();
allFiles.addAll(files);
allFiles.addAll(config.getSourceFilesFromLibraries());
js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
+2 -2
View File
@@ -43,7 +43,7 @@ import java.util.List;
import static org.jetbrains.kotlin.utils.LibraryUtils.isOldKotlinJavascriptLibrary;
import static org.jetbrains.kotlin.utils.PathUtil.getKotlinPathsForDistDirectory;
public class LibrarySourcesConfig extends Config {
public class LibrarySourcesConfig extends JsConfig {
public static final List<String> JS_STDLIB =
Collections.singletonList(getKotlinPathsForDistDirectory().getJsStdLibJarPath().getAbsolutePath());
@@ -236,7 +236,7 @@ public class LibrarySourcesConfig extends Config {
return this;
}
public Config build() {
public JsConfig build() {
return new LibrarySourcesConfig(project, moduleId, files, ecmaVersion, sourceMap, inlineEnabled, isUnitTestConfig, metaInfo, kjsm);
}
}