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

[IR] Remove unnecessary ReplaceWith from deprecated methods in IrFactory

Browse Source 
ReplaceWith doesn't do anything when deprecation level is HIDDEN.
This commit is contained in:
Sergej Jaskiewicz
2023-07-24 16:40:20 +02:00
committed by Space Team
parent 8aa0b6a562
commit d77af3c43d
2 changed files with 17 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/declarations/IrFactory.kt
-206
View File
@@ -235,14 +235,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "This method was moved to an extension." + message = "This method was moved to an extension." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createBlockBody(
startOffset = startOffset,
endOffset = endOffset,
initializer = initializer,
)""",
"org.jetbrains.kotlin.ir.declarations.createBlockBody",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createBlockBody( fun createBlockBody(
@@ -258,14 +250,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "This method was moved to an extension." + message = "This method was moved to an extension." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createBlockBody(
startOffset = startOffset,
endOffset = endOffset,
statements = statements,
)""",
"org.jetbrains.kotlin.ir.declarations.createBlockBody",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createBlockBody( fun createBlockBody(
@@ -281,26 +265,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createClass(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
symbol = symbol,
kind = kind,
modality = modality,
isExternal = isExternal,
isCompanion = isCompanion,
isInner = isInner,
isData = isData,
isValue = isValue,
isExpect = isExpect,
isFun = isFun,
source = source,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createClass( fun createClass(
@@ -342,22 +306,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createConstructor(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
isInline = isInline,
isExpect = isExpect,
returnType = returnType,
symbol = symbol,
isPrimary = isPrimary,
isExternal = isExternal,
containerSource = containerSource,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createConstructor( fun createConstructor(
@@ -391,15 +339,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createEnumEntry(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = symbol,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createEnumEntry( fun createEnumEntry(
@@ -419,12 +358,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "This method was moved to an extension." + message = "This method was moved to an extension." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createExpressionBody(
expression = expression,
)""",
"org.jetbrains.kotlin.ir.declarations.createExpressionBody",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createExpressionBody(expression: IrExpression): IrExpressionBody = fun createExpressionBody(expression: IrExpression): IrExpressionBody =
@@ -435,20 +368,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createField(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
symbol = symbol,
type = type,
isFinal = isFinal,
isStatic = isStatic,
isExternal = isExternal,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createField( fun createField(
@@ -478,24 +397,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createFunctionWithLateBinding(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
isInline = isInline,
isExpect = isExpect,
returnType = returnType,
modality = modality,
isTailrec = isTailrec,
isSuspend = isSuspend,
isOperator = isOperator,
isInfix = isInfix,
isExternal = isExternal,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createFunctionWithLateBinding( fun createFunctionWithLateBinding(
@@ -533,17 +434,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createLocalDelegatedProperty(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = symbol,
type = type,
isVar = isVar,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createLocalDelegatedProperty( fun createLocalDelegatedProperty(
@@ -567,25 +457,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createProperty(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
modality = modality,
symbol = symbol,
isVar = isVar,
isConst = isConst,
isLateinit = isLateinit,
isDelegated = isDelegated,
isExternal = isExternal,
containerSource = containerSource,
isExpect = isExpect,
isFakeOverride = isFakeOverride,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createProperty( fun createProperty(
@@ -625,22 +496,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createPropertyWithLateBinding(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
modality = modality,
isVar = isVar,
isConst = isConst,
isLateinit = isLateinit,
isDelegated = isDelegated,
isExternal = isExternal,
isExpect = isExpect,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createPropertyWithLateBinding( fun createPropertyWithLateBinding(
@@ -674,27 +529,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method has been renamed, and its parameters were reordered." + message = "The method has been renamed, and its parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createSimpleFunction(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
isInline = isInline,
isExpect = isExpect,
returnType = returnType,
modality = modality,
symbol = symbol,
isTailrec = isTailrec,
isSuspend = isSuspend,
isOperator = isOperator,
isInfix = isInfix,
isExternal = isExternal,
containerSource = containerSource,
isFakeOverride = isFakeOverride,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createFunction( fun createFunction(
@@ -738,18 +572,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createTypeAlias(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
visibility = visibility,
symbol = symbol,
isActual = isActual,
expandedType = expandedType,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createTypeAlias( fun createTypeAlias(
@@ -775,18 +597,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createTypeParameter(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
symbol = symbol,
variance = variance,
index = index,
isReified = isReified,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createTypeParameter( fun createTypeParameter(
@@ -812,22 +622,6 @@ interface IrFactory {
@Deprecated( @Deprecated(
message = "The method's parameters were reordered." + message = "The method's parameters were reordered." +
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
replaceWith = ReplaceWith(
"""createValueParameter(
startOffset = startOffset,
endOffset = endOffset,
origin = origin,
name = name,
type = type,
isAssignable = isAssignable,
symbol = symbol,
index = index,
varargElementType = varargElementType,
isCrossinline = isCrossinline,
isNoinline = isNoinline,
isHidden = isHidden,
)""",
),
level = DeprecationLevel.HIDDEN, level = DeprecationLevel.HIDDEN,
) )
fun createValueParameter( fun createValueParameter(
compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/Factory.kt
+17 -38
View File
@@ -67,7 +67,6 @@ internal fun printFactory(generationPath: File, model: Model): GeneratedFile {
.build() .build()
) { ) {
deprecationMessage = "This method was moved to an extension." deprecationMessage = "This method was moved to an extension."
additionalImports.add("${Packages.declarations}.$oldName")
parameter("startOffset") parameter("startOffset")
parameter("endOffset") parameter("endOffset")
parameter("initializer") parameter("initializer")
@@ -83,7 +82,6 @@ internal fun printFactory(generationPath: File, model: Model): GeneratedFile {
.build() .build()
) { ) {
deprecationMessage = "This method was moved to an extension." deprecationMessage = "This method was moved to an extension."
additionalImports.add("${Packages.declarations}.$oldName")
parameter("startOffset") parameter("startOffset")
parameter("endOffset") parameter("endOffset")
parameter("statements") parameter("statements")
@@ -133,7 +131,6 @@ internal fun printFactory(generationPath: File, model: Model): GeneratedFile {
addDeprecatedFunction(replacement("createExpressionBody")) { addDeprecatedFunction(replacement("createExpressionBody")) {
deprecationMessage = "This method was moved to an extension." deprecationMessage = "This method was moved to an extension."
additionalImports.add("${Packages.declarations}.$oldName")
parameter("expression") parameter("expression")
} }
@@ -212,7 +209,7 @@ internal fun printFactory(generationPath: File, model: Model): GeneratedFile {
parameter("isExpect", removeDefaultValue = true) parameter("isExpect", removeDefaultValue = true)
} }
addDeprecatedFunction(replacement("createSimpleFunction"),) { addDeprecatedFunction(replacement("createSimpleFunction")) {
oldName = "createFunction" oldName = "createFunction"
parameter("startOffset") parameter("startOffset")
parameter("endOffset") parameter("endOffset")
@@ -284,8 +281,6 @@ private class DeprecatedFunctionBuilder(private val replacement: FunSpec) {
var deprecationMessage: String? = null var deprecationMessage: String? = null
val additionalImports = mutableListOf<String>()
fun parameter(name: String, removeDefaultValue: Boolean = false) { fun parameter(name: String, removeDefaultValue: Boolean = false) {
val replacementParameter = val replacementParameter =
replacement.parameters.find { it.name == name } ?: error("Parameter '$name' not found in $replacement") replacement.parameters.find { it.name == name } ?: error("Parameter '$name' not found in $replacement")
@@ -314,23 +309,25 @@ private fun TypeSpec.Builder.addDeprecatedFunction(
"The method's parameters were reordered." "The method's parameters were reordered."
} }
fun CodeBlock.Builder.addCallToNewFunction(explicitParameterName: Boolean) =
add("%N(\n", replacement)
.apply {
for (parameter in replacement.parameters) {
if (builder.deprecatedFunctionParameterSpecs.any { it.name == parameter.name }) {
indent()
add(if (explicitParameterName) "%1N = %1N,\n" else "%N,\n", parameter)
unindent()
}
}
}
.add(")")
return addFunction( return addFunction(
FunSpec.builder(builder.oldName) FunSpec.builder(builder.oldName)
.addTypeVariables(replacement.typeVariables) .addTypeVariables(replacement.typeVariables)
.addCode(CodeBlock.builder().add("return ").addCallToNewFunction(explicitParameterName = false).build()) .addCode(
CodeBlock.builder()
.add("return ")
.add("%N(\n", replacement)
.apply {
for (parameter in replacement.parameters) {
if (builder.deprecatedFunctionParameterSpecs.any { it.name == parameter.name }) {
indent()
add("%N,\n", parameter)
unindent()
}
}
}
.add(")")
.build()
)
.addAnnotation( .addAnnotation(
AnnotationSpec.builder(Deprecated::class) AnnotationSpec.builder(Deprecated::class)
.addMember( .addMember(
@@ -338,24 +335,6 @@ private fun TypeSpec.Builder.addDeprecatedFunction(
message, message,
" This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).", " This variant of the method will be removed when the 2024.2 IntelliJ platform is shipped (see KTIJ-26314).",
) )
.addMember(
CodeBlock.builder()
.add("replaceWith = ReplaceWith(\n")
.indent()
.add("\"\"\"")
.addCallToNewFunction(explicitParameterName = true)
.unindent()
.add("\"\"\",\n")
.apply {
for (additionalImport in builder.additionalImports) {
indent()
add("%S,\n", additionalImport)
unindent()
}
}
.add(")")
.build()
)
.addMember("level = %T.%N", DeprecationLevel::class, DeprecationLevel.HIDDEN.name) .addMember("level = %T.%N", DeprecationLevel::class, DeprecationLevel.HIDDEN.name)
.build(), .build(),
) )