Correct order added for 'suspend' modifier #KT-16104 Fixed

This commit is contained in:
Mikhail Glukhikh
2017-02-02 18:01:49 +03:00
parent 1452129b60
commit 6db698f5aa
8 changed files with 75 additions and 0 deletions
@@ -123,5 +123,6 @@ private val MODIFIERS_TO_REPLACE = mapOf(
private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,
FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD,
OVERRIDE_KEYWORD,
SUSPEND_KEYWORD,
INNER_KEYWORD,
ENUM_KEYWORD, COMPANION_KEYWORD, INFIX_KEYWORD, OPERATOR_KEYWORD, DATA_KEYWORD)
+9
View File
@@ -0,0 +1,9 @@
// "Make bar suspend" "true"
suspend fun foo() {}
open class A {
open fun bar() {
<caret>foo()
}
}
@@ -0,0 +1,9 @@
// "Make bar suspend" "true"
suspend fun foo() {}
open class A {
open suspend fun bar() {
foo()
}
}
+13
View File
@@ -0,0 +1,13 @@
// "Make bar suspend" "true"
suspend fun foo() {}
open class A {
open suspend fun bar() {}
}
class B : A() {
override fun bar() {
<caret>foo()
}
}
@@ -0,0 +1,13 @@
// "Make bar suspend" "true"
suspend fun foo() {}
open class A {
open suspend fun bar() {}
}
class B : A() {
override suspend fun bar() {
foo()
}
}
+6
View File
@@ -0,0 +1,6 @@
// "Make bar suspend" "true"
suspend fun foo() {}
public fun bar() {
<caret>foo()
}
@@ -0,0 +1,6 @@
// "Make bar suspend" "true"
suspend fun foo() {}
public suspend fun bar() {
foo()
}
@@ -6770,6 +6770,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("open.kt")
public void testOpen() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/open.kt");
doTest(fileName);
}
@TestMetadata("override.kt")
public void testOverride() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/override.kt");
doTest(fileName);
}
@TestMetadata("public.kt")
public void testPublic() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/public.kt");
doTest(fileName);
}
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/startCoroutine.kt");