Skip to content

Commit 467b492

Browse files
committed
fix compileTestKotlin error for 242-251
1 parent 0ff80f8 commit 467b492

File tree

3 files changed

+46
-21
lines changed

3 files changed

+46
-21
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package software.aws.toolkits.jetbrains.services.lambda.java
2+
3+
import com.intellij.openapi.project.Project
4+
import com.intellij.openapi.project.DumbService
5+
import com.intellij.openapi.project.DumbServiceImpl
6+
import kotlinx.coroutines.runBlocking
7+
import kotlinx.coroutines.withContext
8+
import software.aws.toolkits.jetbrains.core.coroutines.EDT
9+
import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRule
10+
11+
internal inline fun runInDumbMode(projectRule: JavaCodeInsightTestFixtureRule, crossinline block: () -> Unit) {
12+
val dumbServiceImpl = DumbService.getInstance(projectRule.project) as DumbServiceImpl
13+
runBlocking {
14+
// automatically on correct thread in 233+
15+
withContext(EDT) {
16+
dumbServiceImpl.runInDumbMode {
17+
block()
18+
}
19+
}
20+
}
21+
}

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolverTest.kt

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,14 @@
33

44
package software.aws.toolkits.jetbrains.services.lambda.java
55

6-
import com.intellij.openapi.project.DumbService
7-
import com.intellij.openapi.project.DumbServiceImpl
8-
import com.intellij.openapi.project.runInDumbMode
96
import com.intellij.psi.PsiClass
107
import com.intellij.psi.PsiMethod
118
import com.intellij.testFramework.runInEdtAndWait
12-
import kotlinx.coroutines.runBlocking
13-
import kotlinx.coroutines.withContext
149
import org.assertj.core.api.Assertions.assertThat
1510
import org.junit.Before
1611
import org.junit.Rule
1712
import org.junit.Test
1813
import software.amazon.awssdk.services.lambda.model.Runtime
19-
import software.aws.toolkits.jetbrains.core.coroutines.EDT
2014
import software.aws.toolkits.jetbrains.services.lambda.BuiltInRuntimeGroups
2115
import software.aws.toolkits.jetbrains.services.lambda.Lambda
2216
import software.aws.toolkits.jetbrains.services.lambda.LambdaHandlerResolver
@@ -462,7 +456,7 @@ class JavaLambdaHandlerResolverTest {
462456
"""
463457
)
464458

465-
runInDumbMode {
459+
runInDumbMode(projectRule) {
466460
runInEdtAndWait {
467461
val elements = Lambda.findPsiElementsForHandler(
468462
projectRule.project,
@@ -486,7 +480,7 @@ class JavaLambdaHandlerResolverTest {
486480
"""
487481
)
488482

489-
runInDumbMode {
483+
runInDumbMode(projectRule) {
490484
runInEdtAndWait {
491485
val handler = JavaLambdaHandlerResolver()
492486
.determineHandler(psiClass.findMethodsByName("handleRequest", false)[0])
@@ -507,7 +501,7 @@ class JavaLambdaHandlerResolverTest {
507501
"""
508502
)
509503

510-
runInDumbMode {
504+
runInDumbMode(projectRule) {
511505
runInEdtAndWait {
512506
val handler = JavaLambdaHandlerResolver()
513507
.determineHandlers(
@@ -527,16 +521,4 @@ class JavaLambdaHandlerResolverTest {
527521
assertThat(sut.handlerDisplayName("com.example.LambdaHandler")).isEqualTo("LambdaHandler")
528522
assertThat(sut.handlerDisplayName("LambdaHandler::handleRequest")).isEqualTo("LambdaHandler.handleRequest")
529523
}
530-
531-
private inline fun runInDumbMode(crossinline block: () -> Unit) {
532-
val dumbServiceImpl = DumbService.getInstance(projectRule.project) as DumbServiceImpl
533-
runBlocking {
534-
// automatically on correct thread in 233+
535-
withContext(EDT) {
536-
dumbServiceImpl.runInDumbMode {
537-
block()
538-
}
539-
}
540-
}
541-
}
542524
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package software.aws.toolkits.jetbrains.services.lambda.java
2+
3+
import com.intellij.openapi.project.DumbService
4+
import com.intellij.openapi.project.DumbServiceImpl
5+
import com.intellij.openapi.project.runInDumbMode
6+
import kotlinx.coroutines.runBlocking
7+
import kotlinx.coroutines.withContext
8+
import software.aws.toolkits.jetbrains.core.coroutines.EDT
9+
import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRule
10+
11+
internal inline fun runInDumbMode(projectRule: JavaCodeInsightTestFixtureRule, crossinline block: () -> Unit) {
12+
val dumbServiceImpl = DumbService.getInstance(projectRule.project) as DumbServiceImpl
13+
runBlocking {
14+
// automatically on correct thread in 233+
15+
withContext(EDT) {
16+
dumbServiceImpl.runInDumbMode {
17+
block()
18+
}
19+
}
20+
}
21+
}
22+

0 commit comments

Comments
 (0)