azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge together MultiplatformHighlighting and MultiplatformAnalysis tests

Browse Source 
Basically, the former uses an old quickly-scrapped infrastructure,
which were not applicable for HMPP, so  the latter tests were written.

So, both check for one and the same thing (highlighting in MPP projects),
but MultiplatformAnalysisTest is more modern,
and has a lot of inconvenient stuff in MultiplatformHighlighting fixed
^KT-43116 Fixed
This commit is contained in:
Alexander Dudinsky
2020-12-22 12:29:43 +03:00
parent 73576c80e4
commit 10a5727260
123 changed files with 293 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/multiplatform/overrideExpect/common/common.kt
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
expect class Expect
expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Expect<!>
interface Base {
fun expectInReturnType(): Expect
interface <!LINE_MARKER("descr='Is implemented by Derived'")!>Base<!> {
fun <!LINE_MARKER("descr='Is implemented in Derived'")!>expectInReturnType<!>(): Expect
fun expectInArgument(e: Expect)
fun Expect.expectInReceiver()
val expectVal: Expect
val <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVal<!>: Expect
var expectVar: Expect
var <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVar<!>: Expect
}
idea/testData/multiplatform/overrideExpect/jvm/jvm.kt
Vendored
+6 -6
View File
@@ -1,13 +1,13 @@
actual typealias Expect = String
actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expect<!> = String
interface Derived : Base {
override fun expectInReturnType(): Expect
override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReturnType<!>(): Expect
override fun expectInArgument(e: Expect)
override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInArgument<!>(e: Expect)
override fun Expect.expectInReceiver()
override fun Expect.<!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReceiver<!>()
override val expectVal: Expect
override val <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVal<!>: Expect
override var expectVar: Expect
override var <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVar<!>: Expect
}