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

[JS, Frontend] Not report warning with non-exportable super type

Browse Source 
^KT-53539 fixed
This commit is contained in:
Ilya Goncharov
2022-08-18 12:46:40 +00:00
committed by Space
parent c8a48473e2
commit 2f75ea585e
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt
Vendored
+5 -5
View File
@@ -6,27 +6,27 @@ package foo
open class NonExportedClass open class NonExportedClass
@JsExport @JsExport
class <!NON_EXPORTABLE_TYPE("super; NonExportedClass")!>ExportedClass<!> : NonExportedClass() class ExportedClass : NonExportedClass()
interface NonExportedInterface interface NonExportedInterface
@JsExport @JsExport
class <!NON_EXPORTABLE_TYPE("super; NonExportedInterface")!>ExportedClass2<!> : NonExportedInterface class ExportedClass2 : NonExportedInterface
@JsExport @JsExport
open class ExportedGenericClass<T> open class ExportedGenericClass<T>
@JsExport @JsExport
class <!NON_EXPORTABLE_TYPE("super; ExportedGenericClass<NonExportedClass>")!>ExportedClass3<!> : ExportedGenericClass<NonExportedClass>() class ExportedClass3 : ExportedGenericClass<NonExportedClass>()
@JsExport @JsExport
interface ExportedGenericInterface<T> interface ExportedGenericInterface<T>
@JsExport @JsExport
class <!NON_EXPORTABLE_TYPE("super; ExportedGenericInterface<NonExportedClass>")!>ExportedClass4<!> : ExportedGenericInterface<NonExportedClass> class ExportedClass4 : ExportedGenericInterface<NonExportedClass>
@JsExport @JsExport
enum class <!NON_EXPORTABLE_TYPE("super; NonExportedInterface")!>ExportedEnum<!> : ExportedGenericInterface<Any>, NonExportedInterface { enum class ExportedEnum : ExportedGenericInterface<Any>, NonExportedInterface {
EXPORTED_ENUM_1, EXPORTED_ENUM_1,
EXPORTED_ENUM_2 EXPORTED_ENUM_2
} }
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExportDeclarationChecker.kt
-9
View File
@@ -141,15 +141,6 @@ object JsExportDeclarationChecker : DeclarationChecker {
// Covered by ENUM_CLASS // Covered by ENUM_CLASS
return return
} }
val supertypes = descriptor.defaultType.supertypes()
val isEnum = supertypes.any { KotlinBuiltIns.isEnum(it) }
for (superType in supertypes) {
if (!superType.isExportable(bindingContext) && !(KotlinBuiltIns.isComparable(superType) && isEnum)) {
trace.report(ErrorsJs.NON_EXPORTABLE_TYPE.on(declaration, "super", superType))
}
}
} }
} }
} }