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

Cosmetics

Browse Source
This commit is contained in:
pTalanov
2012-06-05 19:28:53 +04:00
parent 95e3080cc7
commit 6b9495a159
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+2 -1
View File
@@ -88,6 +88,7 @@ public abstract class BasicTest extends TestWithEnvironment {
assert success;
}
@NotNull
protected List<String> additionalJSFiles(@NotNull EcmaVersion ecmaVersion) {
List<String> list = Lists.newArrayList();
list.add(ecmaVersion == EcmaVersion.v5 ? KOTLIN_JS_LIB_ECMA_5 : KOTLIN_JS_LIB_ECMA_3);
@@ -160,7 +161,7 @@ public abstract class BasicTest extends TestWithEnvironment {
}
@NotNull
protected List<String> withAdditionalFiles(@NotNull String inputFile, EcmaVersion ecmaVersion) {
protected List<String> withAdditionalFiles(@NotNull String inputFile, @NotNull EcmaVersion ecmaVersion) {
List<String> allFiles = Lists.newArrayList(additionalJSFiles(ecmaVersion));
allFiles.add(inputFile);
return allFiles;
js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java
+1
View File
@@ -36,6 +36,7 @@ public final class NativeInteropTest extends SingleFileTranslationTest {
super("native/");
}
@NotNull
@Override
protected List<String> additionalJSFiles(@NotNull EcmaVersion ecmaVersion) {
List<String> result = Lists.newArrayList(super.additionalJSFiles(ecmaVersion));
js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
+12 -18
View File
@@ -18,7 +18,6 @@ package org.jetbrains.k2js.analyze;
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;
@@ -92,14 +91,16 @@ public final class AnalyzerFacadeForJS {
completely, false, false, Collections.<AnalyzerScriptParameter>emptyList());
InjectorForTopDownAnalyzerForJs injector = new InjectorForTopDownAnalyzerForJs(
project, topDownAnalysisParameters, new ObservableBindingTrace(bindingTraceContext), owner, JsConfiguration.jsLibConfiguration(project));
project, topDownAnalysisParameters, new ObservableBindingTrace(bindingTraceContext), owner,
JsConfiguration.jsLibConfiguration(project));
try {
injector.getTopDownAnalyzer().analyzeFiles(withJsLibAdded(files, config), Collections.<AnalyzerScriptParameter>emptyList());
BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ?
new CachedBodiesResolveContext(injector.getTopDownAnalysisContext()) :
null;
return AnalyzeExhaust.success(bindingTraceContext.getBindingContext(), JetStandardLibrary.getInstance(), bodiesResolveContext);
} finally {
}
finally {
injector.destroy();
}
}
@@ -114,19 +115,21 @@ public final class AnalyzerFacadeForJS {
final ModuleDescriptor owner = new ModuleDescriptor(Name.special("<module>"));
Predicate<PsiFile> completely = Predicates.and(notLibFiles(config.getLibFiles()), filesToAnalyzeCompletely);
TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters(completely, false, false, Collections.<AnalyzerScriptParameter>emptyList());
TopDownAnalysisParameters topDownAnalysisParameters =
new TopDownAnalysisParameters(completely, false, false, Collections.<AnalyzerScriptParameter>emptyList());
InjectorForTopDownAnalyzerForJs injector = new InjectorForTopDownAnalyzerForJs(
project, topDownAnalysisParameters, new ObservableBindingTrace(traceContext), owner, JsConfiguration.jsLibConfiguration(project));
project, topDownAnalysisParameters, new ObservableBindingTrace(traceContext), owner,
JsConfiguration.jsLibConfiguration(project));
try {
bodiesResolveContext.setTopDownAnalysisParameters(topDownAnalysisParameters);
injector.getTopDownAnalyzer().doProcessForBodies(bodiesResolveContext);
return AnalyzeExhaust.success(traceContext.getBindingContext(), JetStandardLibrary.getInstance());
} finally {
}
finally {
injector.destroy();
}
}
private static void checkForErrors(@NotNull Collection<JetFile> allFiles, @NotNull BindingContext bindingContext) {
@@ -139,8 +142,8 @@ public final class AnalyzerFacadeForJS {
@NotNull
public static Collection<JetFile> withJsLibAdded(@NotNull Collection<JetFile> files, @NotNull Config config) {
Set<JetFile> allFiles = Sets.newHashSet();
allFiles.addAll(toOriginal(files));
allFiles.addAll(toOriginal(config.getLibFiles()));
allFiles.addAll(files);
allFiles.addAll(config.getLibFiles());
return allFiles;
}
@@ -156,15 +159,6 @@ public final class AnalyzerFacadeForJS {
};
}
@NotNull
private static Collection<JetFile> toOriginal(@NotNull Collection<JetFile> files) {
Collection<JetFile> result = Lists.newArrayList();
for (JetFile file : files) {
result.add(file);
}
return result;
}
private static final class JsConfiguration implements ModuleConfiguration {
@NotNull