From eb5455e89f98828fac4e857956478511c8dc7beb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Oct 2013 19:13:56 +0400 Subject: [PATCH] Got rid of "jet" file extension. --- .../compiler/android/CodegenTestsOnAndroidGenerator.java | 2 +- .../jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java | 1 - .../src/org/jetbrains/jet/lang/psi/JetPsiFactory.java | 2 +- .../src/org/jetbrains/jet/asJava/LightClassUtil.java | 2 +- .../{AnonymousInitializers.jet => AnonymousInitializers.kt} | 0 compiler/testData/cfg/{ArrayAccess.jet => ArrayAccess.kt} | 0 compiler/testData/cfg/{Assignments.jet => Assignments.kt} | 0 compiler/testData/cfg/{Basic.jet => Basic.kt} | 0 compiler/testData/cfg/{DeadCode.jet => DeadCode.kt} | 0 .../cfg/{DelegatedProperty.jet => DelegatedProperty.kt} | 0 .../testData/cfg/{EmptyFunction.jet => EmptyFunction.kt} | 0 compiler/testData/cfg/{FailFunction.jet => FailFunction.kt} | 0 compiler/testData/cfg/{Finally.jet => Finally.kt} | 0 .../cfg/{FinallyTestCopy.jet => FinallyTestCopy.kt} | 0 compiler/testData/cfg/{For.jet => For.kt} | 0 compiler/testData/cfg/{If.jet => If.kt} | 0 compiler/testData/cfg/{LazyBooleans.jet => LazyBooleans.kt} | 0 .../cfg/{LocalDeclarations.jet => LocalDeclarations.kt} | 0 compiler/testData/cfg/{MultiDecl.jet => MultiDecl.kt} | 0 .../cfg/{ObjectExpression.jet => ObjectExpression.kt} | 0 ...lyWhileInFunctionBody.jet => OnlyWhileInFunctionBody.kt} | 0 .../{ReturnFromExpression.jet => ReturnFromExpression.kt} | 0 .../testData/cfg/{ShortFunction.jet => ShortFunction.kt} | 0 .../diagnostics/checkerTestUtil/{test.jet => test.kt} | 0 compiler/tests/org/jetbrains/jet/JetLiteFixture.java | 4 ++-- compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java | 2 +- .../tests/org/jetbrains/jet/cfg/JetControlFlowTest.java | 2 +- .../jet/generators/builtins/BuiltInsSerializer.java | 2 +- .../jetbrains/jet/generators/runtime/GenerateFunctions.java | 6 +++--- idea/builtinsSrc/jet/{Any.jet => Any.kt} | 0 idea/builtinsSrc/jet/{Arrays.jet => Arrays.kt} | 0 idea/builtinsSrc/jet/{Collections.jet => Collections.kt} | 0 idea/builtinsSrc/jet/{Enum.jet => Enum.kt} | 0 .../jet/{ExtensionFunctions.jet => ExtensionFunctions.kt} | 0 idea/builtinsSrc/jet/{Functions.jet => Functions.kt} | 0 idea/builtinsSrc/jet/{Iterators.jet => Iterators.kt} | 0 .../jet/{KExtensionFunctions.jet => KExtensionFunctions.kt} | 0 idea/builtinsSrc/jet/{KFunctions.jet => KFunctions.kt} | 0 .../jet/{KMemberFunctions.jet => KMemberFunctions.kt} | 0 idea/builtinsSrc/jet/{Library.jet => Library.kt} | 0 idea/builtinsSrc/jet/{Nothing.jet => Nothing.kt} | 0 idea/builtinsSrc/jet/{Numbers.jet => Numbers.kt} | 0 idea/builtinsSrc/jet/{Progressions.jet => Progressions.kt} | 0 idea/builtinsSrc/jet/{Ranges.jet => Ranges.kt} | 0 idea/builtinsSrc/jet/{Unit.jet => Unit.kt} | 0 idea/src/org/jetbrains/jet/plugin/JetFileFactory.java | 3 +-- idea/testData/resolve/builtins/any.kt | 2 +- idea/testData/resolve/builtins/emptyRange.kt | 2 +- idea/testData/resolve/builtins/equals.kt | 2 +- idea/testData/resolve/builtins/function.kt | 2 +- idea/testData/resolve/builtins/int.kt | 2 +- idea/testData/resolve/builtins/intArrayConstructor.kt | 2 +- idea/testData/resolve/builtins/nothing.kt | 2 +- idea/testData/resolve/builtins/times.kt | 2 +- idea/testData/resolve/builtins/toString.kt | 2 +- idea/testData/resolve/builtins/unit.kt | 2 +- .../org/jetbrains/k2js/test/semantics/FunctionTest.java | 2 +- .../test/org/jetbrains/k2js/test/semantics/MiscTest.java | 2 +- .../test/org/jetbrains/k2js/test/semantics/TraitTest.java | 2 +- .../k2js/test/semantics/TranslatorTestCaseBuilder.java | 4 +--- .../src/org/jetbrains/k2js/utils/JetFileUtils.java | 2 +- .../additional/cases/{defaultargs.jet => defaultargs.kt} | 0 .../additional/cases/{defaultargs1.jet => defaultargs1.kt} | 0 .../additional/cases/{defaultargs2.jet => defaultargs2.kt} | 0 .../additional/cases/{defaultargs3.jet => defaultargs3.kt} | 0 .../additional/cases/{defaultargs4.jet => defaultargs4.kt} | 0 .../additional/cases/{defaultargs5.jet => defaultargs5.kt} | 0 .../{closureWithParameter.jet => closureWithParameter.kt} | 0 ...ameterAndBoxing.jet => closureWithParameterAndBoxing.kt} | 0 .../cases/{diamondInheritance.jet => diamondInheritance.kt} | 0 ...osedLocalVariable.jet => doubleEnclosedLocalVariable.kt} | 0 ...enclosingLocalVariable.jet => enclosingLocalVariable.kt} | 0 .../cases/{extensionClosure.jet => extensionClosure.kt} | 0 .../examples/cases/{funDelegation.jet => funDelegation.kt} | 0 .../cases/{inheritedMethod.jet => inheritedMethod.kt} | 0 .../cases/{initializerBlock.jet => initializerBlock.kt} | 0 .../testFiles/examples/cases/{kt242.jet => kt242.kt} | 0 ...aultConstructor.jet => newInstanceDefaultConstructor.kt} | 0 ...overloadBinaryOperator.jet => overloadBinaryOperator.kt} | 0 ...loadPlusAssignReturn.jet => overloadPlusAssignReturn.kt} | 0 ...loadPlusToPlusAssign.jet => overloadPlusToPlusAssign.kt} | 0 .../{overloadUnaryOperator.jet => overloadUnaryOperator.kt} | 0 .../cases/{propertyDelegation.jet => propertyDelegation.kt} | 0 .../cases/{rightHandOverride.jet => rightHandOverride.kt} | 0 .../cases/{simplestClosure.jet => simplestClosure.kt} | 0 ...lestClosureAndBoxing.jet => simplestClosureAndBoxing.kt} | 0 .../unsupported/{basicmethod.jet => basicmethod.kt} | 0 .../unsupported/{basicproperty.jet => basicproperty.kt} | 0 .../unsupported/{classObject.jet => classObject.kt} | 0 .../{classObjectInterface.jet => classObjectInterface.kt} | 0 .../{classObjectMethod.jet => classObjectMethod.kt} | 0 .../sortedTests/unsupported/{enclosed.jet => enclosed.kt} | 0 .../{forwardTypeParameter.jet => forwardTypeParameter.kt} | 0 .../unsupported/{inheritance.jet => inheritance.kt} | 0 .../{inheritedInnerClass.jet => inheritedInnerClass.kt} | 0 .../{initializerBlockDImpl.jet => initializerBlockDImpl.kt} | 0 .../unsupported/{innerClass.jet => innerClass.kt} | 0 .../{propertyInInitializer.jet => propertyInInitializer.kt} | 0 .../unsupported/{traitproperty.jet => traitproperty.kt} | 0 .../{exceptionConstructor.jet => exceptionConstructor.kt} | 0 ...ameterAndBoxing.jet => closureWithParameterAndBoxing.kt} | 0 .../misc/cases/{localProperty.jet => localProperty.kt} | 0 .../trait/cases/{funDelegation.jet => funDelegation.kt} | 0 103 files changed, 27 insertions(+), 31 deletions(-) rename compiler/testData/cfg/{AnonymousInitializers.jet => AnonymousInitializers.kt} (100%) rename compiler/testData/cfg/{ArrayAccess.jet => ArrayAccess.kt} (100%) rename compiler/testData/cfg/{Assignments.jet => Assignments.kt} (100%) rename compiler/testData/cfg/{Basic.jet => Basic.kt} (100%) rename compiler/testData/cfg/{DeadCode.jet => DeadCode.kt} (100%) rename compiler/testData/cfg/{DelegatedProperty.jet => DelegatedProperty.kt} (100%) rename compiler/testData/cfg/{EmptyFunction.jet => EmptyFunction.kt} (100%) rename compiler/testData/cfg/{FailFunction.jet => FailFunction.kt} (100%) rename compiler/testData/cfg/{Finally.jet => Finally.kt} (100%) rename compiler/testData/cfg/{FinallyTestCopy.jet => FinallyTestCopy.kt} (100%) rename compiler/testData/cfg/{For.jet => For.kt} (100%) rename compiler/testData/cfg/{If.jet => If.kt} (100%) rename compiler/testData/cfg/{LazyBooleans.jet => LazyBooleans.kt} (100%) rename compiler/testData/cfg/{LocalDeclarations.jet => LocalDeclarations.kt} (100%) rename compiler/testData/cfg/{MultiDecl.jet => MultiDecl.kt} (100%) rename compiler/testData/cfg/{ObjectExpression.jet => ObjectExpression.kt} (100%) rename compiler/testData/cfg/{OnlyWhileInFunctionBody.jet => OnlyWhileInFunctionBody.kt} (100%) rename compiler/testData/cfg/{ReturnFromExpression.jet => ReturnFromExpression.kt} (100%) rename compiler/testData/cfg/{ShortFunction.jet => ShortFunction.kt} (100%) rename compiler/testData/diagnostics/checkerTestUtil/{test.jet => test.kt} (100%) rename idea/builtinsSrc/jet/{Any.jet => Any.kt} (100%) rename idea/builtinsSrc/jet/{Arrays.jet => Arrays.kt} (100%) rename idea/builtinsSrc/jet/{Collections.jet => Collections.kt} (100%) rename idea/builtinsSrc/jet/{Enum.jet => Enum.kt} (100%) rename idea/builtinsSrc/jet/{ExtensionFunctions.jet => ExtensionFunctions.kt} (100%) rename idea/builtinsSrc/jet/{Functions.jet => Functions.kt} (100%) rename idea/builtinsSrc/jet/{Iterators.jet => Iterators.kt} (100%) rename idea/builtinsSrc/jet/{KExtensionFunctions.jet => KExtensionFunctions.kt} (100%) rename idea/builtinsSrc/jet/{KFunctions.jet => KFunctions.kt} (100%) rename idea/builtinsSrc/jet/{KMemberFunctions.jet => KMemberFunctions.kt} (100%) rename idea/builtinsSrc/jet/{Library.jet => Library.kt} (100%) rename idea/builtinsSrc/jet/{Nothing.jet => Nothing.kt} (100%) rename idea/builtinsSrc/jet/{Numbers.jet => Numbers.kt} (100%) rename idea/builtinsSrc/jet/{Progressions.jet => Progressions.kt} (100%) rename idea/builtinsSrc/jet/{Ranges.jet => Ranges.kt} (100%) rename idea/builtinsSrc/jet/{Unit.jet => Unit.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs.jet => defaultargs.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs1.jet => defaultargs1.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs2.jet => defaultargs2.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs3.jet => defaultargs3.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs4.jet => defaultargs4.kt} (100%) rename js/js.translator/testFiles/additional/cases/{defaultargs5.jet => defaultargs5.kt} (100%) rename js/js.translator/testFiles/examples/cases/{closureWithParameter.jet => closureWithParameter.kt} (100%) rename js/js.translator/testFiles/examples/cases/{closureWithParameterAndBoxing.jet => closureWithParameterAndBoxing.kt} (100%) rename js/js.translator/testFiles/examples/cases/{diamondInheritance.jet => diamondInheritance.kt} (100%) rename js/js.translator/testFiles/examples/cases/{doubleEnclosedLocalVariable.jet => doubleEnclosedLocalVariable.kt} (100%) rename js/js.translator/testFiles/examples/cases/{enclosingLocalVariable.jet => enclosingLocalVariable.kt} (100%) rename js/js.translator/testFiles/examples/cases/{extensionClosure.jet => extensionClosure.kt} (100%) rename js/js.translator/testFiles/examples/cases/{funDelegation.jet => funDelegation.kt} (100%) rename js/js.translator/testFiles/examples/cases/{inheritedMethod.jet => inheritedMethod.kt} (100%) rename js/js.translator/testFiles/examples/cases/{initializerBlock.jet => initializerBlock.kt} (100%) rename js/js.translator/testFiles/examples/cases/{kt242.jet => kt242.kt} (100%) rename js/js.translator/testFiles/examples/cases/{newInstanceDefaultConstructor.jet => newInstanceDefaultConstructor.kt} (100%) rename js/js.translator/testFiles/examples/cases/{overloadBinaryOperator.jet => overloadBinaryOperator.kt} (100%) rename js/js.translator/testFiles/examples/cases/{overloadPlusAssignReturn.jet => overloadPlusAssignReturn.kt} (100%) rename js/js.translator/testFiles/examples/cases/{overloadPlusToPlusAssign.jet => overloadPlusToPlusAssign.kt} (100%) rename js/js.translator/testFiles/examples/cases/{overloadUnaryOperator.jet => overloadUnaryOperator.kt} (100%) rename js/js.translator/testFiles/examples/cases/{propertyDelegation.jet => propertyDelegation.kt} (100%) rename js/js.translator/testFiles/examples/cases/{rightHandOverride.jet => rightHandOverride.kt} (100%) rename js/js.translator/testFiles/examples/cases/{simplestClosure.jet => simplestClosure.kt} (100%) rename js/js.translator/testFiles/examples/cases/{simplestClosureAndBoxing.jet => simplestClosureAndBoxing.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{basicmethod.jet => basicmethod.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{basicproperty.jet => basicproperty.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{classObject.jet => classObject.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{classObjectInterface.jet => classObjectInterface.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{classObjectMethod.jet => classObjectMethod.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{enclosed.jet => enclosed.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{forwardTypeParameter.jet => forwardTypeParameter.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{inheritance.jet => inheritance.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{inheritedInnerClass.jet => inheritedInnerClass.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{initializerBlockDImpl.jet => initializerBlockDImpl.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{innerClass.jet => innerClass.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{propertyInInitializer.jet => propertyInInitializer.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/unsupported/{traitproperty.jet => traitproperty.kt} (100%) rename js/js.translator/testFiles/examples/sortedTests/usesJava/{exceptionConstructor.jet => exceptionConstructor.kt} (100%) rename js/js.translator/testFiles/expression/function/cases/{closureWithParameterAndBoxing.jet => closureWithParameterAndBoxing.kt} (100%) rename js/js.translator/testFiles/expression/misc/cases/{localProperty.jet => localProperty.kt} (100%) rename js/js.translator/testFiles/trait/cases/{funDelegation.jet => funDelegation.kt} (100%) diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java index 62d083c906e..2beab10c792 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java @@ -155,7 +155,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } private static ClassFileFactory getFactoryFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) { - JetFile psiFile = JetTestUtils.createFile("dummy.jet", text, jetEnvironment.getProject()); + JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetEnvironment.getProject()); ClassFileFactory factory; try { factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 799f8b601c2..0126263d714 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -86,7 +86,6 @@ public class JetCoreEnvironment { applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kts"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "ktm"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, JetParserDefinition.KTSCRIPT_FILE_SUFFIX); // should be renamed to kts - applicationEnvironment.registerFileType(JetFileType.INSTANCE, "jet"); applicationEnvironment.registerParserDefinition(new JavaParserDefinition()); applicationEnvironment.registerParserDefinition(new JetParserDefinition()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java index 85b70664d9f..096fbcc3a38 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java @@ -154,7 +154,7 @@ public class JetPsiFactory { @NotNull public static JetFile createFile(Project project, String text) { - return createFile(project, "dummy.jet", text); + return createFile(project, "dummy.kt", text); } @NotNull diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java index 8f50bfa4af9..c4849a53cab 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java @@ -87,7 +87,7 @@ public class LightClassUtil { @NotNull public static URL getBuiltInsDirUrl() { - String builtInFilePath = "/" + KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING + "/Library.jet"; + String builtInFilePath = "/" + KotlinBuiltIns.BUILT_INS_PACKAGE_NAME_STRING + "/Library.kt"; URL url = KotlinBuiltIns.class.getResource(builtInFilePath); diff --git a/compiler/testData/cfg/AnonymousInitializers.jet b/compiler/testData/cfg/AnonymousInitializers.kt similarity index 100% rename from compiler/testData/cfg/AnonymousInitializers.jet rename to compiler/testData/cfg/AnonymousInitializers.kt diff --git a/compiler/testData/cfg/ArrayAccess.jet b/compiler/testData/cfg/ArrayAccess.kt similarity index 100% rename from compiler/testData/cfg/ArrayAccess.jet rename to compiler/testData/cfg/ArrayAccess.kt diff --git a/compiler/testData/cfg/Assignments.jet b/compiler/testData/cfg/Assignments.kt similarity index 100% rename from compiler/testData/cfg/Assignments.jet rename to compiler/testData/cfg/Assignments.kt diff --git a/compiler/testData/cfg/Basic.jet b/compiler/testData/cfg/Basic.kt similarity index 100% rename from compiler/testData/cfg/Basic.jet rename to compiler/testData/cfg/Basic.kt diff --git a/compiler/testData/cfg/DeadCode.jet b/compiler/testData/cfg/DeadCode.kt similarity index 100% rename from compiler/testData/cfg/DeadCode.jet rename to compiler/testData/cfg/DeadCode.kt diff --git a/compiler/testData/cfg/DelegatedProperty.jet b/compiler/testData/cfg/DelegatedProperty.kt similarity index 100% rename from compiler/testData/cfg/DelegatedProperty.jet rename to compiler/testData/cfg/DelegatedProperty.kt diff --git a/compiler/testData/cfg/EmptyFunction.jet b/compiler/testData/cfg/EmptyFunction.kt similarity index 100% rename from compiler/testData/cfg/EmptyFunction.jet rename to compiler/testData/cfg/EmptyFunction.kt diff --git a/compiler/testData/cfg/FailFunction.jet b/compiler/testData/cfg/FailFunction.kt similarity index 100% rename from compiler/testData/cfg/FailFunction.jet rename to compiler/testData/cfg/FailFunction.kt diff --git a/compiler/testData/cfg/Finally.jet b/compiler/testData/cfg/Finally.kt similarity index 100% rename from compiler/testData/cfg/Finally.jet rename to compiler/testData/cfg/Finally.kt diff --git a/compiler/testData/cfg/FinallyTestCopy.jet b/compiler/testData/cfg/FinallyTestCopy.kt similarity index 100% rename from compiler/testData/cfg/FinallyTestCopy.jet rename to compiler/testData/cfg/FinallyTestCopy.kt diff --git a/compiler/testData/cfg/For.jet b/compiler/testData/cfg/For.kt similarity index 100% rename from compiler/testData/cfg/For.jet rename to compiler/testData/cfg/For.kt diff --git a/compiler/testData/cfg/If.jet b/compiler/testData/cfg/If.kt similarity index 100% rename from compiler/testData/cfg/If.jet rename to compiler/testData/cfg/If.kt diff --git a/compiler/testData/cfg/LazyBooleans.jet b/compiler/testData/cfg/LazyBooleans.kt similarity index 100% rename from compiler/testData/cfg/LazyBooleans.jet rename to compiler/testData/cfg/LazyBooleans.kt diff --git a/compiler/testData/cfg/LocalDeclarations.jet b/compiler/testData/cfg/LocalDeclarations.kt similarity index 100% rename from compiler/testData/cfg/LocalDeclarations.jet rename to compiler/testData/cfg/LocalDeclarations.kt diff --git a/compiler/testData/cfg/MultiDecl.jet b/compiler/testData/cfg/MultiDecl.kt similarity index 100% rename from compiler/testData/cfg/MultiDecl.jet rename to compiler/testData/cfg/MultiDecl.kt diff --git a/compiler/testData/cfg/ObjectExpression.jet b/compiler/testData/cfg/ObjectExpression.kt similarity index 100% rename from compiler/testData/cfg/ObjectExpression.jet rename to compiler/testData/cfg/ObjectExpression.kt diff --git a/compiler/testData/cfg/OnlyWhileInFunctionBody.jet b/compiler/testData/cfg/OnlyWhileInFunctionBody.kt similarity index 100% rename from compiler/testData/cfg/OnlyWhileInFunctionBody.jet rename to compiler/testData/cfg/OnlyWhileInFunctionBody.kt diff --git a/compiler/testData/cfg/ReturnFromExpression.jet b/compiler/testData/cfg/ReturnFromExpression.kt similarity index 100% rename from compiler/testData/cfg/ReturnFromExpression.jet rename to compiler/testData/cfg/ReturnFromExpression.kt diff --git a/compiler/testData/cfg/ShortFunction.jet b/compiler/testData/cfg/ShortFunction.kt similarity index 100% rename from compiler/testData/cfg/ShortFunction.jet rename to compiler/testData/cfg/ShortFunction.kt diff --git a/compiler/testData/diagnostics/checkerTestUtil/test.jet b/compiler/testData/diagnostics/checkerTestUtil/test.kt similarity index 100% rename from compiler/testData/diagnostics/checkerTestUtil/test.jet rename to compiler/testData/diagnostics/checkerTestUtil/test.kt diff --git a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java index fc9d564797b..24fe974abf3 100644 --- a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java +++ b/compiler/tests/org/jetbrains/jet/JetLiteFixture.java @@ -70,7 +70,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment { protected JetFile createPsiFile(@Nullable String testName, @Nullable String fileName, String text) { if (fileName == null) { Assert.assertNotNull(testName); - fileName = testName + ".jet"; + fileName = testName + ".kt"; } return JetTestUtils.createFile(fileName, text, getProject()); } @@ -93,7 +93,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment { } protected void prepareForTest(String name) throws IOException { - String text = loadFile(name + ".jet"); + String text = loadFile(name + ".kt"); createAndCheckPsiFile(name, text); } diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java index d3bcef129e3..79988cb7ab5 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java +++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java @@ -34,7 +34,7 @@ import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; public abstract class JetTestCaseBuilder { - public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", "jet", JetParserDefinition.KTSCRIPT_FILE_SUFFIX); + public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", JetParserDefinition.KTSCRIPT_FILE_SUFFIX); @NotNull public static FilenameFilter filterByExtension(@NotNull final String... extensions) { diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index feab6b38daf..327035d1a34 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -67,7 +67,7 @@ public class JetControlFlowTest extends JetLiteFixture { @Override protected void runTest() throws Throwable { - JetFile file = loadPsiFile(myName + ".jet"); + JetFile file = loadPsiFile(myName + ".kt"); Map data = new LinkedHashMap(); AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file); diff --git a/generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java b/generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java index 5f01553e358..340e4a0fb20 100644 --- a/generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java +++ b/generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java @@ -45,7 +45,7 @@ public class BuiltInsSerializer { public static void serializeToDir(final File destDir, @Nullable final PrintStream out) throws IOException { Disposable rootDisposable = Disposer.newDisposable(); try { - List sourceFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.jet"), new File(BUILT_INS_SRC_DIR)); + List sourceFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.kt"), new File(BUILT_INS_SRC_DIR)); CompilerConfiguration configuration = new CompilerConfiguration(); JetCoreEnvironment environment = new JetCoreEnvironment(rootDisposable, configuration); List files = JetTestUtils.loadToJetFiles(environment, sourceFiles); diff --git a/generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java b/generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java index f93b3fc06e8..f20218fbdad 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java +++ b/generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java @@ -56,8 +56,8 @@ public class GenerateFunctions { this.superClassNamePrefix = superClassNamePrefix; } - public String getJetFileName() { - return classNamePrefix + "s.jet"; + public String getFileName() { + return classNamePrefix + "s.kt"; } public String getClassName(int i) { @@ -223,7 +223,7 @@ public class GenerateFunctions { assert RUNTIME_SRC_DIR.exists() : "Runtime src dir does not exist: " + RUNTIME_SRC_DIR.getAbsolutePath(); for (FunctionKind kind : FunctionKind.values()) { - PrintWriter functions = new PrintWriter(new File(JET_SRC_DIR, kind.getJetFileName())); + PrintWriter functions = new PrintWriter(new File(JET_SRC_DIR, kind.getFileName())); new GenerateFunctions(functions, kind).generateBuiltInFunctions(); functions.close(); diff --git a/idea/builtinsSrc/jet/Any.jet b/idea/builtinsSrc/jet/Any.kt similarity index 100% rename from idea/builtinsSrc/jet/Any.jet rename to idea/builtinsSrc/jet/Any.kt diff --git a/idea/builtinsSrc/jet/Arrays.jet b/idea/builtinsSrc/jet/Arrays.kt similarity index 100% rename from idea/builtinsSrc/jet/Arrays.jet rename to idea/builtinsSrc/jet/Arrays.kt diff --git a/idea/builtinsSrc/jet/Collections.jet b/idea/builtinsSrc/jet/Collections.kt similarity index 100% rename from idea/builtinsSrc/jet/Collections.jet rename to idea/builtinsSrc/jet/Collections.kt diff --git a/idea/builtinsSrc/jet/Enum.jet b/idea/builtinsSrc/jet/Enum.kt similarity index 100% rename from idea/builtinsSrc/jet/Enum.jet rename to idea/builtinsSrc/jet/Enum.kt diff --git a/idea/builtinsSrc/jet/ExtensionFunctions.jet b/idea/builtinsSrc/jet/ExtensionFunctions.kt similarity index 100% rename from idea/builtinsSrc/jet/ExtensionFunctions.jet rename to idea/builtinsSrc/jet/ExtensionFunctions.kt diff --git a/idea/builtinsSrc/jet/Functions.jet b/idea/builtinsSrc/jet/Functions.kt similarity index 100% rename from idea/builtinsSrc/jet/Functions.jet rename to idea/builtinsSrc/jet/Functions.kt diff --git a/idea/builtinsSrc/jet/Iterators.jet b/idea/builtinsSrc/jet/Iterators.kt similarity index 100% rename from idea/builtinsSrc/jet/Iterators.jet rename to idea/builtinsSrc/jet/Iterators.kt diff --git a/idea/builtinsSrc/jet/KExtensionFunctions.jet b/idea/builtinsSrc/jet/KExtensionFunctions.kt similarity index 100% rename from idea/builtinsSrc/jet/KExtensionFunctions.jet rename to idea/builtinsSrc/jet/KExtensionFunctions.kt diff --git a/idea/builtinsSrc/jet/KFunctions.jet b/idea/builtinsSrc/jet/KFunctions.kt similarity index 100% rename from idea/builtinsSrc/jet/KFunctions.jet rename to idea/builtinsSrc/jet/KFunctions.kt diff --git a/idea/builtinsSrc/jet/KMemberFunctions.jet b/idea/builtinsSrc/jet/KMemberFunctions.kt similarity index 100% rename from idea/builtinsSrc/jet/KMemberFunctions.jet rename to idea/builtinsSrc/jet/KMemberFunctions.kt diff --git a/idea/builtinsSrc/jet/Library.jet b/idea/builtinsSrc/jet/Library.kt similarity index 100% rename from idea/builtinsSrc/jet/Library.jet rename to idea/builtinsSrc/jet/Library.kt diff --git a/idea/builtinsSrc/jet/Nothing.jet b/idea/builtinsSrc/jet/Nothing.kt similarity index 100% rename from idea/builtinsSrc/jet/Nothing.jet rename to idea/builtinsSrc/jet/Nothing.kt diff --git a/idea/builtinsSrc/jet/Numbers.jet b/idea/builtinsSrc/jet/Numbers.kt similarity index 100% rename from idea/builtinsSrc/jet/Numbers.jet rename to idea/builtinsSrc/jet/Numbers.kt diff --git a/idea/builtinsSrc/jet/Progressions.jet b/idea/builtinsSrc/jet/Progressions.kt similarity index 100% rename from idea/builtinsSrc/jet/Progressions.jet rename to idea/builtinsSrc/jet/Progressions.kt diff --git a/idea/builtinsSrc/jet/Ranges.jet b/idea/builtinsSrc/jet/Ranges.kt similarity index 100% rename from idea/builtinsSrc/jet/Ranges.jet rename to idea/builtinsSrc/jet/Ranges.kt diff --git a/idea/builtinsSrc/jet/Unit.jet b/idea/builtinsSrc/jet/Unit.kt similarity index 100% rename from idea/builtinsSrc/jet/Unit.jet rename to idea/builtinsSrc/jet/Unit.kt diff --git a/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java b/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java index cef9d00970c..d8e89a9d5ca 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull; public class JetFileFactory extends FileTypeFactory { @Override public void createFileTypes(@NotNull FileTypeConsumer consumer) { - // TODO: Remove unused extensions - consumer.consume(JetFileType.INSTANCE, "jet;jetl;jets;kt;kts;ktm"); + consumer.consume(JetFileType.INSTANCE, "kt;kts;ktm"); } } diff --git a/idea/testData/resolve/builtins/any.kt b/idea/testData/resolve/builtins/any.kt index 1850510855b..599e00a9acf 100644 --- a/idea/testData/resolve/builtins/any.kt +++ b/idea/testData/resolve/builtins/any.kt @@ -1,2 +1,2 @@ var x : Any? -//jet/Any.jet:Any \ No newline at end of file +//jet/Any.kt:Any \ No newline at end of file diff --git a/idea/testData/resolve/builtins/emptyRange.kt b/idea/testData/resolve/builtins/emptyRange.kt index 438a50b3eda..4d6a2599f18 100644 --- a/idea/testData/resolve/builtins/emptyRange.kt +++ b/idea/testData/resolve/builtins/emptyRange.kt @@ -1,2 +1,2 @@ val empty = IntRange.EMPTY -//jet/Ranges.jet:EMPTY \ No newline at end of file +//jet/Ranges.kt:EMPTY \ No newline at end of file diff --git a/idea/testData/resolve/builtins/equals.kt b/idea/testData/resolve/builtins/equals.kt index 60e01c6d5d0..917dfc89bad 100644 --- a/idea/testData/resolve/builtins/equals.kt +++ b/idea/testData/resolve/builtins/equals.kt @@ -1,2 +1,2 @@ val x = 5.equals(5) -//jet/Numbers.jet:equals +//jet/Numbers.kt:equals diff --git a/idea/testData/resolve/builtins/function.kt b/idea/testData/resolve/builtins/function.kt index 2593e1db921..3e31230d589 100644 --- a/idea/testData/resolve/builtins/function.kt +++ b/idea/testData/resolve/builtins/function.kt @@ -1,4 +1,4 @@ fun f(p : () -> String) { p.invoke() } -//jet/Functions.jet:invoke \ No newline at end of file +//jet/Functions.kt:invoke \ No newline at end of file diff --git a/idea/testData/resolve/builtins/int.kt b/idea/testData/resolve/builtins/int.kt index e5e0c81870b..770c2b1230c 100644 --- a/idea/testData/resolve/builtins/int.kt +++ b/idea/testData/resolve/builtins/int.kt @@ -1,2 +1,2 @@ val x : Int? -//jet/Numbers.jet:Int \ No newline at end of file +//jet/Numbers.kt:Int \ No newline at end of file diff --git a/idea/testData/resolve/builtins/intArrayConstructor.kt b/idea/testData/resolve/builtins/intArrayConstructor.kt index e0121276405..28cfe3dbca7 100644 --- a/idea/testData/resolve/builtins/intArrayConstructor.kt +++ b/idea/testData/resolve/builtins/intArrayConstructor.kt @@ -1,2 +1,2 @@ val ia = IntArray(4) -//jet/Arrays.jet:IntArray \ No newline at end of file +//jet/Arrays.kt:IntArray \ No newline at end of file diff --git a/idea/testData/resolve/builtins/nothing.kt b/idea/testData/resolve/builtins/nothing.kt index ec6fff2eb4f..f5cf06dd037 100644 --- a/idea/testData/resolve/builtins/nothing.kt +++ b/idea/testData/resolve/builtins/nothing.kt @@ -1,2 +1,2 @@ var x : Nothing -//jet/Nothing.jet:Nothing \ No newline at end of file +//jet/Nothing.kt:Nothing \ No newline at end of file diff --git a/idea/testData/resolve/builtins/times.kt b/idea/testData/resolve/builtins/times.kt index 88f72ff5c56..50d50ee5f2b 100644 --- a/idea/testData/resolve/builtins/times.kt +++ b/idea/testData/resolve/builtins/times.kt @@ -1,2 +1,2 @@ val x = 2.0 * 3.0 -//jet/Numbers.jet:times \ No newline at end of file +//jet/Numbers.kt:times \ No newline at end of file diff --git a/idea/testData/resolve/builtins/toString.kt b/idea/testData/resolve/builtins/toString.kt index 62dbdce939a..aa555c196f3 100644 --- a/idea/testData/resolve/builtins/toString.kt +++ b/idea/testData/resolve/builtins/toString.kt @@ -1,2 +1,2 @@ val x = 5.toString() -//jet/Library.jet:toString +//jet/Library.kt:toString diff --git a/idea/testData/resolve/builtins/unit.kt b/idea/testData/resolve/builtins/unit.kt index b3e979ea638..f034ca92c28 100644 --- a/idea/testData/resolve/builtins/unit.kt +++ b/idea/testData/resolve/builtins/unit.kt @@ -1,2 +1,2 @@ var x : Unit? -//jet/Unit.jet:Unit \ No newline at end of file +//jet/Unit.kt:Unit \ No newline at end of file diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java index 0ee20a057e5..32deb8ca0d9 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java @@ -51,7 +51,7 @@ public class FunctionTest extends AbstractExpressionTest { } public void testClosureWithParameterAndBoxing() throws Exception { - checkFooBoxIsOk("closureWithParameterAndBoxing.jet"); + checkFooBoxIsOk("closureWithParameterAndBoxing.kt"); } public void testEnclosingThis() throws Exception { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java index 2156712ce26..1f57012d006 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java @@ -29,7 +29,7 @@ public final class MiscTest extends AbstractExpressionTest { } public void testLocalPropertys() throws Exception { - runFunctionOutputTest("localProperty.jet", "foo", "box", 50); + runFunctionOutputTest("localProperty.kt", "foo", "box", 50); } public void testIntRange() throws Exception { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java index a317aa70042..1bb95e6e51f 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java @@ -55,7 +55,7 @@ public final class TraitTest extends SingleFileTranslationTest { public void testFunDelegation() throws Exception { - checkFooBoxIsOk("funDelegation.jet"); + checkFooBoxIsOk("funDelegation.kt"); } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java index 21ee66e028a..55fa01cd113 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java @@ -57,12 +57,11 @@ public abstract class TranslatorTestCaseBuilder { public static void appendTestsInDirectory(String dataPath, boolean recursive, final FilenameFilter filter, NamedTestFactory factory, TestSuite suite) { - final String extensionJet = ".jet"; final String extensionKt = ".kt"; final FilenameFilter extensionFilter = new FilenameFilter() { @Override public boolean accept(File dir, String name) { - return name.endsWith(extensionJet) || name.endsWith(extensionKt); + return name.endsWith(extensionKt); } }; FilenameFilter resultFilter; @@ -98,7 +97,6 @@ public abstract class TranslatorTestCaseBuilder { for (File file : files) { String fileName = file.getName(); assert fileName != null; - String extension = fileName.endsWith(extensionJet) ? extensionJet : extensionKt; suite.addTest(factory.createTest(fileName)); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/utils/JetFileUtils.java b/js/js.translator/src/org/jetbrains/k2js/utils/JetFileUtils.java index 47b22f2413e..7675d80c434 100644 --- a/js/js.translator/src/org/jetbrains/k2js/utils/JetFileUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/utils/JetFileUtils.java @@ -34,6 +34,6 @@ public final class JetFileUtils { @NotNull Project project ) { return (JetFile) PsiFileFactory.getInstance(project) - .createFileFromText(name.endsWith(".kt") ? name : name + ".jet", JetLanguage.INSTANCE, text, true, false); + .createFileFromText(name.endsWith(".kt") ? name : name + ".kt", JetLanguage.INSTANCE, text, true, false); } } diff --git a/js/js.translator/testFiles/additional/cases/defaultargs.jet b/js/js.translator/testFiles/additional/cases/defaultargs.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs.jet rename to js/js.translator/testFiles/additional/cases/defaultargs.kt diff --git a/js/js.translator/testFiles/additional/cases/defaultargs1.jet b/js/js.translator/testFiles/additional/cases/defaultargs1.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs1.jet rename to js/js.translator/testFiles/additional/cases/defaultargs1.kt diff --git a/js/js.translator/testFiles/additional/cases/defaultargs2.jet b/js/js.translator/testFiles/additional/cases/defaultargs2.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs2.jet rename to js/js.translator/testFiles/additional/cases/defaultargs2.kt diff --git a/js/js.translator/testFiles/additional/cases/defaultargs3.jet b/js/js.translator/testFiles/additional/cases/defaultargs3.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs3.jet rename to js/js.translator/testFiles/additional/cases/defaultargs3.kt diff --git a/js/js.translator/testFiles/additional/cases/defaultargs4.jet b/js/js.translator/testFiles/additional/cases/defaultargs4.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs4.jet rename to js/js.translator/testFiles/additional/cases/defaultargs4.kt diff --git a/js/js.translator/testFiles/additional/cases/defaultargs5.jet b/js/js.translator/testFiles/additional/cases/defaultargs5.kt similarity index 100% rename from js/js.translator/testFiles/additional/cases/defaultargs5.jet rename to js/js.translator/testFiles/additional/cases/defaultargs5.kt diff --git a/js/js.translator/testFiles/examples/cases/closureWithParameter.jet b/js/js.translator/testFiles/examples/cases/closureWithParameter.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/closureWithParameter.jet rename to js/js.translator/testFiles/examples/cases/closureWithParameter.kt diff --git a/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet b/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet rename to js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.kt diff --git a/js/js.translator/testFiles/examples/cases/diamondInheritance.jet b/js/js.translator/testFiles/examples/cases/diamondInheritance.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/diamondInheritance.jet rename to js/js.translator/testFiles/examples/cases/diamondInheritance.kt diff --git a/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet b/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet rename to js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt diff --git a/js/js.translator/testFiles/examples/cases/enclosingLocalVariable.jet b/js/js.translator/testFiles/examples/cases/enclosingLocalVariable.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/enclosingLocalVariable.jet rename to js/js.translator/testFiles/examples/cases/enclosingLocalVariable.kt diff --git a/js/js.translator/testFiles/examples/cases/extensionClosure.jet b/js/js.translator/testFiles/examples/cases/extensionClosure.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/extensionClosure.jet rename to js/js.translator/testFiles/examples/cases/extensionClosure.kt diff --git a/js/js.translator/testFiles/examples/cases/funDelegation.jet b/js/js.translator/testFiles/examples/cases/funDelegation.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/funDelegation.jet rename to js/js.translator/testFiles/examples/cases/funDelegation.kt diff --git a/js/js.translator/testFiles/examples/cases/inheritedMethod.jet b/js/js.translator/testFiles/examples/cases/inheritedMethod.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/inheritedMethod.jet rename to js/js.translator/testFiles/examples/cases/inheritedMethod.kt diff --git a/js/js.translator/testFiles/examples/cases/initializerBlock.jet b/js/js.translator/testFiles/examples/cases/initializerBlock.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/initializerBlock.jet rename to js/js.translator/testFiles/examples/cases/initializerBlock.kt diff --git a/js/js.translator/testFiles/examples/cases/kt242.jet b/js/js.translator/testFiles/examples/cases/kt242.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/kt242.jet rename to js/js.translator/testFiles/examples/cases/kt242.kt diff --git a/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet b/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet rename to js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt diff --git a/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.jet b/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/overloadBinaryOperator.jet rename to js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt diff --git a/js/js.translator/testFiles/examples/cases/overloadPlusAssignReturn.jet b/js/js.translator/testFiles/examples/cases/overloadPlusAssignReturn.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/overloadPlusAssignReturn.jet rename to js/js.translator/testFiles/examples/cases/overloadPlusAssignReturn.kt diff --git a/js/js.translator/testFiles/examples/cases/overloadPlusToPlusAssign.jet b/js/js.translator/testFiles/examples/cases/overloadPlusToPlusAssign.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/overloadPlusToPlusAssign.jet rename to js/js.translator/testFiles/examples/cases/overloadPlusToPlusAssign.kt diff --git a/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.jet b/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/overloadUnaryOperator.jet rename to js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt diff --git a/js/js.translator/testFiles/examples/cases/propertyDelegation.jet b/js/js.translator/testFiles/examples/cases/propertyDelegation.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/propertyDelegation.jet rename to js/js.translator/testFiles/examples/cases/propertyDelegation.kt diff --git a/js/js.translator/testFiles/examples/cases/rightHandOverride.jet b/js/js.translator/testFiles/examples/cases/rightHandOverride.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/rightHandOverride.jet rename to js/js.translator/testFiles/examples/cases/rightHandOverride.kt diff --git a/js/js.translator/testFiles/examples/cases/simplestClosure.jet b/js/js.translator/testFiles/examples/cases/simplestClosure.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/simplestClosure.jet rename to js/js.translator/testFiles/examples/cases/simplestClosure.kt diff --git a/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.jet b/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt similarity index 100% rename from js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.jet rename to js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet b/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet rename to js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt diff --git a/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.jet b/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt similarity index 100% rename from js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.jet rename to js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt diff --git a/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet b/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt similarity index 100% rename from js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet rename to js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt diff --git a/js/js.translator/testFiles/expression/misc/cases/localProperty.jet b/js/js.translator/testFiles/expression/misc/cases/localProperty.kt similarity index 100% rename from js/js.translator/testFiles/expression/misc/cases/localProperty.jet rename to js/js.translator/testFiles/expression/misc/cases/localProperty.kt diff --git a/js/js.translator/testFiles/trait/cases/funDelegation.jet b/js/js.translator/testFiles/trait/cases/funDelegation.kt similarity index 100% rename from js/js.translator/testFiles/trait/cases/funDelegation.jet rename to js/js.translator/testFiles/trait/cases/funDelegation.kt