From 7a1fe1b38deb1977b83ae3370b0edc939ee9a8ae Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Tue, 22 Jan 2019 15:06:03 +0300
Subject: [PATCH] Scope should always be highlighted if caret positioned on
 close marker.

This option is for highlighting scope while typing inside of it.
---
 .../codeInsight/daemon/impl/IdentifierHighlighterPass.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
index 783adbb96a1f..6708afd377ac 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
@@ -229,8 +229,7 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
    * In brace matching case this is done from {@link BraceHighlightingHandler#highlightBraces(com.intellij.openapi.util.TextRange, com.intellij.openapi.util.TextRange, boolean, boolean, com.intellij.openapi.fileTypes.FileType)}
    */
   private void doAdditionalCodeBlockHighlighting() {
-    if (!CodeInsightSettings.getInstance().HIGHLIGHT_SCOPE ||
-        myCodeBlockMarkerRanges.size() < 2 ||
+    if (myCodeBlockMarkerRanges.size() < 2 ||
         myDocument == null ||
         !(myEditor instanceof EditorEx)) {
       return;