From bbf448b39dafe0df89b228cfb198acc66cc4786f Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 19 Feb 2020 19:20:07 +0300 Subject: [PATCH] [FIR] Change visibility of default sealed class constructor to private --- .../src/org/jetbrains/kotlin/fir/lightTree/fir/ClassWrapper.kt | 2 +- .../src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt | 2 +- .../fir/resolve/testData/resolve/exhaustiveness_sealedClass.txt | 2 +- .../resolve/expresssions/classifierAccessFromCompanion.txt | 2 +- .../fir/resolve/testData/resolve/multifile/sealedStarImport.txt | 2 +- .../testData/resolve/recursiveCallOnWhenWithSealedClass.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/ClassWrapper.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/ClassWrapper.kt index 4c7eb1abb30..87c4afe8223 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/ClassWrapper.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/ClassWrapper.kt @@ -59,7 +59,7 @@ class ClassWrapper( fun defaultConstructorVisibility(): Visibility { return when { isObject() || isEnum() -> Visibilities.PRIVATE - isSealed() -> Visibilities.PUBLIC + isSealed() -> Visibilities.PRIVATE else -> Visibilities.UNKNOWN } } diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index d36648dd8b7..1b0e1e52463 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -464,7 +464,7 @@ class RawFirBuilder(session: FirSession, val baseScopeProvider: FirScopeProvider fun defaultVisibility() = when { // TODO: object / enum is HIDDEN (?) owner is KtObjectDeclaration || owner.hasModifier(ENUM_KEYWORD) -> Visibilities.PRIVATE - owner.hasModifier(SEALED_KEYWORD) -> Visibilities.PUBLIC + owner.hasModifier(SEALED_KEYWORD) -> Visibilities.PRIVATE else -> Visibilities.UNKNOWN } diff --git a/compiler/fir/resolve/testData/resolve/exhaustiveness_sealedClass.txt b/compiler/fir/resolve/testData/resolve/exhaustiveness_sealedClass.txt index e27263f5452..723c1e4b13e 100644 --- a/compiler/fir/resolve/testData/resolve/exhaustiveness_sealedClass.txt +++ b/compiler/fir/resolve/testData/resolve/exhaustiveness_sealedClass.txt @@ -1,6 +1,6 @@ FILE: exhaustiveness_sealedClass.kt public sealed class Base : R|kotlin/Any| { - public constructor(): R|Base| { + private constructor(): R|Base| { super() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/classifierAccessFromCompanion.txt b/compiler/fir/resolve/testData/resolve/expresssions/classifierAccessFromCompanion.txt index 275b5f6f055..809328821d2 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/classifierAccessFromCompanion.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/classifierAccessFromCompanion.txt @@ -5,7 +5,7 @@ FILE: classifierAccessFromCompanion.kt } public sealed class Function : R|kotlin/Any| { - public constructor(): R|Factory.Function| { + private constructor(): R|Factory.Function| { super() } diff --git a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt index ff4d8f58de4..bf8d0dee1b4 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt +++ b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt @@ -1,6 +1,6 @@ FILE: test.kt public sealed class Test : R|kotlin/Any| { - public constructor(): R|test/Test| { + private constructor(): R|test/Test| { super() } diff --git a/compiler/fir/resolve/testData/resolve/recursiveCallOnWhenWithSealedClass.txt b/compiler/fir/resolve/testData/resolve/recursiveCallOnWhenWithSealedClass.txt index d6975c2591c..8af5f079e5e 100644 --- a/compiler/fir/resolve/testData/resolve/recursiveCallOnWhenWithSealedClass.txt +++ b/compiler/fir/resolve/testData/resolve/recursiveCallOnWhenWithSealedClass.txt @@ -1,6 +1,6 @@ FILE: recursiveCallOnWhenWithSealedClass.kt public sealed class Maybe : R|kotlin/Any| { - public constructor(): R|Maybe| { + private constructor(): R|Maybe| { super() }