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

Drop LocalCallableIdConstructor OptIn-annotation

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-05-20 13:49:00 +03:00
committed by teamcityserver
parent 3572a96bb9
commit fa307a5f75
5 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+1 -1
View File
@@ -1584,7 +1584,7 @@ class DeclarationsConverter(
origin = FirDeclarationOrigin.Synthetic
name = delegateName
returnTypeRef = firTypeRef
symbol = FirFieldSymbol(@OptIn(LocalCallableIdConstructor::class) CallableId(name))
symbol = FirFieldSymbol(CallableId(name))
isVar = false
status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL)
initializer = firExpression
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+1 -2
View File
@@ -39,7 +39,6 @@ import org.jetbrains.kotlin.fir.types.impl.FirTypePlaceholderProjection
import org.jetbrains.kotlin.lexer.KtTokens.*
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.LocalCallableIdConstructor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.*
@@ -589,7 +588,7 @@ open class RawFirBuilder(
origin = FirDeclarationOrigin.Synthetic
name = delegateName
returnTypeRef = type
symbol = FirFieldSymbol(@OptIn(LocalCallableIdConstructor::class) CallableId(name))
symbol = FirFieldSymbol(CallableId(name))
isVar = false
status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL)
initializer = delegateExpression
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
+1 -2
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.lexer.KtTokens.CLOSING_QUOTE
import org.jetbrains.kotlin.lexer.KtTokens.OPEN_QUOTE
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.LocalCallableIdConstructor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.parsing.*
import org.jetbrains.kotlin.types.ConstantValueKind
@@ -121,7 +120,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
else
result.child(Name.identifier(firFunctionTarget.labelName!!))
}
@OptIn(LocalCallableIdConstructor::class) CallableId(name, pathFqName)
CallableId(name, pathFqName)
}
context.className == FqName.ROOT -> CallableId(context.packageFqName, name)
context.className.shortName() == ANONYMOUS_OBJECT_NAME -> CallableId(ANONYMOUS_CLASS_ID, name)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
+2 -3
View File
@@ -12,19 +12,18 @@ import org.jetbrains.kotlin.fir.declarations.FirVariable
import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.LocalCallableIdConstructor
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
open class FirVariableSymbol<D : FirVariable<D>>(override val callableId: CallableId) : FirCallableSymbol<D>() {
constructor(name: Name) : this(@OptIn(LocalCallableIdConstructor::class) CallableId(name)) // TODO?
constructor(name: Name) : this(CallableId(name)) // TODO?
}
open class FirPropertySymbol(
callableId: CallableId,
) : FirVariableSymbol<FirProperty>(callableId) {
// TODO: should we use this constructor for local variables?
constructor(name: Name) : this(@OptIn(LocalCallableIdConstructor::class) CallableId(name))
constructor(name: Name) : this(CallableId(name))
}
class FirIntersectionOverridePropertySymbol(
core/compiler.common/src/org/jetbrains/kotlin/name/CallableId.kt
-4
View File
@@ -40,7 +40,6 @@ data class CallableId(
constructor(packageName: FqName, callableName: Name) : this(packageName, null, callableName)
@LocalCallableIdConstructor
constructor(
callableName: Name,
// Currently, it's only used for debug info
@@ -73,6 +72,3 @@ data class CallableId(
}
}
}
@RequiresOptIn("TODO: Better solution for local callables?")
annotation class LocalCallableIdConstructor