From db5751616a56c548923155bc5439c0e1947d4fb7 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 27 Apr 2020 23:33:55 +0700 Subject: [PATCH] MoveKotlinDeclarationsProcessor: fix formatting for long qualifier names #KT-35338 Fixed --- .../MoveKotlinDeclarationsProcessor.kt | 5 +++-- .../Y.kt | 9 +++++++++ .../Y.kt | 9 +++++++++ .../kotlin/changePackage/longName/longName.test | 5 +++++ .../Y.kt | 9 +++++++++ .../after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt | 9 +++++++++ .../X.kt | 7 +++++++ .../Y.kt | 9 +++++++++ .../move/kotlin/moveFile/longName/longName.test | 5 +++++ .../X.kt | 2 ++ .../Y.kt | 9 +++++++++ .../after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt | 9 +++++++++ .../X.kt | 7 +++++++ .../Y.kt | 9 +++++++++ .../moveClassWithLongFunction.test | 5 +++++ .../idea/refactoring/move/MoveTestGenerated.java | 15 +++++++++++++++ 16 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 idea/testData/refactoring/move/kotlin/changePackage/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/changePackage/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/changePackage/longName/longName.test create mode 100644 idea/testData/refactoring/move/kotlin/moveFile/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveFile/longName/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveFile/longName/longName.test create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt index 938b0dab1e2..72418c8a515 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.toLightElements import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.codeInsight.shorten.addToBeShortenedDescendantsToWaitingSet +import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests import org.jetbrains.kotlin.idea.core.deleteSingle import org.jetbrains.kotlin.idea.core.quoteIfNeeded import org.jetbrains.kotlin.idea.refactoring.broadcastRefactoringExit @@ -376,8 +377,8 @@ class MoveKotlinDeclarationsProcessor( internalUsageScopes.forEach { newInternalUsages += restoreInternalUsages(it, oldToNewElementsMapping) } usagesToProcess += newInternalUsages - nonCodeUsages = postProcessMoveUsages(usagesToProcess, oldToNewElementsMapping).toTypedArray() + performDelayedRefactoringRequests(project) } catch (e: IncorrectOperationException) { nonCodeUsages = null RefactoringUIUtil.processIncorrectOperation(myProject, e) diff --git a/idea/testData/refactoring/move/kotlin/changePackage/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/changePackage/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..f3314004897 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/changePackage/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package org.xxxxxx.yyyyyy.zzzzzz.ttttt + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/changePackage/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..44ed3bfa3dc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/changePackage/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/changePackage/longName/longName.test b/idea/testData/refactoring/move/kotlin/changePackage/longName/longName.test new file mode 100644 index 00000000000..c0b92c4caee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/changePackage/longName/longName.test @@ -0,0 +1,5 @@ +{ + "mainFile": "com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt", + "type": "CHANGE_PACKAGE_DIRECTIVE", + "newPackageName": "org.xxxxxx.yyyyyy.zzzzzz.ttttt" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/moveFile/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..44ed3bfa3dc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveFile/longName/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/longName/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt b/idea/testData/refactoring/move/kotlin/moveFile/longName/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt new file mode 100644 index 00000000000..6d35139d77c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveFile/longName/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt @@ -0,0 +1,9 @@ +package org.xxxxxx.yyyyyy.zzzzzz.ttttt + +import com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.SomeVeryImportantClass + +class X { + fun foo(parameter: Any) { + val data = SomeVeryImportantClass.getInstance(parameter).getSomeData() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt b/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt new file mode 100644 index 00000000000..ae0d5bae3c3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt @@ -0,0 +1,7 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class X { + fun foo(parameter: Any) { + val data = SomeVeryImportantClass.getInstance(parameter).getSomeData() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..44ed3bfa3dc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveFile/longName/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveFile/longName/longName.test b/idea/testData/refactoring/move/kotlin/moveFile/longName/longName.test new file mode 100644 index 00000000000..ddffb11be21 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveFile/longName/longName.test @@ -0,0 +1,5 @@ +{ + "mainFile": "com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt", + "type": "MOVE_FILES", + "targetPackage": "org.xxxxxx.yyyyyy.zzzzzz.ttttt" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt new file mode 100644 index 00000000000..8be37594af1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt @@ -0,0 +1,2 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..44ed3bfa3dc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt new file mode 100644 index 00000000000..6d35139d77c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/after/org/xxxxxx/yyyyyy/zzzzzz/ttttt/X.kt @@ -0,0 +1,9 @@ +package org.xxxxxx.yyyyyy.zzzzzz.ttttt + +import com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.SomeVeryImportantClass + +class X { + fun foo(parameter: Any) { + val data = SomeVeryImportantClass.getInstance(parameter).getSomeData() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt new file mode 100644 index 00000000000..db4587a0482 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt @@ -0,0 +1,7 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class X { + fun foo(parameter: Any) { + val data = SomeVeryImportantClass.getInstance(parameter).getSomeData() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt new file mode 100644 index 00000000000..44ed3bfa3dc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/before/com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/Y.kt @@ -0,0 +1,9 @@ +package com.xxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + +class SomeVeryImportantClass { + fun getSomeData(): Any? = null + + companion object { + fun getInstance(o: Any): SomeVeryImportantClass = SomeVeryImportantClass() + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test new file mode 100644 index 00000000000..3798ecbcc8b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test @@ -0,0 +1,5 @@ +{ + "mainFile": "com/xxxxxxx/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz/X.kt", + "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", + "targetPackage": "org.xxxxxx.yyyyyy.zzzzzz.ttttt" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java index ec70d800011..a040e7b76e7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java @@ -223,6 +223,11 @@ public class MoveTestGenerated extends AbstractMoveTest { runTest("idea/testData/refactoring/move/kotlin/changePackage/headerClasses/headerClasses.test"); } + @TestMetadata("kotlin/changePackage/longName/longName.test") + public void testKotlin_changePackage_longName_LongName() throws Exception { + runTest("idea/testData/refactoring/move/kotlin/changePackage/longName/longName.test"); + } + @TestMetadata("kotlin/moveDirectory/moveDirectoryWithPackageDirectiveChange/moveDirectoryWithPackageDirectiveChange.test") public void testKotlin_moveDirectory_moveDirectoryWithPackageDirectiveChange_MoveDirectoryWithPackageDirectiveChange() throws Exception { runTest("idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectoryWithPackageDirectiveChange/moveDirectoryWithPackageDirectiveChange.test"); @@ -253,6 +258,11 @@ public class MoveTestGenerated extends AbstractMoveTest { runTest("idea/testData/refactoring/move/kotlin/moveFile/keepImportAliasRefs/keepImportAliasRefs.test"); } + @TestMetadata("kotlin/moveFile/longName/longName.test") + public void testKotlin_moveFile_longName_LongName() throws Exception { + runTest("idea/testData/refactoring/move/kotlin/moveFile/longName/longName.test"); + } + @TestMetadata("kotlin/moveFile/moveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir/moveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir.test") public void testKotlin_moveFile_moveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir_MoveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir() throws Exception { runTest("idea/testData/refactoring/move/kotlin/moveFile/moveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir/moveFileAndDirWithJavaFileReferringToPackageFragementWithUnmatchedDir.test"); @@ -678,6 +688,11 @@ public class MoveTestGenerated extends AbstractMoveTest { runTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test"); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test") + public void testKotlin_moveTopLevelDeclarations_moveClassWithLongFunction_MoveClassWithLongFunction() throws Exception { + runTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassWithLongFunction/moveClassWithLongFunction.test"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveExtensionFunctionToFil_MoveExtensionFunctionToFile() throws Exception { runTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test");