diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index cba1511e292..6e979b0ce25 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.java import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -211,7 +210,7 @@ class JavaSymbolProvider( val javaClassDeclaredConstructors = javaClass.constructors val constructorId = CallableId(classId.packageFqName, classId.relativeClassName, classId.shortClassName) - fun addJavaConstructor(visibility: Visibility = Visibilities.PUBLIC): FirJavaConstructor { + fun addJavaConstructor(visibility: Visibility = this.visibility): FirJavaConstructor { val constructorSymbol = FirConstructorSymbol(constructorId) val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack) val firJavaConstructor = FirJavaConstructor( diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt index 605674af56b..8ebba71bc98 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt @@ -7,7 +7,7 @@ public/*package*/ open class A : R|kotlin/Any| { public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft|! - public constructor(): R|A| + public/*package*/ constructor(): R|A| } public final enum class Mixed : R|kotlin/Enum| { diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt index 16c838afe58..32bcffa4669 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt @@ -9,6 +9,6 @@ public/*package*/ open class A : R|kotlin/Any| { public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft|!): R|kotlin/Unit| - public constructor(): R|A| + public/*package*/ constructor(): R|A| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt index 8a9f95fa935..f4efef0075a 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt @@ -5,6 +5,6 @@ public/*package*/ open class A : R|kotlin/Any| { public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft|!): R|kotlin/Unit| - public constructor(): R|A| + public/*package*/ constructor(): R|A| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt index 3ba4e3951c7..9b79792ccbc 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt @@ -1,6 +1,6 @@ public/*package*/ open class A : R|kotlin/Any| { public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft|! = String(OK)): R|ft|! - public constructor(): R|A| + public/*package*/ constructor(): R|A| } diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt index c398e7c6b48..32c49e908ea 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/javaSyntheticProperty.kt FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static] EXPRESSION_BODY CALL 'public open fun getFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=null - $this: CONSTRUCTOR_CALL 'public constructor () declared in .J' type=.J origin=null + $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () declared in .J' type=.J origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String? correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt index eed88130468..0840720b7de 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt @@ -1,4 +1,4 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| { - public constructor(): R|test/AnnotatedParameterInInnerClassConstructor| + public/*package*/ constructor(): R|test/AnnotatedParameterInInnerClassConstructor| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt index adcac04b7cd..cf9eff44a4c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt @@ -1,6 +1,6 @@ public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| { public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft|!): R|kotlin/Unit| - public constructor(): R|test/AnnotatedTypeInFun| + public/*package*/ constructor(): R|test/AnnotatedTypeInFun| } diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt index ddbe1ac22e4..2b937491a51 100644 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt @@ -1,6 +1,6 @@ public/*package*/ open class JavaClass : R|kotlin/Any| { public open operator fun getFoo(): R|ft|! - public constructor(): R|JavaClass| + public/*package*/ constructor(): R|JavaClass| }