[kotlin] J2K copy-paste: move code to "org.jetbrains.kotlin.j2k.copyPaste" package

KTIJ-28714

(cherry picked from commit 9c60d6ee078e5751bbfa32dbdb3b42f21f288c62)

GitOrigin-RevId: 680bdbed1d5a0ac658f367850ce2a5975b599f41
This commit is contained in:
Alexey Belkov
2024-12-05 21:53:55 +00:00
committed by intellij-monorepo-bot
parent a7ffbe766f
commit 9cae14134a
21 changed files with 32 additions and 36 deletions
@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.lang.injection.InjectedLanguageManager
import com.intellij.openapi.editor.Document
@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.util.TextRange
import com.intellij.psi.*
@@ -169,4 +169,4 @@ internal object ConversionTextClipper {
return clipTo
}
}
}
@@ -1,6 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.codeInsight.editorActions.CopyPastePostProcessor
import com.intellij.codeInsight.editorActions.TextBlockTransferableData
@@ -98,4 +97,4 @@ class ConvertJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransferab
@get:TestOnly
var conversionPerformed: Boolean = false
}
}
}
@@ -1,6 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.codeInsight.editorActions.CopyPastePostProcessor
import com.intellij.codeInsight.editorActions.TextBlockTransferable
@@ -276,4 +275,4 @@ class ConvertTextJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransf
@get:TestOnly
var conversionPerformed: Boolean = false
}
}
}
@@ -1,9 +1,8 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.codeInsight.editorActions.TextBlockTransferableData
import java.awt.datatransfer.DataFlavor
class CopiedJavaCode(val fileText: String, val startOffsets: IntArray, val endOffsets: IntArray) : TextBlockTransferableData {
@@ -1,6 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.codeInsight.editorActions.TextBlockTransferableData
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import java.awt.datatransfer.DataFlavor
/**
* A marker class for [org.jetbrains.kotlin.idea.conversion.copy.ConvertTextJavaCopyPasteProcessor],
* A marker class for [ConvertTextJavaCopyPasteProcessor],
* so that it doesn't try to run J2K on code copied from a Kotlin file.
*/
class CopiedKotlinCode : TextBlockTransferableData {
@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.progress.ProgressManager
@@ -1,6 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.lang.java.JavaLanguage
import com.intellij.openapi.project.Project
@@ -129,4 +128,4 @@ private fun extractSignificantImportsAndPackage(sourceFile: PsiJavaFile): String
}
//TODO: static imports
}
}
}
@@ -1,6 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.psi.PsiElement
@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.editor.Document
@@ -16,8 +16,7 @@ import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.j2k.ConverterContext
import org.jetbrains.kotlin.j2k.J2kConverterExtension
import org.jetbrains.kotlin.j2k.ParseContext
import org.jetbrains.kotlin.j2k.ParseContext.CODE_BLOCK
import org.jetbrains.kotlin.j2k.ParseContext.TOP_LEVEL
import org.jetbrains.kotlin.j2k.ParseContext.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -168,4 +167,4 @@ class J2KCopyPasteConverter(
return rangeMarker.asTextRange
}
}
}
@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.editor.Document
@@ -74,4 +74,4 @@ class J2KTextCopyPasteConverter(
return ElementAndTextList(newlineSeparatedImports)
}
}
}
@@ -1,6 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.progress.ProgressManager
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.conversion.copy.KotlinPasteFromJavaDialog">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.j2k.copyPaste.KotlinPasteFromJavaDialog">
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
@@ -1,6 +1,6 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy;
package org.jetbrains.kotlin.j2k.copyPaste;
import com.intellij.CommonBundle;
import com.intellij.openapi.project.Project;
@@ -1,6 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.conversion.copy
package org.jetbrains.kotlin.j2k.copyPaste
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runReadAction
@@ -257,4 +256,4 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers
private fun runWriteActionOnEDTSync(runnable: () -> Unit) {
ApplicationManager.getApplication().invokeAndWait { runWriteAction { runnable() } }
}
}
}
@@ -1,6 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@ApiStatus.Internal
package org.jetbrains.kotlin.idea.conversion.copy;
package org.jetbrains.kotlin.j2k.copyPaste;
import org.jetbrains.annotations.ApiStatus;
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.idea.AbstractCopyPasteTest
import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
import org.jetbrains.kotlin.idea.test.*
import org.jetbrains.kotlin.j2k.copyPaste.ConvertJavaCopyPasteProcessor
import org.jetbrains.kotlin.psi.KtFile
import java.io.File
import kotlin.test.assertEquals
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
import org.jetbrains.kotlin.idea.test.KotlinTestUtils
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.runAll
import org.jetbrains.kotlin.j2k.copyPaste.ConvertTextJavaCopyPasteProcessor
import java.awt.datatransfer.StringSelection
import java.io.File
@@ -11,7 +11,7 @@ import com.intellij.util.ThrowableRunnable
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.configuration.ExperimentalFeatures
import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
import org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPasteProcessor
import org.jetbrains.kotlin.j2k.copyPaste.ConvertJavaCopyPasteProcessor
import org.jetbrains.kotlin.idea.testFramework.Stats
import org.jetbrains.kotlin.idea.testFramework.Stats.Companion.WARM_UP
import org.jetbrains.kotlin.idea.testFramework.performanceTest
@@ -2,7 +2,7 @@
package org.jetbrains.kotlin.idea.perf.synthetic
import org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPasteProcessor
import org.jetbrains.kotlin.j2k.copyPaste.ConvertJavaCopyPasteProcessor
abstract class AbstractPerformanceNewJavaToKotlinCopyPasteConversionTest :
AbstractPerformanceJavaToKotlinCopyPasteConversionTest(newJ2K = true) {
@@ -275,8 +275,8 @@
<!-- Copy-paste -->
<extensions defaultExtensionNs="com.intellij">
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPasteProcessor"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.conversion.copy.ConvertTextJavaCopyPasteProcessor"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.j2k.copyPaste.ConvertJavaCopyPasteProcessor"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.j2k.copyPaste.ConvertTextJavaCopyPasteProcessor"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinCopyPasteReferenceProcessor"/>
<copyPastePostProcessor implementation="org.jetbrains.kotlin.idea.refactoring.cutPaste.MoveDeclarationsCopyPasteProcessor"/>