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

JetCompiler (non JPS) -> K2JvmTranslatingCompiler;

Browse Source 
K2JSCompiler (non JPS) -> K2JsTranslatingCompiler.
This commit is contained in:
Zalim Bashorov
2013-11-08 13:51:21 +04:00
parent e5a58e0c70
commit 98e9b387b6
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
+2 -2
View File
@@ -48,10 +48,10 @@ public class JetCompilerManager implements ProjectComponent {
private static final Set<String> FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(".js", ".map");
public JetCompilerManager(Project project, CompilerManager manager) {
manager.addTranslatingCompiler(new JetCompiler(),
manager.addTranslatingCompiler(new K2JvmTranslatingCompiler(),
Collections.<FileType>singleton(JetFileType.INSTANCE),
Collections.singleton(StdFileTypes.CLASS));
manager.addTranslatingCompiler(new K2JSCompiler(),
manager.addTranslatingCompiler(new K2JsTranslatingCompiler(),
Collections.<FileType>singleton(JetFileType.INSTANCE),
Collections.<FileType>singleton(StdFileTypes.JS));
manager.addCompilableFileType(JetFileType.INSTANCE);
idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java → idea/src/org/jetbrains/jet/plugin/compiler/K2JsTranslatingCompiler.java
+1 -1
View File
@@ -47,7 +47,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public final class K2JSCompiler implements TranslatingCompiler {
public final class K2JsTranslatingCompiler implements TranslatingCompiler {
@Override
public boolean isCompilableFile(VirtualFile file, CompileContext context) {
if (!(file.getFileType() instanceof JetFileType)) {
idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java → idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
+1 -1
View File
@@ -47,7 +47,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
public class JetCompiler implements TranslatingCompiler {
public class K2JvmTranslatingCompiler implements TranslatingCompiler {
@Override
public boolean isCompilableFile(VirtualFile virtualFile, CompileContext compileContext) {
if (!(virtualFile.getFileType() instanceof JetFileType)) {
idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.compilerMessages;
import jet.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.compiler.JetCompiler;
import org.jetbrains.jet.plugin.compiler.K2JvmTranslatingCompiler;
import static org.jetbrains.jet.plugin.compilerMessages.Message.error;
import static org.jetbrains.jet.plugin.compilerMessages.Message.warning;
@@ -75,7 +75,7 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest {
}
private void doTest(@NotNull Function1<MessageChecker, Void> whatToExpect) {
performTest(whatToExpect, getCompiler(JetCompiler.class), TEST_DATA_PATH);
performTest(whatToExpect, getCompiler(K2JvmTranslatingCompiler.class), TEST_DATA_PATH);
}
@Override
idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.util.PathUtil;
import jet.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.compiler.K2JSCompiler;
import org.jetbrains.jet.plugin.compiler.K2JsTranslatingCompiler;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import java.io.File;
@@ -95,7 +95,7 @@ public final class K2JSCompilerMessagingTest extends IDECompilerMessagingTest {
}
private void doTest(@NotNull Function1<MessageChecker, Void> whatToExpect) {
performTest(whatToExpect, getCompiler(K2JSCompiler.class), TEST_DATA_PATH);
performTest(whatToExpect, getCompiler(K2JsTranslatingCompiler.class), TEST_DATA_PATH);
}
@Override