From 3889bb05d6b5bad1cf4a9220409dde83a60f4e5d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 12 Dec 2018 10:56:30 +0300 Subject: [PATCH] Do not modify highlighting settings for non-Kotlin files #KT-28716 Fixed --- .../highlighter/KotlinDefaultHighlightingSettingsProvider.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt index 4a2418e58e3..75aeaaec016 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt @@ -10,11 +10,14 @@ import com.intellij.codeInsight.daemon.impl.analysis.FileHighlightingSetting import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.internal.isKotlinDecompiledFile +import org.jetbrains.kotlin.idea.refactoring.toPsiFile import org.jetbrains.kotlin.idea.util.ProjectRootsUtil +import org.jetbrains.kotlin.psi.KtFile class KotlinDefaultHighlightingSettingsProvider : DefaultHighlightingSettingProvider() { override fun getDefaultSetting(project: Project, file: VirtualFile): FileHighlightingSetting? { return when { + file.toPsiFile(project) !is KtFile -> null ProjectRootsUtil.isLibraryFile(project, file) -> FileHighlightingSetting.SKIP_INSPECTION file.isKotlinDecompiledFile -> FileHighlightingSetting.SKIP_HIGHLIGHTING else -> null