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

Make <modifier> intention inserts modifier between annotation and class keywords #KT-14092 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2017-06-12 11:55:30 +09:00
committed by Dmitry Jemerov
parent 79493985be
commit ac03c91dcc
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+1 -1
View File
@@ -134,7 +134,7 @@ private val MODIFIERS_TO_REPLACE = mapOf(
) )
private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD, private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,
FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD, FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD, ANNOTATION_KEYWORD,
OVERRIDE_KEYWORD, OVERRIDE_KEYWORD,
CONST_KEYWORD, CONST_KEYWORD,
LATEINIT_KEYWORD, LATEINIT_KEYWORD,
idea/testData/intentions/changeVisibility/private/noModifierListAnnotation.kt
Vendored
+1
View File
@@ -0,0 +1 @@
<caret>annotation class Ann
idea/testData/intentions/changeVisibility/private/noModifierListAnnotation.kt.after
Vendored
+1
View File
@@ -0,0 +1 @@
<caret>private annotation class Ann
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+6
View File
@@ -2932,6 +2932,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
} }
@TestMetadata("noModifierListAnnotation.kt")
public void testNoModifierListAnnotation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListAnnotation.kt");
doTest(fileName);
}
@TestMetadata("noModifierListClass.kt") @TestMetadata("noModifierListClass.kt")
public void testNoModifierListClass() throws Exception { public void testNoModifierListClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListClass.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListClass.kt");