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

JS: fix how module checker handles super classes

Browse Source
This commit is contained in:
Alexey Andreev
2016-12-20 16:48:21 +03:00
parent 60aac8feee
commit 03682ee849
7 changed files with 106 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.kt
Vendored
+1 -2
View File
@@ -39,5 +39,4 @@ fun box() {
<!CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>baz<!>()
}
// TODO: fix and uncomment
// external class DerivedB : <! CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>B< !>
external class DerivedB : <!CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>B<!>
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt
Vendored
+8
View File
@@ -28,6 +28,14 @@ package
package bar {
public fun box(): kotlin.Unit
public external final class DerivedB : foo.B {
public constructor DerivedB()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
package foo {
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.kt
Vendored
+1 -2
View File
@@ -33,5 +33,4 @@ fun box() {
<!CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>bar<!>()
}
// TODO: fix and uncomment
// external class DerivedB : <! CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>B< !>
external class DerivedB : <!CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>B<!>
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt
Vendored
+8
View File
@@ -2,6 +2,14 @@ package
package bar {
public fun box(): kotlin.Unit
public external final class DerivedB : foo.B {
public constructor DerivedB()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
package foo {