diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt index 327c76c341a..10b44a4f9c1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt @@ -107,7 +107,7 @@ class TextDiagnostic( extractDataBefore(matcher.group(2), ":") val name = matcher.group(3) - val parameters = matcher.group(4) ?: return TextDiagnostic( + val parameters = matcher.group(5) ?: return TextDiagnostic( name, platform, null, diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt index 463d99ff1d1..6751687e89c 100644 --- a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt @@ -1,4 +1,4 @@ -actual class WithConstructor actual constructor(actual val x: Int, actual val s: String) +actual class WithConstructor actual constructor(actual val x: Int, actual val s: String) /* LINEMARKER: Has declaration in common module diff --git a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt index 13b3b1fe791..0dfc7338f67 100644 --- a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt +++ b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt @@ -1,6 +1,6 @@ -open class ExpectedChild [testModule_Common]
    ExpectedChild [testModule_JVM]
    SimpleChild
Click or press Ctrl+Alt+B to navigate
">SimpleParent +open class SimpleParent -expect class ExpectedChild : SimpleParent +expect class ExpectedChild : SimpleParent class SimpleChild : SimpleParent() \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt index c7848f8b937..0fb926b4985 100644 --- a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt @@ -1,8 +1,8 @@ package test -actual enum class Enum { - A, - B, - C, +actual enum class Enum { + A, + B, + C, D } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt index 0c6e2c14140..35b3db6102e 100644 --- a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt @@ -1,6 +1,6 @@ package test -actual enum class Enum { A, B, C } +actual enum class Enum { A, B, C } /* LINEMARKER: Has declaration in common module diff --git a/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt index 7a5e725d644..2b5478c0768 100644 --- a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt @@ -1,5 +1,5 @@ -expect class WithConstructor(x: Int, s: String) { - val x: Int +expect class WithConstructor(x: Int, s: String) { + val x: Int - val s: String + val s: String } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt index 299bd98f447..0ed0bf85630 100644 --- a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt @@ -1,7 +1,7 @@ package test -expect enum class Enum { - A, - B, - C +expect enum class Enum { + A, + B, + C } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt index 065dd8f0523..cbf5dcf0675 100644 --- a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt @@ -1,6 +1,6 @@ package test -expect enum class Enum { A, B, C, D } +expect enum class Enum { A, B, C, D } /* LINEMARKER: Has actuals in JVM diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt index 6c0f30ab284..d66935c2213 100644 --- a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt @@ -1,7 +1,7 @@ package test -expect enum class Enum { - A, B, C, D +expect enum class Enum { + A, B, C, D } /* diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ 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 fa233eae1d0..53282e881ae 100644 --- a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt +++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt @@ -1,9 +1,9 @@ package sample -expect fun sameFile() +expect fun sameFile() -actual fun sameFile() = Unit +actual fun sameFile() = Unit -expect fun sameModule() +expect fun sameModule() fun noExpectActualDeclaration() = Unit \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt new file mode 100644 index 00000000000..8da128002e5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt @@ -0,0 +1 @@ +MODULE common { platform=[JVM, JS, Native] } diff --git a/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt index 6e2612c3fda..c8e65651448 100644 --- a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt @@ -1,4 +1,4 @@ -actual annotation class Ann actual constructor( - actual val x: Int, - actual val y: String +actual annotation class Ann actual constructor( + actual val x: Int, + actual val y: String ) diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt index e44371c8b76..5abadf3d27d 100644 --- a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt @@ -1,6 +1,6 @@ -actual annotation class Ann( - actual val x: Int, actual val y: String, - actual val z: Double, actual val b: Boolean +actual annotation class Ann( + actual val x: Int, actual val y: String, + actual val z: Double, actual val b: Boolean ) /* diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt index ec3badfc50f..91f4d34938c 100644 --- a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class WithCompanion { - actual companion object { +actual class WithCompanion { + actual companion object { } } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt index 604846fad0f..960c0b31601 100644 --- a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class NoConstructor2(name: String) { +actual class NoConstructor2(name: String) { val myName = name - actual fun extraFun() {} + actual fun extraFun() {} } diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt index 87cd13f446e..56128a1ab2a 100644 --- a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt @@ -1,10 +1,10 @@ -actual sealed class Sealed { +actual sealed class Sealed { - actual object Sealed1 : Sealed() + actual object Sealed1 : Sealed() - actual class Sealed2 : Sealed() { - actual val x = 42 - actual fun foo() = "" + actual class Sealed2 : Sealed() { + actual val x = 42 + actual fun foo() = "" } } diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt index bb6ef41c824..b7e0b67ea7b 100644 --- a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt @@ -1,5 +1,5 @@ -actual class SecondaryConstructor { - actual constructor(name: String, surname: String) {} +actual class SecondaryConstructor { + actual constructor(name: String, surname: String) {} } diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt index 7ae6035b463..a727af437aa 100644 --- a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt @@ -2,5 +2,5 @@ class Some { val x: String = "Some" } -actual typealias TypeAlias = Some +actual typealias TypeAlias = Some diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt index 7a8fcddc333..9ff4aa951af 100644 --- a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt @@ -1,4 +1,4 @@ -expect class Header { +expect class Header { } diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt index 41cf458d099..680c20354e8 100644 --- a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt +++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt @@ -1 +1 @@ -actual typealias Expected = ExpectedImpl \ No newline at end of file +actual typealias Expected = ExpectedImpl \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt index 6477429372c..0144f6531ec 100644 --- a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt @@ -1,11 +1,11 @@ -expect class Header { - fun foo(): Int +expect class Header { + fun foo(): Int } -expect class Incomplete { +expect class Incomplete { fun foo(): Int } -expect fun foo(arg: Int): String +expect fun foo(arg: Int): String -expect val flag: Boolean +expect val flag: Boolean diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt index 6b880d726aa..dcbf99a22d2 100644 --- a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt @@ -1,11 +1,11 @@ -actual class Header { - actual fun foo() = 42 +actual class Header { + actual fun foo() = 42 } -actual class Incomplete +actual class Incomplete -actual fun foo(arg: Int) = arg.toString() +actual fun foo(arg: Int) = arg.toString() -actual val flag = true +actual val flag = true diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt index c33599807b5..eebedf407a3 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt @@ -1,5 +1,5 @@ -expect class WithCompanion { - companion object { +expect class WithCompanion { + companion object { } } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt index cd7bdf8b692..99190697843 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt @@ -1,4 +1,4 @@ -expect annotation class Ann( - val x: Int, - val y: String +expect annotation class Ann( + val x: Int, + val y: String ) \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt index d5eeccb138e..cbf70367676 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt @@ -1,3 +1,3 @@ -expect class NoConstructor2 { - fun extraFun() +expect class NoConstructor2 { + fun extraFun() } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt index 94ca21d39a9..b1a37cd2667 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt @@ -1,9 +1,9 @@ -expect sealed class Sealed { +expect sealed class Sealed { - object Sealed1 : Sealed + object Sealed1 : Sealed - class Sealed2 : Sealed { - val x: Int - fun foo(): String + class Sealed2 : Sealed { + val x: Int + fun foo(): String } } diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt index f20aba4ec3c..9fed52110ad 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt @@ -1,3 +1,3 @@ -expect class SecondaryConstructor{ - constructor(name: String, surname: String) +expect class SecondaryConstructor{ + constructor(name: String, surname: String) } diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt index c19aa8bb8a1..8615ed4a5d5 100644 --- a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt +++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt @@ -1,3 +1,3 @@ -expect class TypeAlias { +expect class TypeAlias { val x: String } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt index 26251a07f1f..1d9bd2cc5c1 100644 --- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt @@ -1,21 +1,21 @@ package test -open class SimpleParent { - open fun foo(n: Int) {} - open val bar: Int get() = 1 +open class SimpleParent { + open fun foo(n: Int) {} + open val bar: Int get() = 1 } -expect open class ExpectedChild : SimpleParent { - override fun foo(n: Int) - override val bar: Int +expect open class ExpectedChild : SimpleParent { + override fun foo(n: Int) + override val bar: Int } class ExpectedChildChild : ExpectedChild() { - override fun foo(n: Int) {} - override val bar: Int get() = 1 + override fun foo(n: Int) {} + override val bar: Int get() = 1 } class SimpleChild : SimpleParent() { - override fun foo(n: Int) {} - override val bar: Int get() = 1 + override fun foo(n: Int) {} + override val bar: Int get() = 1 } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt index c5fb5905f01..5443d3b24bb 100644 --- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt @@ -1,21 +1,21 @@ package test -open class SimpleParent { - open fun `foo fun`(n: Int) {} - open val `bar fun`: Int get() = 1 +open class SimpleParent { + open fun `foo fun`(n: Int) {} + open val `bar fun`: Int get() = 1 } -expect open class ExpectedChild : SimpleParent { - override fun `foo fun`(n: Int) - override val `bar fun`: Int +expect open class ExpectedChild : SimpleParent { + override fun `foo fun`(n: Int) + override val `bar fun`: Int } class ExpectedChildChild : ExpectedChild() { - override fun `foo fun`(n: Int) {} - override val `bar fun`: Int get() = 1 + override fun `foo fun`(n: Int) {} + override val `bar fun`: Int get() = 1 } class SimpleChild : SimpleParent() { - override fun `foo fun`(n: Int) {} - override val `bar fun`: Int get() = 1 + override fun `foo fun`(n: Int) {} + override val `bar fun`: Int get() = 1 } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt index 490d72915ea..4111f1ed22a 100644 --- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt +++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt @@ -1,11 +1,11 @@ package test -actual open class ExpectedChild : SimpleParent() { - actual override fun foo(n: Int) {} - actual override val bar: Int get() = 1 +actual open class ExpectedChild : SimpleParent() { + actual override fun foo(n: Int) {} + actual override val bar: Int get() = 1 } class ExpectedChildChildJvm : ExpectedChild() { - override fun foo(n: Int) {} - override val bar: Int get() = 1 + override fun foo(n: Int) {} + override val bar: Int get() = 1 } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt index dd5b060371c..418f4218b61 100644 --- a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt +++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt @@ -1,5 +1,5 @@ -interface I { - suspend fun foo(s: String) +interface I { + suspend fun foo(s: String) } /* diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt new file mode 100644 index 00000000000..5820c9936e0 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt @@ -0,0 +1,6 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } +MODULE js { platform=[JS] } + +jvm -> common { kind=DEPENDS_ON } +js -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt b/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt index cc1c972043c..2c6611d4048 100644 --- a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt +++ b/idea/testData/multiModuleLineMarker/transitive/base_common/common.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/multiModuleLineMarker/transitive/dependencies.txt b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt new file mode 100644 index 00000000000..b2fde8faed7 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt @@ -0,0 +1,6 @@ +MODULE base_common { platform=[JVM, JS, Native] } +MODULE base_jvm { platform=[JVM] } +MODULE user_jvm { platform=[JVM] } + +base_jvm -> base_common { kind=DEPENDS_ON } +user_jvm -> base_common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt similarity index 100% rename from idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt rename to idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt new file mode 100644 index 00000000000..0249f83a26e --- /dev/null +++ b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt @@ -0,0 +1,6 @@ +MODULE base_common { platform=[JVM, JS, Native] } +MODULE user_common { platform=[JVM, JS, Native] } +MODULE user_jvm { platform=[JVM] } + +user_common -> base_common { kind=DEPENDS_ON } +user_jvm -> user_common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt similarity index 100% rename from idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt rename to idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt new file mode 100644 index 00000000000..07b1da0e710 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt @@ -0,0 +1,3 @@ +actual class Expected { + actual val some = Some() +} \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt deleted file mode 100644 index 68715f9470e..00000000000 --- a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt +++ /dev/null @@ -1,3 +0,0 @@ -actual class Expected { - actual val some = Some() -} \ No newline at end of file diff --git a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt index a1965111cc2..ad60efb0710 100644 --- a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt +++ b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt @@ -1,3 +1,3 @@ -expect fun foo(): Int +expect fun foo(): Int -expect fun foo(arg: Int): Int +expect fun foo(arg: Int): Int diff --git a/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt new file mode 100644 index 00000000000..549b0097cf5 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt @@ -0,0 +1,4 @@ +MODULE common { platform=[JVM, JS, Native] } +MODULE jvm { platform=[JVM] } + +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt index 3e104408702..6ed47dac6c9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt @@ -5,22 +5,10 @@ package org.jetbrains.kotlin.idea.caches.resolve -import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromDirStructure +import org.jetbrains.kotlin.idea.codeMetaInfo.AbstractLineMarkerCodeMetaInfoTest import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import java.io.File -abstract class AbstractMultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() { +abstract class AbstractMultiModuleLineMarkerTest : AbstractLineMarkerCodeMetaInfoTest() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleLineMarker/" - - override val shouldCheckLineMarkers = true - - override val shouldCheckResult = false - - override fun doTestLineMarkers() = true - - protected fun doTest(path: String) { - setupMppProjectFromDirStructure(File(path)) - checkLineMarkersInProject() - } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt index b82e39a2f52..b7f5bf28cd6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt @@ -29,7 +29,9 @@ import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.io.exists import gnu.trove.TIntArrayList import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest +import org.jetbrains.kotlin.checkers.diagnostics.DebugInfoDiagnostic import org.jetbrains.kotlin.checkers.diagnostics.SyntaxErrorDiagnostic +import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory0 import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration import org.jetbrains.kotlin.daemon.common.OSKind @@ -49,9 +51,11 @@ import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest import org.jetbrains.kotlin.idea.util.sourceRoots import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.KotlinTestUtils +import org.junit.Ignore import java.io.File import java.nio.file.Paths +@Ignore class CodeMetaInfoTestCase( val codeMetaInfoTypes: Collection, val checkNoDiagnosticError: Boolean = false @@ -158,12 +162,11 @@ class CodeMetaInfoTestCase( codeMetaInfo.platforms.add(OSKind.current.toString()) } } - if (parsedMetaInfo.isNotEmpty()) - parsedMetaInfo.forEach { - if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add( - it - ) - } + parsedMetaInfo.forEach { + if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add( + it + ) + } val textWithCodeMetaInfo = CodeMetaInfoRenderer.renderTagsToText(codeMetaInfoForCheck, myEditor.document.text) KotlinTestUtils.assertEqualsToFile( expectedFile, @@ -199,6 +202,11 @@ class CodeMetaInfoTestCase( val diagnostic: AbstractDiagnostic<*> = diagnosticCodeMetaInfo.diagnostic diagnostic.factory.toString() in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description } + is DebugInfoDiagnostic -> { + val diagnostic: DebugInfoDiagnostic = diagnosticCodeMetaInfo.diagnostic + diagnostic.factory == DebugInfoDiagnosticFactory0.MISSING_UNRESOLVED && + "[DEBUG] Reference is not resolved to anything, but is not marked unresolved" in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description + } else -> throw java.lang.IllegalArgumentException("Unknown diagnostic type: ${diagnosticCodeMetaInfo.diagnostic}") } }, diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt index efb82bb2380..2a27efcce1e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt @@ -17,14 +17,17 @@ import org.jetbrains.kotlin.idea.codeMetaInfo.models.LineMarkerCodeMetaInfo abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean = true) { - + private val clickOrPressRegex = "Click or press (.*)to navigate".toRegex() //We have different hotkeys on different platforms open fun asString(codeMetaInfo: CodeMetaInfo) = codeMetaInfo.getTag() + getPlatformsString(codeMetaInfo) open fun getAdditionalParams(codeMetaInfo: CodeMetaInfo) = "" protected fun sanitizeLineMarkerTooltip(originalText: String?): String { if (originalText == null) return "null" - val noHtmlTags = StringUtil.removeHtmlTags(originalText).replace(" ", "") + val noHtmlTags = StringUtil.removeHtmlTags(originalText) + .replace(" ", "") + .replace(clickOrPressRegex, "") + .trim() return sanitizeLineBreaks(noHtmlTags) } @@ -79,15 +82,16 @@ open class DiagnosticCodeMetaInfoRenderConfiguration( } } -open class LineMarkerRenderConfiguration(val renderDescription: Boolean = true) : AbstractCodeMetaInfoRenderConfiguration() { +open class LineMarkerRenderConfiguration(var renderDescription: Boolean = true) : AbstractCodeMetaInfoRenderConfiguration() { override fun asString(codeMetaInfo: CodeMetaInfo): String { if (codeMetaInfo !is LineMarkerCodeMetaInfo) return "" - return getTag() + if (renderParams) "(\"${getParamsString(codeMetaInfo)}\")" else "" + return getTag() + getParamsString(codeMetaInfo) } fun getTag() = "LINE_MARKER" private fun getParamsString(lineMarkerCodeMetaInfo: LineMarkerCodeMetaInfo): String { + if (!renderParams) return "" val params = mutableListOf() if (renderDescription) @@ -95,7 +99,8 @@ open class LineMarkerRenderConfiguration(val renderDescription: Boolean = true) params.add(getAdditionalParams(lineMarkerCodeMetaInfo)) - return params.filter { it.isNotEmpty() }.joinToString("; ") + val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ") + return if (paramsString.isEmpty()) "" else "(\"$paramsString\")" } } @@ -107,14 +112,15 @@ open class HighlightingRenderConfiguration( override fun asString(codeMetaInfo: CodeMetaInfo): String { if (codeMetaInfo !is HighlightingCodeMetaInfo) return "" - return getTag() + if (renderParams) "(${getParamsString(codeMetaInfo)})" else "" + return getTag() + getParamsString(codeMetaInfo) } fun getTag() = "HIGHLIGHTING" private fun getParamsString(highlightingCodeMetaInfo: HighlightingCodeMetaInfo): String { - val params = mutableListOf() + if (!renderParams) return "" + val params = mutableListOf() if (renderSeverity) params.add("severity='${highlightingCodeMetaInfo.highlightingInfo.severity}'") if (renderDescription) @@ -123,7 +129,8 @@ open class HighlightingRenderConfiguration( params.add("textAttributesKey='${highlightingCodeMetaInfo.highlightingInfo.forcedTextAttributesKey}'") params.add(getAdditionalParams(highlightingCodeMetaInfo)) + val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ") - return params.filter { it.isNotEmpty() }.joinToString("; ") + return if (paramsString.isEmpty()) "" else "(\"$paramsString\")" } } \ No newline at end of file