diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt index d17624cd63b..bf3bade8354 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt @@ -27,8 +27,6 @@ import com.intellij.refactoring.RefactoringActionHandler import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils.ElementKind.TYPE_CONSTRUCTOR import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils.ElementKind.TYPE_ELEMENT import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively -import org.jetbrains.kotlin.idea.refactoring.chooseContainerElementIfNecessary -import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractIntroduceAction import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.processDuplicates import org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias.ui.KotlinIntroduceTypeAliasDialog @@ -53,7 +51,7 @@ open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler { file, "Select target code block", listOf(TYPE_ELEMENT, TYPE_CONSTRUCTOR), - { elements, parent -> parent.getExtractionContainers(strict = true, includeAll = true) }, + { elements, parent -> listOf(parent.containingFile) }, continuation ) } @@ -115,23 +113,7 @@ open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler { val refExpression = file.findElementAt(offset)?.getNonStrictParentOfType() if (refExpression != null && isDoubleColonReceiver(refExpression)) { - val containers = refExpression.getExtractionContainers(strict = true, includeAll = true) - - chooseContainerElementIfNecessary( - containers, - editor, - if (containers.first() is KtFile) "Select target file" else "Select target code block / file", - true, - { it }, - { - val targetSibling = refExpression.getOutermostParentContainedIn(it) - if (targetSibling != null) { - doInvoke(project, editor, listOf(refExpression), targetSibling) - } - } - ) - - return + return doInvoke(project, editor, listOf(refExpression), refExpression.getOutermostParentContainedIn(file)!!) } selectElements(editor, file) { elements, targetSibling -> doInvoke(project, editor, elements, targetSibling) } diff --git a/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt b/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt deleted file mode 100644 index 1b333416344..00000000000 --- a/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt +++ /dev/null @@ -1,7 +0,0 @@ -// NAME: B -class A - -fun foo() { - // SIBLING: - val a: A -} \ No newline at end of file diff --git a/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt.after b/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt.after deleted file mode 100644 index 753180ed140..00000000000 --- a/idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt.after +++ /dev/null @@ -1,9 +0,0 @@ -// NAME: B -class A - -fun foo() { - // SIBLING: - typealias B = A - - val a: B -} \ No newline at end of file diff --git a/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt b/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt deleted file mode 100644 index befbb64b83a..00000000000 --- a/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt +++ /dev/null @@ -1,7 +0,0 @@ -// NAME: B -class A - -class Test { - // SIBLING - val a: A -} \ No newline at end of file diff --git a/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt.after b/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt.after deleted file mode 100644 index f59fadb996a..00000000000 --- a/idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt.after +++ /dev/null @@ -1,9 +0,0 @@ -// NAME: B -class A - -class Test { - typealias B = A - - // SIBLING - val a: B -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java index c3b971fc554..bd908933862 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java @@ -4142,12 +4142,6 @@ public class ExtractionTestGenerated extends AbstractExtractionTest { doIntroduceTypeAliasTest(fileName); } - @TestMetadata("localTypeAlias.kt") - public void testLocalTypeAlias() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt"); - doIntroduceTypeAliasTest(fileName); - } - @TestMetadata("localTypeExtracted.kt") public void testLocalTypeExtracted() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceTypeAlias/localTypeExtracted.kt"); @@ -4160,12 +4154,6 @@ public class ExtractionTestGenerated extends AbstractExtractionTest { doIntroduceTypeAliasTest(fileName); } - @TestMetadata("memberTypeAlias.kt") - public void testMemberTypeAlias() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt"); - doIntroduceTypeAliasTest(fileName); - } - @TestMetadata("nestedTypesExtracted.kt") public void testNestedTypesExtracted() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceTypeAlias/nestedTypesExtracted.kt");