From 480dd6767c813826980e520d8ffe6ae25067a092 Mon Sep 17 00:00:00 2001
From: Ilya Ryzhenkov <orangy@jetbrains.com>
Date: Wed, 19 Mar 2014 13:55:33 +0400
Subject: [PATCH] Convert module scripting to .ktm extension.

---
 .../jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java  | 2 +-
 .../src/org/jetbrains/kotlin/CompilerSmokeTest.java             | 2 +-
 .../testData/compileAndRunModule/{Smoke.kts => Smoke.ktm}       | 0
 compiler/testData/compiler/smoke/{Smoke.kts => Smoke.ktm}       | 0
 .../org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java  | 2 +-
 .../jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename compiler/integration-tests/testData/compileAndRunModule/{Smoke.kts => Smoke.ktm} (100%)
 rename compiler/testData/compiler/smoke/{Smoke.kts => Smoke.ktm} (100%)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 432a1c2cfe1..6f42362ab33 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -74,7 +74,7 @@ public class CompileEnvironmentUtil {
             return ModuleChunk.EMPTY;
         }
         String extension = FileUtilRt.getExtension(moduleDefinitionFile);
-        if ("kts".equalsIgnoreCase(extension)) {
+        if ("ktm".equalsIgnoreCase(extension)) {
             return new ModuleChunk(loadModuleScript(paths, moduleDefinitionFile, messageCollector));
         }
         if ("xml".equalsIgnoreCase(extension)) {
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
index 4650572f645..f9c87e96f20 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
+++ b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
@@ -52,7 +52,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase {
     public void compileAndRunModule() throws Exception {
         String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "smoke.jar";
 
-        assertEquals("compilation failed", 0, runCompiler("Smoke.compile", "-module", "Smoke.kts", "-jar", jar));
+        assertEquals("compilation failed", 0, runCompiler("Smoke.compile", "-module", "Smoke.ktm", "-jar", jar));
         runJava("Smoke.run", "-cp", jar + File.pathSeparator + getKotlinRuntimePath(), "Smoke.SmokePackage", "1", "2", "3");
     }
 
diff --git a/compiler/integration-tests/testData/compileAndRunModule/Smoke.kts b/compiler/integration-tests/testData/compileAndRunModule/Smoke.ktm
similarity index 100%
rename from compiler/integration-tests/testData/compileAndRunModule/Smoke.kts
rename to compiler/integration-tests/testData/compileAndRunModule/Smoke.ktm
diff --git a/compiler/testData/compiler/smoke/Smoke.kts b/compiler/testData/compiler/smoke/Smoke.ktm
similarity index 100%
rename from compiler/testData/compiler/smoke/Smoke.kts
rename to compiler/testData/compiler/smoke/Smoke.ktm
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
index 470f840d808..c27085db452 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
@@ -45,7 +45,7 @@ public class CompileEnvironmentTest extends TestCase {
             File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
             File resultJar = new File(tempDir, "result.jar");
             ExitCode rv = new K2JVMCompiler().exec(System.out,
-                                                   "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kts",
+                                                   "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.ktm",
                                                    "-jar", resultJar.getAbsolutePath(),
                                                    "-noStdlib",
                                                    "-classpath", stdlib.getAbsolutePath(),
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
index c9dabbf914a..9f9d7163baf 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
@@ -177,7 +177,7 @@ public class K2JvmTranslatingCompiler implements TranslatingCompiler {
                 outputDirectoriesToFilter
         ).asText();
 
-        File scriptFile = new File(outputDir, "script.kts");
+        File scriptFile = new File(outputDir, "script.ktm");
         try {
             FileUtil.writeToFile(scriptFile, script.toString());
         }