FIR: make Java default constructor visibility same with class visibility
This commit is contained in:
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.java
|
|||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||||
import org.jetbrains.kotlin.descriptors.Visibilities
|
|
||||||
import org.jetbrains.kotlin.descriptors.Visibility
|
import org.jetbrains.kotlin.descriptors.Visibility
|
||||||
import org.jetbrains.kotlin.fir.FirSession
|
import org.jetbrains.kotlin.fir.FirSession
|
||||||
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
||||||
@@ -211,7 +210,7 @@ class JavaSymbolProvider(
|
|||||||
val javaClassDeclaredConstructors = javaClass.constructors
|
val javaClassDeclaredConstructors = javaClass.constructors
|
||||||
val constructorId = CallableId(classId.packageFqName, classId.relativeClassName, classId.shortClassName)
|
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 constructorSymbol = FirConstructorSymbol(constructorId)
|
||||||
val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack)
|
val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack)
|
||||||
val firJavaConstructor = FirJavaConstructor(
|
val firJavaConstructor = FirJavaConstructor(
|
||||||
|
|||||||
+1
-1
@@ -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<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
|
public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
|
||||||
|
|
||||||
public constructor(): R|A|
|
public/*package*/ constructor(): R|A|
|
||||||
|
|
||||||
}
|
}
|
||||||
public final enum class Mixed : R|kotlin/Enum<Mixed>| {
|
public final enum class Mixed : R|kotlin/Enum<Mixed>| {
|
||||||
|
|||||||
+1
-1
@@ -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<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
|
public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
|
||||||
|
|
||||||
public constructor(): R|A|
|
public/*package*/ constructor(): R|A|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
|
public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
|
||||||
|
|
||||||
public constructor(): R|A|
|
public/*package*/ constructor(): R|A|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
public/*package*/ open class A : R|kotlin/Any| {
|
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<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
|
public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
|
||||||
|
|
||||||
public constructor(): R|A|
|
public/*package*/ constructor(): R|A|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/javaSyntheticProperty.kt
|
|||||||
FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static]
|
FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static]
|
||||||
EXPRESSION_BODY
|
EXPRESSION_BODY
|
||||||
CALL 'public open fun getFoo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
|
CALL 'public open fun getFoo (): kotlin.String? declared in <root>.J' type=kotlin.String? origin=null
|
||||||
$this: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J' type=<root>.J origin=null
|
$this: CONSTRUCTOR_CALL 'public/*package*/ constructor <init> () declared in <root>.J' type=<root>.J origin=null
|
||||||
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.String?
|
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.String?
|
||||||
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
|
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
|
||||||
BLOCK_BODY
|
BLOCK_BODY
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| {
|
public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| {
|
||||||
public constructor(): R|test/AnnotatedParameterInInnerClassConstructor|
|
public/*package*/ constructor(): R|test/AnnotatedParameterInInnerClassConstructor|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
|
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<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
|
public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
|
||||||
|
|
||||||
public constructor(): R|test/AnnotatedTypeInFun|
|
public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
public/*package*/ open class JavaClass : R|kotlin/Any| {
|
public/*package*/ open class JavaClass : R|kotlin/Any| {
|
||||||
public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>|!
|
public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>|!
|
||||||
|
|
||||||
public constructor(): R|JavaClass|
|
public/*package*/ constructor(): R|JavaClass|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user