From 98e9b387b6962f463e05b134d39d29ea653b682e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 8 Nov 2013 13:51:21 +0400 Subject: [PATCH] JetCompiler (non JPS) -> K2JvmTranslatingCompiler; K2JSCompiler (non JPS) -> K2JsTranslatingCompiler. --- .../org/jetbrains/jet/plugin/compiler/JetCompilerManager.java | 4 ++-- .../{K2JSCompiler.java => K2JsTranslatingCompiler.java} | 2 +- .../{JetCompiler.java => K2JvmTranslatingCompiler.java} | 2 +- .../jet/plugin/compilerMessages/JetCompilerMessagingTest.java | 4 ++-- .../plugin/compilerMessages/K2JSCompilerMessagingTest.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename idea/src/org/jetbrains/jet/plugin/compiler/{K2JSCompiler.java => K2JsTranslatingCompiler.java} (98%) rename idea/src/org/jetbrains/jet/plugin/compiler/{JetCompiler.java => K2JvmTranslatingCompiler.java} (99%) diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java index 0013db1b95c..132990b5e92 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java @@ -48,10 +48,10 @@ public class JetCompilerManager implements ProjectComponent { private static final Set FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(".js", ".map"); public JetCompilerManager(Project project, CompilerManager manager) { - manager.addTranslatingCompiler(new JetCompiler(), + manager.addTranslatingCompiler(new K2JvmTranslatingCompiler(), Collections.singleton(JetFileType.INSTANCE), Collections.singleton(StdFileTypes.CLASS)); - manager.addTranslatingCompiler(new K2JSCompiler(), + manager.addTranslatingCompiler(new K2JsTranslatingCompiler(), Collections.singleton(JetFileType.INSTANCE), Collections.singleton(StdFileTypes.JS)); manager.addCompilableFileType(JetFileType.INSTANCE); diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JsTranslatingCompiler.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java rename to idea/src/org/jetbrains/jet/plugin/compiler/K2JsTranslatingCompiler.java index a26c2960171..a9fb5a12a58 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JsTranslatingCompiler.java @@ -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)) { diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java rename to idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java index bcce37f9a5b..c9dabbf914a 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java @@ -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)) { diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java index b315fb6893d..ab20baf94af 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java @@ -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 whatToExpect) { - performTest(whatToExpect, getCompiler(JetCompiler.class), TEST_DATA_PATH); + performTest(whatToExpect, getCompiler(K2JvmTranslatingCompiler.class), TEST_DATA_PATH); } @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java index cc4480080fc..eb3ab6bda2f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java @@ -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 whatToExpect) { - performTest(whatToExpect, getCompiler(K2JSCompiler.class), TEST_DATA_PATH); + performTest(whatToExpect, getCompiler(K2JsTranslatingCompiler.class), TEST_DATA_PATH); } @Override