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

fix(KT-43191): add static qualifier for Companion and non-inner objects.

Browse Source
This commit is contained in:
Artem Kobzar
2021-10-13 11:09:59 +00:00
committed by Space
parent 90dd0c6150
commit f645c89ebf
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt
+1 -1
View File
@@ -226,7 +226,7 @@ class ExportModelGenerator(
type = t, type = t,
mutable = false, mutable = false,
isMember = klass.parent is IrClass, isMember = klass.parent is IrClass,
isStatic = true, isStatic = !klass.isInner,
isAbstract = false, isAbstract = false,
isProtected = klass.visibility == DescriptorVisibilities.PROTECTED, isProtected = klass.visibility == DescriptorVisibilities.PROTECTED,
irGetter = context.mapping.objectToGetInstanceFunction[klass]!!, irGetter = context.mapping.objectToGetInstanceFunction[klass]!!,
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt
+2 -1
View File
@@ -76,7 +76,8 @@ fun ExportedDeclaration.toTypeScript(indent: String, prefix: String = ""): Strin
isMember -> (if (isAbstract) "abstract " else "") + (if (!mutable) "readonly " else "") isMember -> (if (isAbstract) "abstract " else "") + (if (!mutable) "readonly " else "")
else -> if (mutable) "let " else "const " else -> if (mutable) "let " else "const "
} }
"$prefix$visibility$keyword$name: ${type.toTypeScript(indent)};" val possibleStatic = if (isMember && isStatic) "static " else ""
"$prefix$visibility$possibleStatic$keyword$name: ${type.toTypeScript(indent)};"
} }
is ExportedClass -> { is ExportedClass -> {
js/js.translator/testData/typescript-export/declarations/declarations.d.ts
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@ declare namespace JS_TESTS {
function takesO(o: typeof foo.O): number; function takesO(o: typeof foo.O): number;
class KT_37829 { class KT_37829 {
constructor(); constructor();
readonly Companion: { static readonly Companion: {
readonly x: number; readonly x: number;
}; };
} }
js/js.translator/testData/typescript-export/visibility/visibility.d.ts
Vendored
+2 -2
View File
@@ -11,9 +11,9 @@ declare namespace JS_TESTS {
constructor(); constructor();
protected readonly protectedVal: number; protected readonly protectedVal: number;
protected protectedFun(): number; protected protectedFun(): number;
protected readonly protectedNestedObject: { protected static readonly protectedNestedObject: {
}; };
protected readonly Companion: { protected static readonly Companion: {
readonly companionObjectProp: number; readonly companionObjectProp: number;
}; };
readonly publicVal: number; readonly publicVal: number;