diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0dabf9b5533..4249ed3613e 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -32,5 +32,6 @@ + \ No newline at end of file diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt deleted file mode 100644 index b687dd75193..00000000000 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle - -import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase -import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster -import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions -import org.junit.Test - - -class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() { - - @Test - @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster) - fun testMultiplatformLibrary() { - importAndCheckHighlighting() - } - - @Test - @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster) - fun testUnresolvedInMultiplatformLibrary() { - importAndCheckHighlighting(false, false) - } - - private fun importAndCheckHighlighting(testLineMarkers: Boolean = true, checkWarnings: Boolean = true) { - val files = configureByFiles() - importProject(skipIndexing = false) - val project = myTestFixture.project - checkFiles( - files.filter { it.extension == "kt" || it.extension == "java" }, - project, - object : GradleDaemonAnalyzerTestCase( - testLineMarkers = testLineMarkers, - checkWarnings = checkWarnings, - checkInfos = false, - rootDisposable = testRootDisposable - ) {} - ) - } - - override fun testDataDirName(): String { - return "importAndCheckHighlighting" - } -} diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle deleted file mode 100644 index c5eb7f5c603..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}' -} -repositories { - {{kotlin_plugin_repositories}} -} -group 'com.example' -version '0.0.1' - -apply plugin: 'maven-publish' - -kotlin { - jvm() - js { - browser { - } - nodejs { - } - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib-common') - } - } - commonTest { - dependencies { - implementation kotlin('test-common') - implementation kotlin('test-annotations-common') - } - } - jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } - } - jvmTest { - dependencies { - implementation kotlin('test') - implementation kotlin('test-junit') - } - } - jsMain { - dependencies { - implementation kotlin('stdlib-js') - } - } - jsTest { - dependencies { - implementation kotlin('test-js') - } - } - mingwMain { - } - mingwTest { - } - } -} diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties deleted file mode 100644 index 29e08e8ca88..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle deleted file mode 100644 index 65d15f5c2f7..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle +++ /dev/null @@ -1,9 +0,0 @@ -pluginManagement { - repositories { - {{kotlin_plugin_repositories}} - } -} - -rootProject.name = 'mppLibrary' - -enableFeaturePreview('GRADLE_METADATA') diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt deleted file mode 100644 index 853f893b8c9..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt +++ /dev/null @@ -1,11 +0,0 @@ -package sample - -expect class Sample() { - fun checkMe(): Int -} - -expect object Platform { - val name: String -} - -fun hello(): String = "Hello from ${Platform.name}" \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt deleted file mode 100644 index 2d298871ae8..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt +++ /dev/null @@ -1,11 +0,0 @@ -package sample - -import kotlin.test.Test -import kotlin.test.assertTrue - -class SampleTests { - @Test - fun testMe() { - assertTrue(Sample().checkMe() > 0) - } -} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt deleted file mode 100644 index 5bac311f4d4..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt +++ /dev/null @@ -1,9 +0,0 @@ -package sample - -actual class Sample { - actual fun checkMe() = 12 -} - -actual object Platform { - actual val name: String = "JS" -} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt deleted file mode 100644 index 14f2be23f42..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt +++ /dev/null @@ -1,9 +0,0 @@ -package sample - -actual class Sample { - actual fun checkMe() = 42 -} - -actual object Platform { - actual val name: String = "JVM" -} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt deleted file mode 100644 index faa97a40242..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt +++ /dev/null @@ -1,11 +0,0 @@ -package sample - -import kotlin.test.Test -import kotlin.test.assertTrue - -class SampleTestsJVM { - @Test - fun testHello() { - assertTrue("JVM" in hello()) - } -} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle deleted file mode 100644 index c5eb7f5c603..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}' -} -repositories { - {{kotlin_plugin_repositories}} -} -group 'com.example' -version '0.0.1' - -apply plugin: 'maven-publish' - -kotlin { - jvm() - js { - browser { - } - nodejs { - } - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib-common') - } - } - commonTest { - dependencies { - implementation kotlin('test-common') - implementation kotlin('test-annotations-common') - } - } - jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } - } - jvmTest { - dependencies { - implementation kotlin('test') - implementation kotlin('test-junit') - } - } - jsMain { - dependencies { - implementation kotlin('stdlib-js') - } - } - jsTest { - dependencies { - implementation kotlin('test-js') - } - } - mingwMain { - } - mingwTest { - } - } -} diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties deleted file mode 100644 index 29e08e8ca88..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.code.style=official \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle deleted file mode 100644 index 65d15f5c2f7..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle +++ /dev/null @@ -1,9 +0,0 @@ -pluginManagement { - repositories { - {{kotlin_plugin_repositories}} - } -} - -rootProject.name = 'mppLibrary' - -enableFeaturePreview('GRADLE_METADATA') diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt deleted file mode 100644 index 3a8718e2512..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt +++ /dev/null @@ -1,4 +0,0 @@ -package sample -fun common(): Boolean { - return "" -} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt deleted file mode 100644 index 8b9b5ac59e5..00000000000 --- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt +++ /dev/null @@ -1,6 +0,0 @@ -package sample - -fun jvm() { - println(common()) - println(js()) -} \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt index 53282e881ae..390c9123cfd 100644 --- a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt @@ -2,7 +2,7 @@ package sample expect fun sameFile() -actual fun sameFile() = Unit +actual fun sameFile() = Unit expect fun sameModule() diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt b/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt index 9165ee6ca4c..e1883480d0e 100644 --- a/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt +++ b/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt @@ -1,9 +1,9 @@ @file:Suppress("UNUSED_PARAMETER") -expect open class MyCancelException : MyIllegalStateException +expect open class MyCancelException : MyIllegalStateException fun cancel(cause: MyCancelException) {} -expect open class OtherException : MyIllegalStateException +expect open class OtherException : MyIllegalStateException fun other(cause: OtherException) {} diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt b/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt index b089ad48d19..d6897aa74aa 100644 --- a/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt +++ b/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt @@ -1,3 +1,3 @@ -public expect open class MyException +public expect open class MyException -public expect open class MyIllegalStateException : MyException \ No newline at end of file +public expect open class MyIllegalStateException : MyException \ No newline at end of file diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt index 5595c8ef7a0..87b9e881de5 100644 --- a/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt +++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt @@ -1,6 +1,6 @@ -actual typealias MyCancelException = platform.lib.MyCancellationException +actual typealias MyCancelException = platform.lib.MyCancellationException -actual open class OtherException : platform.lib.MyIllegalStateException() +actual open class OtherException : platform.lib.MyIllegalStateException() fun test() { cancel(MyCancelException()) // TYPE_MISMATCH diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt index 0a03dd29ca8..6a7831a6830 100644 --- a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt +++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt @@ -1,3 +1,3 @@ -actual typealias MyException = platform.lib.MyException +actual typealias MyException = platform.lib.MyException -actual typealias MyIllegalStateException = platform.lib.MyIllegalStateException \ No newline at end of file +actual typealias MyIllegalStateException = platform.lib.MyIllegalStateException \ No newline at end of file diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt index cf9578251a6..93e4146c88e 100644 --- a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt +++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt @@ -1,7 +1,7 @@ package platform.lib -open class MyException +open class MyException -open class MyIllegalStateException : MyException() +open class MyIllegalStateException : MyException() open class MyCancellationException : MyIllegalStateException() \ No newline at end of file diff --git a/idea/testData/multiplatform/callableReferences/common-1/common-1.kt b/idea/testData/multiplatform/callableReferences/common-1/common-1.kt index 936a5830396..8d4f8286fce 100644 --- a/idea/testData/multiplatform/callableReferences/common-1/common-1.kt +++ b/idea/testData/multiplatform/callableReferences/common-1/common-1.kt @@ -2,8 +2,8 @@ package sample -expect interface A { - fun common_1_A() +expect interface A { + fun common_1_A() } expect interface B : A { diff --git a/idea/testData/multiplatform/callableReferences/common-2/common-2.kt b/idea/testData/multiplatform/callableReferences/common-2/common-2.kt index 3d02aceaae2..a8a9d362182 100644 --- a/idea/testData/multiplatform/callableReferences/common-2/common-2.kt +++ b/idea/testData/multiplatform/callableReferences/common-2/common-2.kt @@ -2,12 +2,12 @@ package sample -expect interface C { - fun common_2_C() +expect interface C { + fun common_2_C() } -actual interface A : C { - actual fun common_1_A() +actual interface A : C { + actual fun common_1_A() fun common_2_A() } diff --git a/idea/testData/multiplatform/callableReferences/jvm/jvm.kt b/idea/testData/multiplatform/callableReferences/jvm/jvm.kt index 3cbbfae12ef..1d5ef831620 100644 --- a/idea/testData/multiplatform/callableReferences/jvm/jvm.kt +++ b/idea/testData/multiplatform/callableReferences/jvm/jvm.kt @@ -2,8 +2,8 @@ package sample -actual interface C { - actual fun common_2_C() +actual interface C { + actual fun common_2_C() fun jvm_C() } diff --git a/idea/testData/multiplatform/constructorsOfExpect/common/common.kt b/idea/testData/multiplatform/constructorsOfExpect/common/common.kt index a4a56d42678..28054c745cc 100644 --- a/idea/testData/multiplatform/constructorsOfExpect/common/common.kt +++ b/idea/testData/multiplatform/constructorsOfExpect/common/common.kt @@ -1,3 +1,3 @@ -expect class A { - fun commonMember() +expect class A { + fun commonMember() } diff --git a/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt b/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt index 176156e3830..37f1a157d9b 100644 --- a/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt +++ b/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class A { - actual fun commonMember() { } +actual class A { + actual fun commonMember() { } fun platformMember() { } } diff --git a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt index d19352369f0..d309fd727ee 100644 --- a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt +++ b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt @@ -1,6 +1,6 @@ // KT-34027 -expect interface A { - fun foo(x: T) +expect interface A { + fun foo(x: T) } fun bar(): A = null!! diff --git a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt index b2af8823566..5a2ae073160 100644 --- a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt +++ b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt @@ -1,5 +1,5 @@ -actual interface A { - actual fun foo(x: T) +actual interface A { + actual fun foo(x: T) fun foo(x: String) } diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt b/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt index 7cb32d6ba6d..4dd0a18697a 100644 --- a/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt +++ b/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt @@ -1,6 +1,6 @@ package sample -fun main() { +fun main() { ActualizedInLeft() ActualizedInRight() } \ No newline at end of file diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt b/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt index 66e0de55eb6..3bc96c173c8 100644 --- a/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt +++ b/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt @@ -1,3 +1,3 @@ package sample -actual class ActualizedInLeft \ No newline at end of file +actual class ActualizedInLeft \ No newline at end of file diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt b/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt index 8e247ab6097..0c2f6b059e6 100644 --- a/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt +++ b/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt @@ -1,3 +1,3 @@ package sample -actual class ActualizedInRight \ No newline at end of file +actual class ActualizedInRight \ No newline at end of file diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt b/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt index 38cdbbeb8b4..d94562fb4d8 100644 --- a/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt +++ b/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt @@ -1,4 +1,4 @@ package sample -expect class ActualizedInLeft -expect class ActualizedInRight +expect class ActualizedInLeft +expect class ActualizedInRight diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt index 7fc554e7629..b93d8d27d43 100644 --- a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt +++ b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt @@ -5,7 +5,7 @@ actual class A { fun fromBottom(): Int = 0 } -fun main() { +fun main() { A().foo() // Any behaviour is acceptable, as the code is erroneous. diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt b/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt index 44ec2e78907..8b0c9ead635 100644 --- a/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt +++ b/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt @@ -1,6 +1,6 @@ package sample -actual class A /* Left */ { - actual fun foo(): Int = 42 +actual class A /* Left */ { + actual fun foo(): Int = 42 fun fromLeft(): String = "" } diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt index ace4e1bab24..f4d6c1b3ee6 100644 --- a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt +++ b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt @@ -2,6 +2,6 @@ package sample -expect class A { - fun foo(): Int +expect class A { + fun foo(): Int } \ No newline at end of file diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt index 16984b10298..a9d5969c9cb 100644 --- a/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt +++ b/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt @@ -4,8 +4,8 @@ package sample // -------------------------------------------- -expect interface A { - fun foo() +expect interface A { + fun foo() } fun take_A_common_1(x: A) { diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt index b1b7436c281..54e51a8721a 100644 --- a/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt +++ b/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt @@ -2,8 +2,8 @@ package sample -actual interface A { - actual fun foo() +actual interface A { + actual fun foo() fun bar() } diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt index c66f893d494..9e40e7f0756 100644 --- a/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt +++ b/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt @@ -2,8 +2,8 @@ package sample -actual interface A { - actual fun foo() +actual interface A { + actual fun foo() fun baz() } diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt index bb69e60f25a..b4217a515c6 100644 --- a/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt +++ b/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt @@ -6,8 +6,8 @@ interface BB interface CC interface DD -expect interface A { - fun foo_A() +expect interface A { + fun foo_A() } fun take0(x: A): AA = null!! diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt index fc55ae8f0f3..0f93db64c1f 100644 --- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt +++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt @@ -1,7 +1,7 @@ @file:Suppress("UNUSED_PARAMETER") package sample -expect interface B : A { +expect interface B : A { fun foo_B_1() } diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt index e3c86b64062..f646f332538 100644 --- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt +++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt @@ -1,7 +1,7 @@ @file:Suppress("UNUSED_PARAMETER") package sample -expect interface C : A { +expect interface C : A { fun foo_C_1() } diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt index 3e6ef38d791..cecb0f7b99a 100644 --- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt +++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt @@ -1,8 +1,8 @@ @file:Suppress("UNUSED_PARAMETER") package sample -actual interface A { - actual fun foo_A() +actual interface A { + actual fun foo_A() fun foo_A_3() } diff --git a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt index 6daf8537af1..5ef37848c39 100644 --- a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt +++ b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt @@ -9,8 +9,8 @@ interface D : A { fun foo_D() } -actual typealias B = D -actual typealias C = D +actual typealias B = D +actual typealias C = D fun take0(x: D): Unit = null!! diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt index 774ed917d01..f8e58b8b3b8 100644 --- a/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt +++ b/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt @@ -1,6 +1,6 @@ package sample -fun main() { +fun main() { A().foo() // fromLeft should be resolved, because 'left' comes first in dependencies order! A().fromLeft() diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt index 44ec2e78907..8b0c9ead635 100644 --- a/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt +++ b/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt @@ -1,6 +1,6 @@ package sample -actual class A /* Left */ { - actual fun foo(): Int = 42 +actual class A /* Left */ { + actual fun foo(): Int = 42 fun fromLeft(): String = "" } diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt index 2926acfa52c..e5b0fc49868 100644 --- a/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt +++ b/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt @@ -1,5 +1,5 @@ package sample -actual class A /* Right */ { - actual fun foo(): Int = 100500 +actual class A /* Right */ { + actual fun foo(): Int = 100500 } \ No newline at end of file diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt index a359748ada8..efd43ff67a9 100644 --- a/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt +++ b/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt @@ -1,5 +1,5 @@ package sample -expect class A { - fun foo(): Int +expect class A { + fun foo(): Int } \ No newline at end of file diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt index d1d8c72d0c5..c3a3fb50dab 100644 --- a/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt +++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt @@ -1 +1 @@ -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt index 04176df5fb3..05d8ac707a7 100644 --- a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt +++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt @@ -1,4 +1,4 @@ -actual class A +actual class A // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies actual class B diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt index 04176df5fb3..05d8ac707a7 100644 --- a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt +++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt @@ -1,4 +1,4 @@ -actual class A +actual class A // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies actual class B diff --git a/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt index e2147a3138b..7d19eb1d9c0 100644 --- a/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt +++ b/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt @@ -1,3 +1,3 @@ package foo -actual class A \ No newline at end of file +actual class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt index e84eaec9c89..d1137515042 100644 --- a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt +++ b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt @@ -1,3 +1,3 @@ package foo -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt index 1de923ea4ad..1bf9764942d 100644 --- a/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt +++ b/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt @@ -1,6 +1,6 @@ package foo -actual class ActualInMiddleCompatibleInBottom +actual class ActualInMiddleCompatibleInBottom class CompatibleInMiddleActualInBottom class CompatibleInMiddleAndBottom \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt index 502bde6fc0c..51b75054ac3 100644 --- a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt +++ b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt @@ -2,7 +2,7 @@ package foo -expect class ActualInMiddleCompatibleInBottom +expect class ActualInMiddleCompatibleInBottom expect class CompatibleInMiddleActualInBottom expect class CompatibleInMiddleAndBottom \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt index e2147a3138b..7d19eb1d9c0 100644 --- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt +++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt @@ -1,3 +1,3 @@ package foo -actual class A \ No newline at end of file +actual class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt index 587cf9e0e7e..18061733924 100644 --- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt +++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt @@ -2,4 +2,4 @@ package foo -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt index c6cb1d20e89..9cb1a0fc9a4 100644 --- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt +++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt @@ -1,3 +1,3 @@ package foo -actual fun foo(): Int = 42 \ No newline at end of file +actual fun foo(): Int = 42 \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt index 801eaf23873..27e51ca729e 100644 --- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt +++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt @@ -1,3 +1,3 @@ package foo -expect fun foo(): Int \ No newline at end of file +expect fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt index 21a344f975a..b61482b96d8 100644 --- a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt +++ b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt @@ -1,3 +1,3 @@ // !RENDER_DIAGNOSTICS_MESSAGES -actual class A \ No newline at end of file +actual class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt index d1d8c72d0c5..c125bb704ce 100644 --- a/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt +++ b/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt @@ -1 +1 @@ -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt index d1d8c72d0c5..c125bb704ce 100644 --- a/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt +++ b/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt @@ -1 +1 @@ -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt index 72e8e852980..01f45a4f850 100644 --- a/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt +++ b/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt @@ -1,3 +1,3 @@ // Note that here we have no ambiguity, becuase we don't consider // declarations without 'expect' as potential weakly-compatible 'expect'-counterpart -actual class A \ No newline at end of file +actual class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt index d1d8c72d0c5..c125bb704ce 100644 --- a/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt +++ b/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt @@ -1 +1 @@ -expect class A \ No newline at end of file +expect class A \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt index e5dcb22c9a4..345a75d7011 100644 --- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt +++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt @@ -1 +1 @@ -actual fun foo(): Int = 42 \ No newline at end of file +actual fun foo(): Int = 42 \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt index f5ed19d2be4..2c6611d4048 100644 --- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt +++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt @@ -1 +1 @@ -expect fun foo(): Int \ No newline at end of file +expect fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt index 03905c01a3a..914781262ef 100644 --- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt +++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt @@ -1 +1 @@ -expect fun foo(x: Int): Int \ No newline at end of file +expect fun foo(x: Int): Int \ No newline at end of file diff --git a/idea/testData/multiplatform/extensionOnExpect/common/common.kt b/idea/testData/multiplatform/extensionOnExpect/common/common.kt index f5ed5d3c5e8..73dfbd5ee50 100644 --- a/idea/testData/multiplatform/extensionOnExpect/common/common.kt +++ b/idea/testData/multiplatform/extensionOnExpect/common/common.kt @@ -1,3 +1,3 @@ -expect class E { - fun commonMember() +expect class E { + fun commonMember() } \ No newline at end of file diff --git a/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt b/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt index 0bfd36b512d..ae63798640c 100644 --- a/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt +++ b/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class E { - actual fun commonMember() {} +actual class E { + actual fun commonMember() {} fun platformMember() {} } \ No newline at end of file diff --git a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt index 8c9f28d9ba5..e9550db10ba 100644 --- a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt +++ b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt @@ -1,6 +1,6 @@ package foo -expect class ExpectInCommonActualInMiddle +expect class ExpectInCommonActualInMiddle expect class ExpectInCommonActualInPlatforms expect class ExpectInCommonWithoutActual diff --git a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt index df196c6a41f..2a66eadb629 100644 --- a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt +++ b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt @@ -2,9 +2,9 @@ package foo actual class ExpectInCommonActualInPlatforms -actual class ExpectInMiddleActualInPlatforms +actual class ExpectInMiddleActualInPlatforms expect class ExpectInJsWithoutActual -expect class ExpectInJsActualInJs -actual class ExpectInJsActualInJs \ No newline at end of file +expect class ExpectInJsActualInJs +actual class ExpectInJsActualInJs \ No newline at end of file diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt index 1e805d06dee..cddd7ac3ff8 100644 --- a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt +++ b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt @@ -1,9 +1,9 @@ package foo actual class ExpectInCommonActualInPlatforms -actual class ExpectInMiddleActualInPlatforms +actual class ExpectInMiddleActualInPlatforms expect class ExpectInJvmWithoutActual -expect class ExpectInJvmActualInJvm -actual class ExpectInJvmActualInJvm +expect class ExpectInJvmActualInJvm +actual class ExpectInJvmActualInJvm diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt index be9956fa5aa..b0b0d46312a 100644 --- a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt +++ b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt @@ -1,7 +1,7 @@ package foo -actual class ExpectInCommonActualInMiddle +actual class ExpectInCommonActualInMiddle -expect class ExpectInMiddleActualInPlatforms +expect class ExpectInMiddleActualInPlatforms expect class ExpectInMiddleWithoutActual diff --git a/idea/testData/multiplatform/incompleteActualization/js/js.kt b/idea/testData/multiplatform/incompleteActualization/js/js.kt index dbc5bdf0dfb..dc34f0bfa17 100644 --- a/idea/testData/multiplatform/incompleteActualization/js/js.kt +++ b/idea/testData/multiplatform/incompleteActualization/js/js.kt @@ -1,4 +1,4 @@ package foo actual class ExpectInCommonActualInJsOnly -actual class ExpectInMiddleActualInJsOnly \ No newline at end of file +actual class ExpectInMiddleActualInJsOnly \ No newline at end of file diff --git a/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt b/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt index aad88a99fbf..325684bd89e 100644 --- a/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt +++ b/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt @@ -1,4 +1,4 @@ package foo actual class ExpectInCommonActualInJvmOnly -actual class ExpectInMiddleActualInJvmOnly \ No newline at end of file +actual class ExpectInMiddleActualInJvmOnly \ No newline at end of file diff --git a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt index 7c20ed87f58..af442dc30cf 100644 --- a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt +++ b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt @@ -1,4 +1,4 @@ package foo -expect class ExpectInMiddleActualInJsOnly -expect class ExpectInMiddleActualInJvmOnly \ No newline at end of file +expect class ExpectInMiddleActualInJsOnly +expect class ExpectInMiddleActualInJvmOnly \ No newline at end of file diff --git a/idea/testData/multiplatform/jsNameClash/common/common.kt b/idea/testData/multiplatform/jsNameClash/common/common.kt index 173ec86e912..7557dd55776 100644 --- a/idea/testData/multiplatform/jsNameClash/common/common.kt +++ b/idea/testData/multiplatform/jsNameClash/common/common.kt @@ -1,7 +1,7 @@ package sample -expect interface Input +expect interface Input -abstract class AbstractInput : Input { +abstract class AbstractInput : Input { val head: Int = null!! } \ No newline at end of file diff --git a/idea/testData/multiplatform/jsNameClash/js/js.kt b/idea/testData/multiplatform/jsNameClash/js/js.kt index 826ddab533e..28e76019387 100644 --- a/idea/testData/multiplatform/jsNameClash/js/js.kt +++ b/idea/testData/multiplatform/jsNameClash/js/js.kt @@ -1,10 +1,10 @@ package sample -actual interface Input +actual interface Input class JSInput : AbstractInput() // ------------------------------------ -expect class ExpectInJsActualInJs -actual class ExpectInJsActualInJs \ No newline at end of file +expect class ExpectInJsActualInJs +actual class ExpectInJsActualInJs \ No newline at end of file diff --git a/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt b/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt index e87a2d0e5eb..6767bf46fce 100644 --- a/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt +++ b/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt @@ -1,9 +1,9 @@ package base -interface Check { - fun test(): String { +interface Check { + fun test(): String { return "fail"; } } -open class CheckClass : Check \ No newline at end of file +open class CheckClass : Check \ No newline at end of file diff --git a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt index 855274eb2fb..117dcc150b5 100644 --- a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt +++ b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt @@ -1,7 +1,7 @@ import base.* -interface SubCheck : Check { - override fun test(): String { +interface SubCheck : Check { + override fun test(): String { return "OK" } } diff --git a/idea/testData/multiplatform/lambdas/common/common.kt b/idea/testData/multiplatform/lambdas/common/common.kt index d99edc5c950..e0762630055 100644 --- a/idea/testData/multiplatform/lambdas/common/common.kt +++ b/idea/testData/multiplatform/lambdas/common/common.kt @@ -2,7 +2,7 @@ package sample -expect interface A +expect interface A fun useA(block: A.() -> Unit) {} diff --git a/idea/testData/multiplatform/lambdas/jvm/jvm.kt b/idea/testData/multiplatform/lambdas/jvm/jvm.kt index 4d1fafed9e6..dd095317abe 100644 --- a/idea/testData/multiplatform/lambdas/jvm/jvm.kt +++ b/idea/testData/multiplatform/lambdas/jvm/jvm.kt @@ -1,6 +1,6 @@ package sample -actual interface A { +actual interface A { fun foo() } diff --git a/idea/testData/multiplatform/languageConstructions/common/common.kt b/idea/testData/multiplatform/languageConstructions/common/common.kt index 01466bf5ea4..93330ab5ed7 100644 --- a/idea/testData/multiplatform/languageConstructions/common/common.kt +++ b/idea/testData/multiplatform/languageConstructions/common/common.kt @@ -1,10 +1,10 @@ package sample -expect class A { - fun commonFun() - val x: Int - val y: Double - val z: String +expect class A { + fun commonFun() + val x: Int + val y: Double + val z: String } fun getCommonA(): A = null!! \ No newline at end of file diff --git a/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt b/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt index d7e898984a7..78ea1c2460d 100644 --- a/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt +++ b/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt @@ -2,11 +2,11 @@ package sample -actual data class A(actual val x: Int, actual val y: Double, val t: String) { - actual fun commonFun() {} +actual data class A(actual val x: Int, actual val y: Double, val t: String) { + actual fun commonFun() {} fun platformFun() {} - actual val z: String by lazy { "" } + actual val z: String by lazy { "" } operator fun iterator(): Iterator = null!! } diff --git a/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt b/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt index 9691edc3642..cc761fd8fe0 100644 --- a/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt +++ b/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt @@ -2,12 +2,12 @@ package sample -expect interface A { +expect interface A { fun common_1_A() } -expect interface B : A { - fun common_1_B() +expect interface B : A { + fun common_1_B() } fun getB(): B = null!! diff --git a/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt b/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt index 091ad08f3e4..5fb8a45458a 100644 --- a/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt +++ b/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt @@ -2,15 +2,15 @@ package sample -expect interface A_Common { - fun common_1_A() - fun common_2_A() +expect interface A_Common { + fun common_1_A() + fun common_2_A() } -actual typealias A = A_Common +actual typealias A = A_Common -actual interface B : A { - actual fun common_1_B() +actual interface B : A { + actual fun common_1_B() fun common_1_2_B() } diff --git a/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt b/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt index 9492bff1f2f..b84b47d59ad 100644 --- a/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt +++ b/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt @@ -1,8 +1,8 @@ package sample -actual interface A_Common { - actual fun common_1_A() - actual fun common_2_A() +actual interface A_Common { + actual fun common_1_A() + actual fun common_2_A() fun jvm_A() } diff --git a/idea/testData/multiplatform/multiplatformLibrary/common/common.kt b/idea/testData/multiplatform/multiplatformLibrary/common/common.kt new file mode 100644 index 00000000000..48cb49c4809 --- /dev/null +++ b/idea/testData/multiplatform/multiplatformLibrary/common/common.kt @@ -0,0 +1,11 @@ +package sample + +expect class Sample() { + fun checkMe(): Int +} + +expect object Platform { + val name: String +} + +fun hello(): String = "Hello from ${Platform.name}" \ No newline at end of file diff --git a/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt b/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt new file mode 100644 index 00000000000..043dae49965 --- /dev/null +++ b/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt @@ -0,0 +1,8 @@ +MODULE common { platform=[JVM, JS, Native]; root=common } +MODULE jvm { platform=[JVM]; root=jvm; testRoot=jvmTest} +MODULE js { platform=[JS]; root=js } + +common -> STDLIB_COMMON { kind=DEPENDENCY } +jvm -> common { kind=DEPENDS_ON } +jvm -> STDLIB_JVM, KOTLIN_TEST, KOTLIN_TEST_JVM, JUNIT, MOCK_JDK { kind=DEPENDENCY } +js -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiplatform/multiplatformLibrary/js/js.kt b/idea/testData/multiplatform/multiplatformLibrary/js/js.kt new file mode 100644 index 00000000000..9b6d8c25e2b --- /dev/null +++ b/idea/testData/multiplatform/multiplatformLibrary/js/js.kt @@ -0,0 +1,9 @@ +package sample + +actual class Sample { + actual fun checkMe() = 12 +} + +actual object Platform { + actual val name: String = "JS" +} \ No newline at end of file diff --git a/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt b/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt new file mode 100644 index 00000000000..65ed9655a3d --- /dev/null +++ b/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt @@ -0,0 +1,9 @@ +package sample + +actual class Sample { + actual fun checkMe() = 42 +} + +actual object Platform { + actual val name: String = "JVM" +} \ No newline at end of file diff --git a/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt b/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt new file mode 100644 index 00000000000..bb5b6137226 --- /dev/null +++ b/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt @@ -0,0 +1,11 @@ +package sample + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsJVM { + @Test + fun testHello() { + assertTrue("JVM" in hello()) + } +} \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpect/common/common.kt b/idea/testData/multiplatform/overrideExpect/common/common.kt index 773e3246626..7305740cb89 100644 --- a/idea/testData/multiplatform/overrideExpect/common/common.kt +++ b/idea/testData/multiplatform/overrideExpect/common/common.kt @@ -1,13 +1,13 @@ -expect class Expect +expect class Expect -interface Base { - fun expectInReturnType(): Expect +interface Base { + fun expectInReturnType(): Expect fun expectInArgument(e: Expect) fun Expect.expectInReceiver() - val expectVal: Expect + val expectVal: Expect - var expectVar: Expect + var expectVar: Expect } \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt index 7b7e579d9f5..c057f345c99 100644 --- a/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt +++ b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt @@ -1,13 +1,13 @@ -actual typealias Expect = String +actual typealias Expect = String interface Derived : Base { - override fun expectInReturnType(): Expect + override fun expectInReturnType(): Expect - override fun expectInArgument(e: Expect) + override fun expectInArgument(e: Expect) - override fun Expect.expectInReceiver() + override fun Expect.expectInReceiver() - override val expectVal: Expect + override val expectVal: Expect - override var expectVar: Expect + override var expectVar: Expect } diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt index 940c07085ed..59574c34944 100644 --- a/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt +++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt @@ -1,15 +1,15 @@ -expect class Expect +expect class Expect class Box(val x: T) -interface Base { - fun expectInReturnType(): Box +interface Base { + fun expectInReturnType(): Box fun expectInArgument(e: Box) fun Box.expectInReceiver() - val expectVal: Box + val expectVal: Box - var expectVar: Box + var expectVar: Box } \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt index cf654228119..54181303c01 100644 --- a/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt +++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt @@ -1,13 +1,13 @@ -actual typealias Expect = String +actual typealias Expect = String interface Derived : Base { - override fun expectInReturnType(): Box + override fun expectInReturnType(): Box - override fun expectInArgument(e: Box) + override fun expectInArgument(e: Box) - override fun Box.expectInReceiver() + override fun Box.expectInReceiver() - override val expectVal: Box + override val expectVal: Box - override var expectVar: Box + override var expectVar: Box } diff --git a/idea/testData/multiplatform/qualifiedReceiver/common/common.kt b/idea/testData/multiplatform/qualifiedReceiver/common/common.kt index 9ab6c434c83..ef3defd85ca 100644 --- a/idea/testData/multiplatform/qualifiedReceiver/common/common.kt +++ b/idea/testData/multiplatform/qualifiedReceiver/common/common.kt @@ -2,14 +2,14 @@ package foo -expect interface A { - fun commonFun() - val b: B - fun bFun(): B +expect interface A { + fun commonFun() + val b: B + fun bFun(): B } -expect interface B { - fun commonFunB() +expect interface B { + fun commonFunB() } class Common { diff --git a/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt b/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt index 4a3de83d101..26b445bf337 100644 --- a/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt +++ b/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt @@ -2,14 +2,14 @@ package foo -actual interface A { - actual fun commonFun() - actual val b: B - actual fun bFun(): B +actual interface A { + actual fun commonFun() + actual val b: B + actual fun bFun(): B fun platformFun() } -actual interface B { - actual fun commonFunB() +actual interface B { + actual fun commonFunB() fun platformFunB() } diff --git a/idea/testData/multiplatform/recursiveTypes/common/common.kt b/idea/testData/multiplatform/recursiveTypes/common/common.kt index e5b96aa9888..213663e4e48 100644 --- a/idea/testData/multiplatform/recursiveTypes/common/common.kt +++ b/idea/testData/multiplatform/recursiveTypes/common/common.kt @@ -1,7 +1,7 @@ package sample -expect interface A> { - fun foo(): T +expect interface A> { + fun foo(): T } interface B : A diff --git a/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt b/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt index cf9524cb7d3..19cf22e4295 100644 --- a/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt +++ b/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt @@ -1,7 +1,7 @@ package sample -actual interface A> { - actual fun foo(): T +actual interface A> { + actual fun foo(): T fun bar() : T } diff --git a/idea/testData/multiplatform/simple/d4/d4.kt b/idea/testData/multiplatform/simple/d4/d4.kt index 7dfc10ee63a..af5f6dd26ec 100644 --- a/idea/testData/multiplatform/simple/d4/d4.kt +++ b/idea/testData/multiplatform/simple/d4/d4.kt @@ -1,6 +1,6 @@ package foobar import bar.baz -fun main() { +fun main() { baz().foo() } diff --git a/idea/testData/multiplatform/supertypes/d0/d0.kt b/idea/testData/multiplatform/supertypes/d0/d0.kt index 93989981f6d..8eb856310a0 100644 --- a/idea/testData/multiplatform/supertypes/d0/d0.kt +++ b/idea/testData/multiplatform/supertypes/d0/d0.kt @@ -1,5 +1,5 @@ package d0 -interface AnotherSupertype { +interface AnotherSupertype { fun another() } diff --git a/idea/testData/multiplatform/supertypes/d1/d1.kt b/idea/testData/multiplatform/supertypes/d1/d1.kt index e44b00b5ecf..2f746c059ca 100644 --- a/idea/testData/multiplatform/supertypes/d1/d1.kt +++ b/idea/testData/multiplatform/supertypes/d1/d1.kt @@ -2,7 +2,7 @@ package foo -expect interface Supertype +expect interface Supertype class A : Supertype diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt index a5255868830..9afdf91cd98 100644 --- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt @@ -1,7 +1,7 @@ package test -expect class Expect { - fun commonFun(): String +expect class Expect { + fun commonFun(): String } fun topLevelCommonFun(): Int = 42 \ No newline at end of file diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt index e66a68497f6..00a33beb229 100644 --- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt @@ -1,7 +1,7 @@ package test -actual class Expect { - actual fun commonFun(): String = "" +actual class Expect { + actual fun commonFun(): String = "" fun platformFun(): Int = 42 } diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt index 4c8d8e9fd40..6ade5bda72c 100644 --- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt +++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt @@ -1,6 +1,6 @@ package test -fun main() { +fun main() { val e = Expect() e.platformFun() diff --git a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt index d4559d2f090..38744befaab 100644 --- a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt +++ b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt @@ -1,5 +1,5 @@ -expect class A { - fun commonMember() +expect class A { + fun commonMember() } typealias TypealiasFromCommon = A \ No newline at end of file diff --git a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt index ccd352e371d..57a4f0c59ec 100644 --- a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt +++ b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class A { - actual fun commonMember() { } +actual class A { + actual fun commonMember() { } fun platformMember() { } } diff --git a/idea/testData/multiplatform/typeAliases/common/aliases.kt b/idea/testData/multiplatform/typeAliases/common/aliases.kt index 765e15b6532..9b78a8b4223 100644 --- a/idea/testData/multiplatform/typeAliases/common/aliases.kt +++ b/idea/testData/multiplatform/typeAliases/common/aliases.kt @@ -2,14 +2,14 @@ package aliases -expect interface A { - fun commonFun() +expect interface A { + fun commonFun() } typealias A1 = A -expect interface B { - fun commonFun() +expect interface B { + fun commonFun() } typealias B1 = B diff --git a/idea/testData/multiplatform/typeAliases/jvm/aliases.kt b/idea/testData/multiplatform/typeAliases/jvm/aliases.kt index 6fe1183ea57..84842905e10 100644 --- a/idea/testData/multiplatform/typeAliases/jvm/aliases.kt +++ b/idea/testData/multiplatform/typeAliases/jvm/aliases.kt @@ -2,15 +2,15 @@ package aliases -actual interface A { - actual fun commonFun() +actual interface A { + actual fun commonFun() fun platformFun() } typealias A2 = A1 typealias A3 = A -actual typealias B = A +actual typealias B = A typealias B2 = B typealias B3 = B1 diff --git a/idea/testData/multiplatform/typeParameters/common/common.kt b/idea/testData/multiplatform/typeParameters/common/common.kt index 83a15f8e137..ce7b2bbf7f1 100644 --- a/idea/testData/multiplatform/typeParameters/common/common.kt +++ b/idea/testData/multiplatform/typeParameters/common/common.kt @@ -2,8 +2,8 @@ package foo -expect interface A { - fun commonFun() +expect interface A { + fun commonFun() } class CommonGen { diff --git a/idea/testData/multiplatform/typeParameters/jvm/platform.kt b/idea/testData/multiplatform/typeParameters/jvm/platform.kt index 9376a93e679..4bb405f52e4 100644 --- a/idea/testData/multiplatform/typeParameters/jvm/platform.kt +++ b/idea/testData/multiplatform/typeParameters/jvm/platform.kt @@ -2,17 +2,17 @@ package foo -interface B +interface B -actual interface A : B { - actual fun commonFun() +actual interface A : B { + actual fun commonFun() - fun platformFun() + fun platformFun() } class AImpl : A { - override fun commonFun() {} - override fun platformFun() {} + override fun commonFun() {} + override fun platformFun() {} } @Suppress("UNUSED_PARAMETER") diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt new file mode 100644 index 00000000000..271daa38e86 --- /dev/null +++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt @@ -0,0 +1,4 @@ +package sample +fun common(): Boolean { + return "" +} \ No newline at end of file diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt new file mode 100644 index 00000000000..87e0cef0ed8 --- /dev/null +++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt @@ -0,0 +1,7 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } +MODULE js { platform=[JS] } + +common -> STDLIB_COMMON { kind=DEPENDENCY } +jvm -> common { kind=DEPENDS_ON } +js -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/js/js.kt similarity index 100% rename from idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt rename to idea/testData/multiplatform/unresolvedInMultiplatformLibrary/js/js.kt diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt new file mode 100644 index 00000000000..9baaee42434 --- /dev/null +++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt @@ -0,0 +1,6 @@ +package sample + +fun jvm() { + println(common()) + println(js()) +} \ No newline at end of file diff --git a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt index 42684e64765..a2b820853d8 100644 --- a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt +++ b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt @@ -1,4 +1,4 @@ package sample -actual class A { +actual class A { } \ No newline at end of file diff --git a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt index f385c7d7ea1..16e5cb0e900 100644 --- a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt +++ b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt @@ -1,5 +1,5 @@ package sample -expect class A { +expect class A { fun f() } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java index 578f1dac89c..46f83369c3b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -179,6 +179,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/multilevelParents/"); } + @TestMetadata("multiplatformLibrary") + public void testMultiplatformLibrary() throws Exception { + runTest("idea/testData/multiplatform/multiplatformLibrary/"); + } + @TestMetadata("overrideExpect") public void testOverrideExpect() throws Exception { runTest("idea/testData/multiplatform/overrideExpect/"); @@ -239,6 +244,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/typeParameters/"); } + @TestMetadata("unresolvedInMultiplatformLibrary") + public void testUnresolvedInMultiplatformLibrary() throws Exception { + runTest("idea/testData/multiplatform/unresolvedInMultiplatformLibrary/"); + } + @TestMetadata("useCorrectBuiltIns") public void testUseCorrectBuiltIns() throws Exception { runTest("idea/testData/multiplatform/useCorrectBuiltIns/"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt index 33032319348..d51b2285296 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt @@ -218,7 +218,8 @@ class CodeMetaInfoTestCase( abstract class AbstractDiagnosticCodeMetaInfoTest : AbstractCodeMetaInfoTest() { override fun getConfigurations() = listOf( - DiagnosticCodeMetaInfoRenderConfiguration() + DiagnosticCodeMetaInfoRenderConfiguration(), + LineMarkerRenderConfiguration() ) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt index f3f15bc0e0a..b186c9bcdb9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt @@ -29,7 +29,9 @@ open class HighlightingRenderConfiguration( if (renderSeverity) params.add("severity='${highlightingCodeMetaInfo.highlightingInfo.severity}'") if (renderDescription) - params.add("descr='${sanitizeLineBreaks(highlightingCodeMetaInfo.highlightingInfo.description)}'") + params.add("descr='${ + highlightingCodeMetaInfo.highlightingInfo.description?.let { sanitizeLineBreaks(highlightingCodeMetaInfo.highlightingInfo.description) } + }'") if (renderTextAttributesKey) params.add("textAttributesKey='${highlightingCodeMetaInfo.highlightingInfo.forcedTextAttributesKey}'") diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt index 4c5d5fec618..b8d250e5d32 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt @@ -21,7 +21,7 @@ open class LineMarkerRenderConfiguration(var renderDescription: Boolean = true) if (!renderParams) return "" val params = mutableListOf() - if (renderDescription) + if (renderDescription && lineMarkerCodeMetaInfo.lineMarker.lineMarkerTooltip != null) params.add("descr='${sanitizeLineMarkerTooltip(lineMarkerCodeMetaInfo.lineMarker.lineMarkerTooltip)}'") params.add(getAdditionalParams(lineMarkerCodeMetaInfo)) diff --git a/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt b/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt index 391d3e1b3f9..e06c1296f47 100644 --- a/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt +++ b/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.projectModel +import com.intellij.openapi.application.PathManager import com.intellij.openapi.roots.libraries.PersistentLibraryKind import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.idea.framework.CommonLibraryKind @@ -154,6 +155,20 @@ sealed class KotlinTest( JvmPlatforms.defaultJvmPlatform, null ) + + object JustKotlinTest : KotlinTest( + "kotlin-test", + ForTestCompileRuntime.kotlinTestJarForTests(), + JvmPlatforms.defaultJvmPlatform, + null + ) + + object Junit : KotlinTest( + "junit", + File("${PathManager.getHomePath().replace(File.separatorChar, '/')}/lib/junit-4.12.jar"), + JvmPlatforms.defaultJvmPlatform, + null + ) } diff --git a/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt b/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt index e741a855744..16e30f74ed0 100644 --- a/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt +++ b/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt @@ -23,7 +23,9 @@ open class ProjectStructureParser(private val projectRoot: File) { "FULL_JDK" to ResolveLibrary.Builder(FullJdk), "MOCK_JDK" to ResolveLibrary.Builder(MockJdk), "KOTLIN_TEST_JS" to ResolveLibrary.Builder(KotlinTest.JsKotlinTest), - "KOTLIN_TEST_JVM" to ResolveLibrary.Builder(KotlinTest.JvmKotlinTest) + "KOTLIN_TEST_JVM" to ResolveLibrary.Builder(KotlinTest.JvmKotlinTest), + "KOTLIN_TEST" to ResolveLibrary.Builder(KotlinTest.JustKotlinTest), + "JUNIT" to ResolveLibrary.Builder(KotlinTest.Junit) ) fun parse(text: String): ProjectResolveModel {