diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java index 13ec65772fc..c98a1b40a32 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java @@ -115,8 +115,8 @@ public class CodegenTestsOnAndroidRunner { [exec] at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:35) [exec] ... 13 more [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage$t6$foo$1 - [exec] at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.t6(dummy.jet:94) - [exec] at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.box(dummy.jet:185) + [exec] at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.t6(dummy.kt:94) + [exec] at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.box(dummy.kt:185) [exec] ... 16 more [exec] ............... [exec] Error in testKt529: diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java index fdae7de62c8..401bbf54c88 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java @@ -91,8 +91,8 @@ public class SpecialFiles { excludedFiles.add("kt529.kt"); // Bug excludedFiles.add("kt344.kt"); // Bug - excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: jet.Nothing - excludedFiles.add("kt3574.kt"); // java.lang.NoClassDefFoundError: jet.Nothing + excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: kotlin.Nothing + excludedFiles.add("kt3574.kt"); // java.lang.NoClassDefFoundError: kotlin.Nothing excludedFiles.add("genericBackingFieldSignature.kt"); // Wrong signature after package renaming excludedFiles.add("genericMethodSignature.kt"); // Wrong signature after package renaming diff --git a/compiler/testData/codegen/box/classes/kt1976.kt b/compiler/testData/codegen/box/classes/kt1976.kt index f641b2a30c8..7e02add4ef3 100644 --- a/compiler/testData/codegen/box/classes/kt1976.kt +++ b/compiler/testData/codegen/box/classes/kt1976.kt @@ -4,5 +4,5 @@ class A { fun box(): String { val a = A() - return a.f() // does not work: (in runtime) ClassCastException: A cannot be cast to jet.Function0 + return a.f() // does not work: (in runtime) ClassCastException: A cannot be cast to kotlin.Function0 } diff --git a/compiler/testData/codegen/box/typeMapping/kt3976.kt b/compiler/testData/codegen/box/typeMapping/kt3976.kt index f80506d6ca4..d90c3595cc2 100644 --- a/compiler/testData/codegen/box/typeMapping/kt3976.kt +++ b/compiler/testData/codegen/box/typeMapping/kt3976.kt @@ -1,4 +1,4 @@ -// java.lang.ClassNotFoundException: jet.Nothing +// java.lang.ClassNotFoundException: kotlin.Nothing var currentAccountId: Int? by SessionAccessor() class SessionAccessor { diff --git a/compiler/testData/codegen/box/typeMapping/nothing.kt b/compiler/testData/codegen/box/typeMapping/nothing.kt index 6947866d6ee..93cafb65401 100644 --- a/compiler/testData/codegen/box/typeMapping/nothing.kt +++ b/compiler/testData/codegen/box/typeMapping/nothing.kt @@ -1,5 +1,5 @@ fun box(): String { - // jet.Nothing should not be loaded here + // kotlin.Nothing should not be loaded here val x = "" is Nothing return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/typeMapping/nullableNothing.kt b/compiler/testData/codegen/box/typeMapping/nullableNothing.kt index 85622c6e9a2..79fd2fa060f 100644 --- a/compiler/testData/codegen/box/typeMapping/nullableNothing.kt +++ b/compiler/testData/codegen/box/typeMapping/nullableNothing.kt @@ -1,6 +1,5 @@ - fun box(): String { - // This used to be problematic because of an attempt to load jet/Nothing class + // This used to be problematic because of an attempt to load kotlin/Nothing class val x = "" is Nothing? return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt index ef5ebaef0f2..4a73fad3c92 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt @@ -4,7 +4,7 @@ import java.io.* import java.util.* fun box() : String { - val input = StringReader("/Users/abreslav/work/jet/docs/luhnybin/src/test") + val input = StringReader("/aaa/bbb/ccc/ddd") val luhny = Luhny() input.forEachChar { @@ -86,7 +86,7 @@ class Luhny() { toBeMasked-- } else { - print(c) + // print(c) } } } diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt index 196f78aae09..6d8d29c84e5 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt @@ -4,7 +4,7 @@ import java.io.* import java.util.* fun box() : String { - val input = StringReader("/Users/abreslav/work/jet/docs/luhnybin/src/test") + val input = StringReader("/aaa/bbb/ccc/ddd") val luhny = Luhny() input.forEachChar { @@ -81,7 +81,7 @@ class Luhny() { kotlin.io.print('X') toBeMasked-- } else { - kotlin.io.print(c) + // kotlin.io.print(c) } } } diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt index bb8312260b1..b2b9488443d 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt @@ -4,7 +4,7 @@ import java.io.* import java.util.* fun box() : String { - val input = StringReader("/Users/abreslav/work/jet/docs/luhnybin/src/test") + val input = StringReader("/aaa/bbb/ccc/ddd") val luhny = Luhny() input.forEachChar { @@ -79,7 +79,7 @@ class Luhny() { toBeMasked-- } else { - print(c) + // print(c) } } } diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt index 82554a810a7..564fcdb3e62 100644 --- a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt +++ b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt @@ -2,7 +2,7 @@ open class X(val s: String) fun f(a: String?) { if (a != null) { - object : X(a) { // Type mismatch: inferred type is jet.String? but jet.String was expected + object : X(a) { // Type mismatch: inferred type is kotlin.String? but kotlin.String was expected } } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt index 938d5cc4d6b..45156c79ea7 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt @@ -6,8 +6,8 @@ public fun foo(array: Array): Array = array public fun test() { val x = foo(array(1, 2, 3, 4, 5)) // Should infer type 'Int' - // ^--- public final fun array(vararg t : DONT_CARE) : jet.Array defined in Kotlin - // ^--- public final fun foo(items t : jet.Array) : jet.Array defined in root package + // ^--- public final fun array(vararg t : DONT_CARE) : kotlin.Array defined in Kotlin + // ^--- public final fun foo(items t : kotlin.Array) : kotlin.Array defined in root package x : Array } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt index fb02f82a1e4..c5f06d013ce 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt @@ -18,7 +18,7 @@ fun test() { val mapperFunction = {(i: Int)-> } SomeTemplate().query(mapperFunction) - // TYPE_MISMATCH: Required Class<[ERROR: CANT_INFER]>, Found (jet.Int) -> Unit + // TYPE_MISMATCH: Required Class<[ERROR: CANT_INFER]>, Found (kotlin.Int) -> Unit SomeTemplate().query {(i: Int)-> } SomeTemplate().query1 {(i: Int)-> } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.kt b/compiler/testData/diagnostics/tests/j+k/kt2394.kt index 4af0147148b..481d55e0309 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt2394.kt +++ b/compiler/testData/diagnostics/tests/j+k/kt2394.kt @@ -1,4 +1,4 @@ -//KT-2394 java.lang.Iterable should be visible as jet.Iterable +//KT-2394 java.lang.Iterable should be visible as kotlin.Iterable package d fun foo(iterable: Iterable, iterator: Iterator, comparable: Comparable) { diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt index a550ec1cfb6..5cdf69e1239 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt @@ -2,10 +2,10 @@ fun main(args: Array) { val b: Boolean? = null if (b != null) { if (!b) {} // OK - if (b) {} // Error: Condition must be of type jet.Boolean, but is of type jet.Boolean? - if (b!!) {} // WARN: Unnecessary non-null assertion (!!) on a non-null receiver of type jet.Boolean? + if (b) {} // Error: Condition must be of type kotlin.Boolean, but is of type kotlin.Boolean? + if (b!!) {} // WARN: Unnecessary non-null assertion (!!) on a non-null receiver of type kotlin.Boolean? foo(b) // OK } } -fun foo(a: Boolean) = a \ No newline at end of file +fun foo(a: Boolean) = a diff --git a/compiler/testData/diagnostics/tests/regressions/kt2376.kt b/compiler/testData/diagnostics/tests/regressions/kt2376.kt index 91689a31354..f06d169cd41 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt2376.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt2376.kt @@ -1,5 +1,5 @@ // FILE: main.kt -//KT-2376 java.lang.Number should be visible in Kotlin as jet.Number +//KT-2376 java.lang.Number should be visible in Kotlin as kotlin.Number fun main(args: Array) { Test().number(5.toInt()) } diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt index f8a1311fb41..7335640eb12 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt +++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt @@ -8,7 +8,7 @@ object A { fun toJson2(obj:Any){ if(obj is SelfJson){ // A.find( (obj as SelfJson).javaClass) // OK - A.find( obj.javaClass ) // ERROR: Type mismatch: inferred type is jet.Any but SelfJson was expected + A.find( obj.javaClass ) // ERROR: Type mismatch: inferred type is kotlin.Any but SelfJson was expected } } } diff --git a/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve b/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve index a42b51f7350..ecc00e7bfa6 100644 --- a/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve +++ b/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve @@ -1,4 +1,4 @@ -//FILE:mainFile.jet +//FILE:mainFile.kt //---------------------------------------------------------------------------------- package test diff --git a/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve b/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve index 939ac3b26c0..2fb61f8cac5 100644 --- a/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve +++ b/compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve @@ -1,4 +1,4 @@ -//FILE:mainFile.jet +//FILE:mainFile.kt //---------------------------------------------------------------------------------- package test diff --git a/docs/confluence.jetbrains.com/Kotlin/40700182_Modules+%E2%80%94+Rethought+to+packages.confluence b/docs/confluence.jetbrains.com/Kotlin/40700182_Modules+%E2%80%94+Rethought+to+packages.confluence index 890879851c8..77971676681 100644 --- a/docs/confluence.jetbrains.com/Kotlin/40700182_Modules+%E2%80%94+Rethought+to+packages.confluence +++ b/docs/confluence.jetbrains.com/Kotlin/40700182_Modules+%E2%80%94+Rethought+to+packages.confluence @@ -122,7 +122,7 @@ fun ModuleBuilder.defineModules() { // Standard extensions are registered, adding custom ones source mask "*.jav" language java // Non-standard extension for Java - source mask "*.jet" language kotlin + source mask "*.kt" language kotlin resource mask "*.bundle" module ("org.example.mymodule") { diff --git a/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java b/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java index c1d1b62ec7a..98155de9020 100644 --- a/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; public class JetRunConfigurationSettingsFormatConverterProvider extends ConverterProvider { protected JetRunConfigurationSettingsFormatConverterProvider() { - super("jet-run-configuration-should-store-its-settings-as-java-app-configuration"); + super("kotlin-run-configuration-should-store-its-settings-as-java-run-configuration"); } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java index b621b29e377..953f4f4e8c2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -67,7 +67,7 @@ public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction

parameters = function.getValueParameters(); if (parameters.size() != 1) return false; JetTypeReference parameterType = parameters.iterator().next().getTypeReference(); - return parameterType != null && ("Any?".equals(parameterType.getText()) || "jet.Any?".equals(parameterType.getText())); + return parameterType != null && "Any?".equals(parameterType.getText()); } if ("hashCode".equals(name) || "toString".equals(name)) { @@ -99,7 +99,7 @@ public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction