From 7a49869833cd7f44b48b72621653429b2cf7b77b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 9 Jun 2017 11:55:16 +0300 Subject: [PATCH] Introduce HighlighterLayer.WEAK_WARNING for Kotlin Otherwise weak warnings are at the same layer as semantic highlighting, that provides strange effects like KT-18212 --- .../codeInsight/daemon/impl/UpdateHighlightersUtil.java | 3 +++ .../com/intellij/openapi/editor/markup/HighlighterLayer.java | 1 + 2 files changed, 4 insertions(+) diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java index c1113f102645..2fda891c0bac 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java @@ -395,6 +395,9 @@ public class UpdateHighlightersUtil { if (severity == HighlightSeverity.WARNING) { layer = HighlighterLayer.WARNING; } + else if (severity == HighlightSeverity.WEAK_WARNING) { + layer = HighlighterLayer.WEAK_WARNING; + } else if (severityRegistrar.compare(severity, HighlightSeverity.ERROR) >= 0) { layer = HighlighterLayer.ERROR; } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/HighlighterLayer.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/HighlighterLayer.java index bba3b485d9e7..2c5a563a171f 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/HighlighterLayer.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/HighlighterLayer.java @@ -20,6 +20,7 @@ public interface HighlighterLayer { int CARET_ROW = 2000; int ADDITIONAL_SYNTAX = 3000; int GUARDED_BLOCKS = 3500; + int WEAK_WARNING = 3750; int WARNING = 4000; int ERROR = 5000; int ELEMENT_UNDER_CARET = 5500;