From a7fbc1bc6c54492564170f86c1782142886fde2a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 7 Oct 2014 23:43:05 +0400 Subject: [PATCH] Always check kotlin file is in correct source root for gradle modules --- .../src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt index 016c9a67172..a65bce0f6be 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt @@ -42,10 +42,14 @@ public object ProjectRootsUtil { if (virtualFile == null) return@runReadAction false val index = ProjectFileIndex.SERVICE.getInstance(element.getProject()) - return@runReadAction if (includeLibrarySources) + val isInSourceRoot = if (includeLibrarySources) index.isInSource(virtualFile) else index.isInSourceContent(virtualFile) + + if (!isInSourceRoot) return@runReadAction false + + return@runReadAction !JetModuleTypeManager.getInstance()!!.isKtFileInGradleProjectInWrongFolder(element) }!! }