MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] k2 deprecation fix: don't insert comments from origin function body

Browse Source 
^KTIJ-31410 fixed

GitOrigin-RevId: 56342b8657bdbef21b64e4089a254a6f162e3fee
This commit is contained in:
Anna Kozlova
2024-09-26 16:15:34 +00:00
committed by intellij-monorepo-bot
parent ee0d4019d2
commit f7fd73abe1
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/replaceWith/DeprecatedSymbolUsageFixBase.kt
+4 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.idea.k2.refactoring.inline.codeInliner.ClassUsageRep
import org.jetbrains.kotlin.idea.k2.refactoring.inline.codeInliner.CodeToInlineBuilder
import org.jetbrains.kotlin.idea.quickfix.replaceWith.ReplaceWithData
import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.CodeToInline
import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.MutableCodeToInline
import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.UsageReplacementStrategy
import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.buildCodeToInline
import org.jetbrains.kotlin.idea.references.mainReference
@@ -175,7 +176,9 @@ abstract class DeprecatedSymbolUsageFixBase(
val expression =
psiFactory.createExpressionCodeFragment(replaceWith.pattern, context).getContentElement() ?: return null
return buildCodeToInline(target, expression, false, null, CodeToInlineBuilder(original = target))
return buildCodeToInline(target, expression, false, null, object : CodeToInlineBuilder(original = target) {
override fun saveComments(codeToInline: MutableCodeToInline, contextDeclaration: KtDeclaration) {}
})
}
}
}
plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed1.kt
+1
View File
@@ -2,6 +2,7 @@
@Deprecated("", ReplaceWith("newFun()"))
fun oldFun(p: Int) {
/** some comments */
newFun()
}
plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed1.kt.after
+1
View File
@@ -2,6 +2,7 @@
@Deprecated("", ReplaceWith("newFun()"))
fun oldFun(p: Int) {
/** some comments */
newFun()
}
plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/codeInliner/AbstractCodeToInlineBuilder.kt
+1 -1
View File
@@ -13,7 +13,7 @@ abstract class AbstractCodeToInlineBuilder(
protected val fallbackToSuperCall: Boolean = false,
) {
protected val psiFactory = KtPsiFactory(project)
protected fun saveComments(codeToInline: MutableCodeToInline, contextDeclaration: KtDeclaration) {
protected open fun saveComments(codeToInline: MutableCodeToInline, contextDeclaration: KtDeclaration) {
val bodyBlockExpression = contextDeclaration.safeAs<KtDeclarationWithBody>()?.bodyBlockExpression
if (bodyBlockExpression != null) addCommentHoldersForStatements(codeToInline, bodyBlockExpression)
}
plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/inline/codeInliner/CodeToInlineBuilder.kt
+3 -6
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.AbstractCodeToIn
import org.jetbrains.kotlin.idea.refactoring.inline.codeInliner.MutableCodeToInline
import org.jetbrains.kotlin.psi.*
class CodeToInlineBuilder(
open class CodeToInlineBuilder(
private val original: KtDeclaration, fallbackToSuperCall: Boolean = false
) : AbstractCodeToInlineBuilder(original.project, original, fallbackToSuperCall) {
@@ -33,17 +33,14 @@ class CodeToInlineBuilder(
val codeToInline = MutableCodeToInline(
mainExpression,
originalDeclaration,
original,
statementsBefore.toMutableList(),
mutableSetOf(),
alwaysKeepMainExpression,
extraComments = null,
)
if (originalDeclaration != null) {
saveComments(codeToInline, originalDeclaration!!)
}
saveComments(codeToInline, original)
insertExplicitTypeArguments(codeToInline)
removeContracts(codeToInline)
encodeInternalReferences(codeToInline, original)