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] J2K copy-paste cleanup: rename ConversionTargetData

Browse Source 
KTIJ-28714
IJ-CR-150614

(cherry picked from commit 325142ffeb5aa7fae9eade95e2d726f1237c522b)

GitOrigin-RevId: 4de0eb92594443955ced2152c04ce3af648dc500
This commit is contained in:
Alexey Belkov
2024-12-05 21:53:56 +00:00
committed by intellij-monorepo-bot
parent bf6e12e87f
commit 2596b067cf
8 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/NewJ2kConverterExtension.kt
+2 -2
View File
@@ -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)
}
plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/j2k/copyPaste/K1J2KCopyPasteConverter.kt
+1 -1
View File
@@ -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 {
/**
plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt
+1 -1
View File
@@ -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)
}
plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/K2J2KConverterExtension.kt
+2 -2
View File
@@ -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)
}
plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/k2/copyPaste/K2J2KCopyPasteConverter.kt
+1 -1
View File
@@ -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).
plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/J2kConverterExtension.kt
+2 -4
View File
@@ -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 {
plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/J2KTextCopyPasteConverter.kt
+1 -1
View File
@@ -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() {
plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt → plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/j2k/copyPaste/TargetData.kt
+3 -3
View File
@@ -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)
}