From 79537a5fdb6599e9fc44c4a680adce59ae777a71 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 7 Dec 2018 18:52:20 +0300 Subject: [PATCH] Fix check in isSameRootType. May fix KT-28626. Related to KT-27718 --- .../src/org/jetbrains/kotlin/config/KotlinRootType.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt index 689ac3c0748..a2549ea2e2c 100644 --- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt +++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt @@ -14,7 +14,7 @@ fun isSameRootType(kotlinRoot: KotlinRootType, other: Any?): Boolean { val invokeLevel = 3 val stack = Thread.currentThread().stackTrace if (stack.size > invokeLevel && "isTestSource" == stack[invokeLevel].methodName && "com.intellij.openapi.roots.impl.SourceFolderImpl" == stack[invokeLevel].className) { - if (JavaResourceRootType.TEST_RESOURCE == other) { + if (JavaResourceRootType.TEST_RESOURCE == other || JavaSourceRootType.TEST_SOURCE == other) { return true } }