From 9516c638ea365d5c067249facdea0fdd48738cf5 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 28 Mar 2018 17:01:50 +0200 Subject: [PATCH] Use more efficient file type check (avoid identifying file type by file) --- .../src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt index 394609465d7..da551dcc5f5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt @@ -10,6 +10,7 @@ import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.injected.editor.VirtualFileWindow import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.fileTypes.FileType +import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.project.Project @@ -65,7 +66,7 @@ object ProjectRootsUtil { if (!includeLibraryClasses && !includeLibrarySource) return false // NOTE: the following is a workaround for cases when class files are under library source roots and source files are under class roots - val fileType = file.fileType + val fileType = FileTypeManager.getInstance().getFileTypeByFileName(file.name) val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory val isBinary = fileType.isKotlinBinary()