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

Separate library files which contain code and those which declarations only. Fixes builder test/

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-07-02 16:29:10 +04:00
parent 96b6f0955e
commit 5004b2e01b
4 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
+1 -1
View File
@@ -36,7 +36,7 @@ public final class WebDemoExamples2Test extends SingleFileTranslationTest {
performTestWithMain("life", "", "2");
}
public void _testBuilder() throws Exception {
public void testBuilder() throws Exception {
performTestWithMain("builder", "");
performTestWithMain("builder", "1", "over9000");
}
js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java
+33 -7
View File
@@ -17,7 +17,8 @@
package org.jetbrains.k2js.test.utils;
import closurecompiler.internal.com.google.common.collect.Maps;
import com.google.common.base.Predicates;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.dart.compiler.backend.js.ast.JsProgram;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
@@ -58,23 +59,48 @@ public final class TranslationUtils {
private static BindingContext libraryContext = null;
@NotNull
public static BindingContext getLibraryContext(@NotNull Project project, @NotNull List<JetFile> files) {
public static BindingContext getLibraryContext(@NotNull Project project, @NotNull List<JetFile> allLibFiles) {
if (libraryContext == null) {
Predicate<PsiFile> filesWithCode = new Predicate<PsiFile>() {
@Override
public boolean apply(@javax.annotation.Nullable PsiFile file) {
return isFileWithCode((JetFile) file);
}
};
AnalyzeExhaust exhaust = AnalyzerFacadeForJS
.analyzeFiles(files, Predicates.<PsiFile>alwaysFalse(),
Config.getEmptyConfig(project));
.analyzeFiles(allLibFiles, filesWithCode, Config.getEmptyConfig(project));
libraryContext = exhaust.getBindingContext();
AnalyzerFacadeForJS.checkForErrors(files, libraryContext);
AnalyzerFacadeForJS.checkForErrors(allLibFiles, libraryContext);
}
return libraryContext;
}
@NotNull
public static List<JetFile> getFilesWithCode(@NotNull List<JetFile> allLibFiles) {
List<JetFile> result = Lists.newArrayList();
for (JetFile file : allLibFiles) {
if (isFileWithCode(file)) {
result.add(file);
}
}
return result;
}
private static boolean isFileWithCode(@NotNull JetFile file) {
for (String filename : Config.LIB_FILES_WITH_CODE) {
if (file.getName().contains(filename)) {
return true;
}
}
return false;
}
@NotNull
public static Config getConfig(@NotNull Project project, @NotNull EcmaVersion version) {
Config config = testConfigs.get(version);
if (config == null) {
List<JetFile> files = initLibFiles(project);
config = new TestConfig(project, version, files, getLibraryContext(project, files));
List<JetFile> allLibFiles = initLibFiles(project);
config = new TestConfig(project, version, getFilesWithCode(allLibFiles), getLibraryContext(project, allLibFiles));
testConfigs.put(version, config);
}
return config;