azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce Type Alias: Forbid nested/local type aliases

Browse Source
This commit is contained in:
Alexey Sedunov
2016-11-29 18:04:46 +03:00
parent 752ae87591
commit 24035d2c83
6 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
+2 -20
View File
@@ -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<KtSimpleNameExpression>()
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) }
idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// NAME: B
class A<X, Y>
fun foo() {
// SIBLING:
val a: <caret>A<Int, String>
}
idea/testData/refactoring/introduceTypeAlias/localTypeAlias.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
// NAME: B
class A<X, Y>
fun foo() {
// SIBLING:
typealias B = A<Int, String>
val a: B
}
idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// NAME: B
class A<X, Y>
class Test {
// SIBLING
val a: <caret>A<Int, String>
}
idea/testData/refactoring/introduceTypeAlias/memberTypeAlias.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
// NAME: B
class A<X, Y>
class Test {
typealias B = A<Int, String>
// SIBLING
val a: B
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
-12
View File
@@ -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");