diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTargetData.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt similarity index 97% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTargetData.kt rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt index 8778372fdaf6..c6aa0bc98040 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTargetData.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTargetData.kt @@ -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 diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTextClipper.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTextClipper.kt similarity index 99% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTextClipper.kt rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTextClipper.kt index 4cf4b389f306..66f949d9a8a0 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConversionTextClipper.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConversionTextClipper.kt @@ -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 } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt similarity index 98% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt index 0fbb4eb2a253..23dc075e5441 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/ConvertJavaCopyPasteProcessor.kt @@ -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 -
+ diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/KotlinPasteFromJavaDialog.java similarity index 89% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/KotlinPasteFromJavaDialog.java index 97e642d71479..37238b141ddc 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/KotlinPasteFromJavaDialog.java @@ -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; diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/PlainTextPasteImportResolver.kt similarity index 99% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/PlainTextPasteImportResolver.kt index ce837385ca78..0795c6821d74 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/PlainTextPasteImportResolver.kt @@ -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() } } } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/package-info.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/package-info.java similarity index 78% rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/package-info.java rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/package-info.java index 830c0ac48f29..7695115a3dee 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/package-info.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/j2k/copyPaste/package-info.java @@ -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; \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt index b559374aa37c..1f45e52ddba4 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt @@ -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 diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt index 1254e25dacbe..d8d163a599dd 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt @@ -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 diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt index f46fd4c9a059..c8c38278a669 100644 --- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt +++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceJavaToKotlinCopyPasteConversionTest.kt @@ -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 diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceNewJavaToKotlinCopyPasteConversionTest.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceNewJavaToKotlinCopyPasteConversionTest.kt index 9182dc33f06d..5cc6e5ed27b3 100644 --- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceNewJavaToKotlinCopyPasteConversionTest.kt +++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/AbstractPerformanceNewJavaToKotlinCopyPasteConversionTest.kt @@ -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) { diff --git a/plugins/kotlin/plugin/k1/resources/META-INF/kotlin-core-fe10.xml b/plugins/kotlin/plugin/k1/resources/META-INF/kotlin-core-fe10.xml index 1b535060742b..4fd3fa83dbdf 100644 --- a/plugins/kotlin/plugin/k1/resources/META-INF/kotlin-core-fe10.xml +++ b/plugins/kotlin/plugin/k1/resources/META-INF/kotlin-core-fe10.xml @@ -275,8 +275,8 @@ - - + +