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 c027a6b8b763..0acf6786b836 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 @@ -10,7 +10,7 @@ import com.intellij.psi.PsiJavaFile 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.ConversionTargetData +import org.jetbrains.kotlin.j2k.copyPaste.TargetData import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.K1PlainTextPasteImportResolver @@ -53,7 +53,7 @@ class NewJ2kConverterExtension : J2kConverterExtension() { project: Project, editor: Editor, dataForConversion: DataForConversion, - targetData: ConversionTargetData, + targetData: TargetData, ): J2KCopyPasteConverter { return K1J2KCopyPasteConverter(project, editor, dataForConversion, targetData, kind) } 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 3a64837da0de..30b22d97aa07 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 @@ -25,7 +25,7 @@ class K1J2KCopyPasteConverter( private val project: Project, private val editor: Editor, private val dataForConversion: DataForConversion, - private val targetData: ConversionTargetData, + private val targetData: TargetData, private val j2kKind: J2kConverterExtension.Kind, ) : J2KCopyPasteConverter { /** 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 14b59476eca9..ac380b3aad5f 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 @@ -46,7 +46,7 @@ class OldJ2kConverterExtension : J2kConverterExtension() { project: Project, editor: Editor, dataForConversion: DataForConversion, - targetData: ConversionTargetData + targetData: TargetData ): J2KCopyPasteConverter { return K1J2KCopyPasteConverter(project, editor, dataForConversion, targetData, kind) } 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 c97d038e8396..2567515fcf8c 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 @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.j2k.J2kConverterExtension.Kind.K2 -import org.jetbrains.kotlin.j2k.copyPaste.ConversionTargetData +import org.jetbrains.kotlin.j2k.copyPaste.TargetData import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver @@ -59,7 +59,7 @@ class K2J2KConverterExtension : J2kConverterExtension() { project: Project, editor: Editor, dataForConversion: DataForConversion, - targetData: ConversionTargetData + targetData: TargetData ): J2KCopyPasteConverter { return K2J2KCopyPasteConverter(project, editor, dataForConversion.elementsAndTexts, targetData) } diff --git a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt index 133da5acab38..85e4a52fe47c 100644 --- a/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt +++ b/plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt @@ -21,7 +21,7 @@ internal class K2J2KCopyPasteConverter( private val project: Project, private val editor: Editor, private val elementsAndTexts: ElementAndTextList, - private val targetData: ConversionTargetData, + private val targetData: TargetData, ) : J2KCopyPasteConverter { /** * @property changedText The transformed Kotlin code, or `null` if no conversion occurred (the result is the same as original code). 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 0db1b46848b1..1837d0f66b0a 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 @@ -2,18 +2,16 @@ package org.jetbrains.kotlin.j2k -import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor -import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.extensions.ExtensionPointName 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.ConversionTargetData import org.jetbrains.kotlin.j2k.copyPaste.DataForConversion import org.jetbrains.kotlin.j2k.copyPaste.J2KCopyPasteConverter import org.jetbrains.kotlin.j2k.copyPaste.PlainTextPasteImportResolver +import org.jetbrains.kotlin.j2k.copyPaste.TargetData import org.jetbrains.kotlin.nj2k.Conversion import org.jetbrains.kotlin.nj2k.NewJ2kConverterContext import org.jetbrains.kotlin.psi.KtFile @@ -60,7 +58,7 @@ abstract class J2kConverterExtension { project: Project, editor: Editor, dataForConversion: DataForConversion, - targetData: ConversionTargetData, + targetData: TargetData, ): J2KCopyPasteConverter companion object { diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt index c865424cd3b9..365dab048467 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt @@ -20,7 +20,7 @@ internal class J2KTextCopyPasteConverter( private val project: Project, private val editor: Editor, private val dataForConversion: DataForConversion, - private val targetData: ConversionTargetData, + private val targetData: TargetData, private val j2kKind: J2kConverterExtension.Kind, ) { fun convert() { diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/TargetData.kt similarity index 94% rename from plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt rename to plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/TargetData.kt index 2938119ca27e..9f278eac0512 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/TargetData.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.psi.KtFile -data class ConversionTargetData( +data class TargetData( val file: KtFile, val bounds: RangeMarker, val document: Document, @@ -25,7 +25,7 @@ internal fun getTargetData( topLevelDocument: Document, caretOffset: Int, topLevelBounds: RangeMarker -): ConversionTargetData? { +): TargetData? { val psiDocumentManager = PsiDocumentManager.getInstance(project) val topLevelPsiFile = psiDocumentManager.getPsiFile(topLevelDocument) ?: return null var targetBounds = topLevelBounds @@ -50,5 +50,5 @@ internal fun getTargetData( } val targetFile = ktFile?.takeIf { it.virtualFile.isWritable } ?: return null - return ConversionTargetData(targetFile, targetBounds, targetDocument) + return TargetData(targetFile, targetBounds, targetDocument) }