From d553c9555cfdd7c6d9e892e5d88d67301156706c Mon Sep 17 00:00:00 2001 From: Alexey Belkov Date: Wed, 4 Dec 2024 13:54:47 +0400 Subject: [PATCH] [kotlin] J2K copy-paste cleanup: rename DataForConversion KTIJ-28714 IJ-CR-150614 (cherry picked from commit 13cfdd96db96306f742e3d102053a13a988f492b) GitOrigin-RevId: 2ae30885302c38ab5066914353235fbd5be2d292 --- .../j2k/post/processing/NewJ2kConverterExtension.kt | 10 +++++----- .../kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt | 6 +++--- .../j2k/copyPaste/K1PlainTextPasteImportResolver.kt | 6 +++--- .../jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt | 8 ++++---- .../jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt | 10 +++++----- .../j2k/k2/copyPaste/K2PlainTextPasteImportResolver.kt | 8 ++++---- .../org/jetbrains/kotlin/j2k/J2kConverterExtension.kt | 6 +++--- .../{DataForConversion.kt => ConversionData.kt} | 6 +++--- .../j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt | 6 +++--- .../j2k/copyPaste/ConvertTextJavaCopyPasteProcessor.kt | 6 +++--- .../kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt | 10 +++++----- 11 files changed, 41 insertions(+), 41 deletions(-) rename plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/{DataForConversion.kt => ConversionData.kt} (97%) diff --git a/plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/NewJ2kConverterExtension.kt b/plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/NewJ2kConverterExtension.kt index 0acf6786b836..6f2e62963769 100644 --- a/plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/NewJ2kConverterExtension.kt +++ b/plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/NewJ2kConverterExtension.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.j2k.copyPaste.K1J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.j2k.J2kConverterExtension.Kind.K1_NEW import org.jetbrains.kotlin.j2k.copyPaste.TargetData -import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion +import org.jetbrains.kotlin.j2k.copyPaste.ConversionData import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.K1PlainTextPasteImportResolver import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver @@ -43,18 +43,18 @@ class NewJ2kConverterExtension : J2kConverterExtension() { getNewJ2KConversions(context) override fun createPlainTextPasteImportResolver( - dataForConversion: DataForConversion, + conversionData: ConversionData, targetKotlinFile: KtFile ): PlainTextPasteImportResolver { - return K1PlainTextPasteImportResolver(dataForConversion, targetKotlinFile) + return K1PlainTextPasteImportResolver(conversionData, targetKotlinFile) } override fun createCopyPasteConverter( project: Project, editor: Editor, - dataForConversion: DataForConversion, + conversionData: ConversionData, targetData: TargetData, ): J2KCopyPasteConverter { - return K1J2KCopyPasteConverter(project, editor, dataForConversion, targetData, kind) + return K1J2KCopyPasteConverter(project, editor, conversionData, targetData, kind) } } \ No newline at end of file diff --git a/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt b/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt index 30b22d97aa07..356bd9715379 100644 --- a/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt +++ b/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory class K1J2KCopyPasteConverter( private val project: Project, private val editor: Editor, - private val dataForConversion: DataForConversion, + private val conversionData: ConversionData, private val targetData: TargetData, private val j2kKind: J2kConverterExtension.Kind, ) : J2KCopyPasteConverter { @@ -66,9 +66,9 @@ class K1J2KCopyPasteConverter( ThreadingAssertions.assertEventDispatchThread() fun runConversion() { - val conversionResult = dataForConversion.elementsAndTexts.convertCodeToKotlin(project, targetData.file, j2kKind) + val conversionResult = conversionData.elementsAndTexts.convertCodeToKotlin(project, targetData.file, j2kKind) val (text, parseContext, importsToAdd, isTextChanged, converterContext) = conversionResult - val referenceData = buildReferenceData(text, parseContext, dataForConversion.importsAndPackage, targetData.file) + val referenceData = buildReferenceData(text, parseContext, conversionData.importsAndPackage, targetData.file) val changedText = if (isTextChanged) text else null result = Result(changedText, referenceData, importsToAdd, converterContext) } diff --git a/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1PlainTextPasteImportResolver.kt b/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1PlainTextPasteImportResolver.kt index 800d760d1fc0..4b42b9d2f6c2 100644 --- a/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1PlainTextPasteImportResolver.kt +++ b/plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1PlainTextPasteImportResolver.kt @@ -32,9 +32,9 @@ import org.jetbrains.kotlin.psi.psiUtil.referenceExpression /** * Tests: [org.jetbrains.kotlin.nj2k.K1JavaToKotlinCopyPasteConversionTestGenerated]. */ -class K1PlainTextPasteImportResolver(private val dataForConversion: DataForConversion, private val targetKotlinFile: KtFile) : +class K1PlainTextPasteImportResolver(private val conversionData: ConversionData, private val targetKotlinFile: KtFile) : PlainTextPasteImportResolver { - private val sourceJavaFile: PsiJavaFile = dataForConversion.sourceJavaFile + private val sourceJavaFile: PsiJavaFile = conversionData.sourceJavaFile private val javaFileImportList: PsiImportList = sourceJavaFile.importList!! private val project = targetKotlinFile.project private val scope: GlobalSearchScope = targetKotlinFile.resolveScope @@ -56,7 +56,7 @@ class K1PlainTextPasteImportResolver(private val dataForConversion: DataForConve // TODO removing this function doesn't affect existing tests // investigate is this needed or not private fun addImportsToJavaFileFromKotlinFile() { - if (javaFileImportList in dataForConversion.elementsAndTexts.toList()) return + if (javaFileImportList in conversionData.elementsAndTexts.toList()) return ProgressManager.getInstance().runProcessWithProgressSynchronously( addImportsTask, KotlinNJ2KBundle.message("copy.text.adding.imports"), /* canBeCanceled = */ true, project diff --git a/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt b/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt index ac380b3aad5f..b59d591996ea 100644 --- a/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt +++ b/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt @@ -36,18 +36,18 @@ class OldJ2kConverterExtension : J2kConverterExtension() { true override fun createPlainTextPasteImportResolver( - dataForConversion: DataForConversion, + conversionData: ConversionData, targetKotlinFile: KtFile ): PlainTextPasteImportResolver { - return K1PlainTextPasteImportResolver(dataForConversion, targetKotlinFile) + return K1PlainTextPasteImportResolver(conversionData, targetKotlinFile) } override fun createCopyPasteConverter( project: Project, editor: Editor, - dataForConversion: DataForConversion, + conversionData: ConversionData, targetData: TargetData ): J2KCopyPasteConverter { - return K1J2KCopyPasteConverter(project, editor, dataForConversion, targetData, kind) + return K1J2KCopyPasteConverter(project, editor, conversionData, targetData, kind) } } \ No newline at end of file diff --git a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt index 2567515fcf8c..2a2c533e91ed 100644 --- a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt +++ b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt @@ -10,7 +10,7 @@ import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.j2k.J2kConverterExtension.Kind.K2 import org.jetbrains.kotlin.j2k.copyPaste.TargetData -import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion +import org.jetbrains.kotlin.j2k.copyPaste.ConversionData import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver import org.jetbrains.kotlin.j2k.k2.copyPaste.K2J2KCopyPasteConverter @@ -49,18 +49,18 @@ class K2J2KConverterExtension : J2kConverterExtension() { getK2J2KConversions(context) override fun createPlainTextPasteImportResolver( - dataForConversion: DataForConversion, + conversionData: ConversionData, targetKotlinFile: KtFile ): PlainTextPasteImportResolver { - return K2PlainTextPasteImportResolver(dataForConversion, targetKotlinFile) + return K2PlainTextPasteImportResolver(conversionData, targetKotlinFile) } override fun createCopyPasteConverter( project: Project, editor: Editor, - dataForConversion: DataForConversion, + conversionData: ConversionData, targetData: TargetData ): J2KCopyPasteConverter { - return K2J2KCopyPasteConverter(project, editor, dataForConversion.elementsAndTexts, targetData) + return K2J2KCopyPasteConverter(project, editor, conversionData.elementsAndTexts, targetData) } } \ No newline at end of file diff --git a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2PlainTextPasteImportResolver.kt b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2PlainTextPasteImportResolver.kt index db3b56cdb2d2..aff44df9b55f 100644 --- a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2PlainTextPasteImportResolver.kt +++ b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2PlainTextPasteImportResolver.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.base.psi.kotlinFqName import org.jetbrains.kotlin.idea.base.util.module import org.jetbrains.kotlin.idea.base.util.runReadActionInSmartMode import org.jetbrains.kotlin.idea.references.mainReference -import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion +import org.jetbrains.kotlin.j2k.copyPaste.ConversionData import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver import org.jetbrains.kotlin.nj2k.KotlinNJ2KBundle import org.jetbrains.kotlin.psi.KtDotQualifiedExpression @@ -33,9 +33,9 @@ import org.jetbrains.kotlin.psi.psiUtil.referenceExpression /** * Tests: [org.jetbrains.kotlin.j2k.k2.K2TextJavaToKotlinCopyPasteConversionTestGenerated]. */ -internal class K2PlainTextPasteImportResolver(private val dataForConversion: DataForConversion, private val targetKotlinFile: KtFile) : +internal class K2PlainTextPasteImportResolver(private val conversionData: ConversionData, private val targetKotlinFile: KtFile) : PlainTextPasteImportResolver { - private val sourceJavaFile: PsiJavaFile = dataForConversion.sourceJavaFile + private val sourceJavaFile: PsiJavaFile = conversionData.sourceJavaFile private val javaFileImportList: PsiImportList = sourceJavaFile.importList!! private val project = targetKotlinFile.project private val scope: GlobalSearchScope = targetKotlinFile.resolveScope @@ -55,7 +55,7 @@ internal class K2PlainTextPasteImportResolver(private val dataForConversion: Dat // TODO removing this function doesn't affect existing tests // investigate is this needed or not private fun addImportsToJavaFileFromKotlinFile() { - if (javaFileImportList in dataForConversion.elementsAndTexts.toList()) return + if (javaFileImportList in conversionData.elementsAndTexts.toList()) return ProgressManager.getInstance().runProcessWithProgressSynchronously( addImportsTask, KotlinNJ2KBundle.message("copy.text.adding.imports"), /* canBeCanceled = */ true, project diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/J2kConverterExtension.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/J2kConverterExtension.kt index 1837d0f66b0a..b9a23f27e9e9 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/J2kConverterExtension.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/J2kConverterExtension.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.project.Project import com.intellij.psi.PsiJavaFile -import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion +import org.jetbrains.kotlin.j2k.copyPaste.ConversionData import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver import org.jetbrains.kotlin.j2k.copyPaste.TargetData @@ -50,14 +50,14 @@ abstract class J2kConverterExtension { emptyList() abstract fun createPlainTextPasteImportResolver( - dataForConversion: DataForConversion, + conversionData: ConversionData, targetKotlinFile: KtFile ): PlainTextPasteImportResolver abstract fun createCopyPasteConverter( project: Project, editor: Editor, - dataForConversion: DataForConversion, + conversionData: ConversionData, targetData: TargetData, ): J2KCopyPasteConverter diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/DataForConversion.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionData.kt similarity index 97% rename from plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/DataForConversion.kt rename to plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionData.kt index 17585f00216c..6dc6deabf0d8 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/DataForConversion.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionData.kt @@ -18,13 +18,13 @@ import org.jetbrains.kotlin.psi.psiUtil.elementsInRange * @property importsAndPackage Kotlin code of the package declaration and significant non-static import statements of the original Java file * @property sourceJavaFile a copy of the whole file containing the to-be-converted Java code fragment */ -class DataForConversion private constructor( +class ConversionData private constructor( val elementsAndTexts: ElementAndTextList, val importsAndPackage: String, val sourceJavaFile: PsiJavaFile ) { companion object { - fun prepare(copiedCode: CopiedJavaCode, project: Project): DataForConversion { + fun prepare(copiedCode: CopiedJavaCode, project: Project): ConversionData { val startOffsets = copiedCode.startOffsets.clone() val endOffsets = copiedCode.endOffsets.clone() assert(startOffsets.size == endOffsets.size) { "Must have the same size" } @@ -45,7 +45,7 @@ class DataForConversion private constructor( elementsAndTexts.collectElementsToConvert(file, fileText, TextRange(startOffsets[i], endOffsets[i])) } - return DataForConversion(elementsAndTexts, importsAndPackage, file) + return ConversionData(elementsAndTexts, importsAndPackage, file) } } } diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt index 8d72a95aab79..0ea8a833cc07 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt @@ -69,11 +69,11 @@ class ConvertJavaCopyPasteProcessor : CopyPastePostProcessor listOf("\n", importStatement)