diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt index ee2d08184696..bbf0691ee9a3 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt @@ -65,6 +65,9 @@ import java.nio.file.Path import java.nio.file.Paths import kotlin.io.path.exists +/** + * @property focusMode should be cleared explicitly by caller + */ @Ignore class CodeMetaInfoTestCase( val codeMetaInfoTypes: Collection, diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingTestUtils.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingTestUtils.kt index 255feb4083c3..7c5e1c5b8058 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingTestUtils.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingTestUtils.kt @@ -3,7 +3,9 @@ package org.jetbrains.kotlin.idea.highlighter import com.intellij.codeInsight.daemon.impl.HighlightInfoType import com.intellij.lang.annotation.HighlightSeverity +import com.intellij.openapi.editor.ex.EditorSettingsExternalizable import com.intellij.openapi.project.Project +import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiFile import it.unimi.dsi.fastutil.Hash import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet @@ -51,7 +53,12 @@ fun checkHighlighting( focusMode = expectedHighlightingFile.parentFile.name == "focusMode" ) - codeMetaInfoTestCase.checkFile(file.virtualFile, expectedHighlightingFile, project) + val oldMode = EditorSettingsExternalizable.getInstance().isFocusMode + try { + codeMetaInfoTestCase.checkFile(file.virtualFile, expectedHighlightingFile, project) + } finally { + EditorSettingsExternalizable.getInstance().isFocusMode = oldMode + } } private fun Directives.highlightSeverity(): HighlightSeverity? {