Skip to content

Commit 6db698f

Browse files
committed
Correct order added for 'suspend' modifier #KT-16104 Fixed
1 parent 1452129 commit 6db698f

File tree

8 files changed

+75
-0
lines changed

8 files changed

+75
-0
lines changed

compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,6 @@ private val MODIFIERS_TO_REPLACE = mapOf(
123123
private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,
124124
FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD,
125125
OVERRIDE_KEYWORD,
126+
SUSPEND_KEYWORD,
126127
INNER_KEYWORD,
127128
ENUM_KEYWORD, COMPANION_KEYWORD, INFIX_KEYWORD, OPERATOR_KEYWORD, DATA_KEYWORD)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
5+
open class A {
6+
open fun bar() {
7+
<caret>foo()
8+
}
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
5+
open class A {
6+
open suspend fun bar() {
7+
foo()
8+
}
9+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
5+
open class A {
6+
open suspend fun bar() {}
7+
}
8+
9+
class B : A() {
10+
override fun bar() {
11+
<caret>foo()
12+
}
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
5+
open class A {
6+
open suspend fun bar() {}
7+
}
8+
9+
class B : A() {
10+
override suspend fun bar() {
11+
foo()
12+
}
13+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
public fun bar() {
5+
<caret>foo()
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// "Make bar suspend" "true"
2+
3+
suspend fun foo() {}
4+
public suspend fun bar() {
5+
foo()
6+
}

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6770,6 +6770,24 @@ public void testInit() throws Exception {
67706770
doTest(fileName);
67716771
}
67726772

6773+
@TestMetadata("open.kt")
6774+
public void testOpen() throws Exception {
6775+
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/open.kt");
6776+
doTest(fileName);
6777+
}
6778+
6779+
@TestMetadata("override.kt")
6780+
public void testOverride() throws Exception {
6781+
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/override.kt");
6782+
doTest(fileName);
6783+
}
6784+
6785+
@TestMetadata("public.kt")
6786+
public void testPublic() throws Exception {
6787+
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/public.kt");
6788+
doTest(fileName);
6789+
}
6790+
67736791
@TestMetadata("startCoroutine.kt")
67746792
public void testStartCoroutine() throws Exception {
67756793
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/suspend/startCoroutine.kt");

0 commit comments

Comments
 (0)