MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] J2K copy-paste cleanup: specialize signature of K2J2KCopyPasteConverter

Browse Source 
KTIJ-28714
IJ-CR-150614

(cherry picked from commit 28025edbc9f4389e03efd814fcff7257d23d7dc8)

GitOrigin-RevId: 54aebb3bdf724c0ecbda94b1d7b389aef3ec7f9b
This commit is contained in:
Alexey Belkov
2024-12-03 22:42:37 +04:00
committed by intellij-monorepo-bot
parent bea2817afa
commit d6875a02cc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt
View File

@@ -61,6 +61,6 @@ class K2J2KConverterExtension : J2kConverterExtension() {
dataForConversion: DataForConversion,
targetData: ConversionTargetData
): J2KCopyPasteConverter {
return K2J2KCopyPasteConverter(project, editor, dataForConversion, targetData)
return K2J2KCopyPasteConverter(project, editor, dataForConversion.elementsAndTexts, targetData)
}
}

4
plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt
View File

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.name.FqName
internal class K2J2KCopyPasteConverter(
private val project: Project,
private val editor: Editor,
private val dataForConversion: DataForConversion,
private val elementsAndTexts: ElementAndTextList,
private val targetData: ConversionTargetData,
) : J2KCopyPasteConverter {
/**
@@ -50,7 +50,7 @@ internal class K2J2KCopyPasteConverter(
}
override fun convertAndRestoreReferencesIfTextIsUnchanged(): Boolean {
val conversionResult = dataForConversion.elementsAndTexts.convertCodeToKotlin(project, targetData.file, Kind.K2)
val conversionResult = elementsAndTexts.convertCodeToKotlin(project, targetData.file, Kind.K2)
val (text, _, importsToAdd, isTextChanged, converterContext) = conversionResult
val changedText = if (isTextChanged) text else null
result = Result(changedText, importsToAdd, converterContext)