From 80126526998c8f91e574fd046e6c356187ca442c Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 22 Feb 2018 16:39:16 +0300
Subject: [PATCH] diff: do not highlight excluded from commit changes if
 feature is disabled

---
 .../actions/diff/lst/SimpleLocalChangeListDiffViewer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java
index ce5b7d44498c..af50b118f3e9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java
@@ -165,7 +165,7 @@ public class SimpleLocalChangeListDiffViewer extends SimpleDiffViewer {
         boolean isExcludedFromCommit = localRange.isExcludedFromCommit();
         boolean isFromActiveChangelist = localRange.getChangelistId().equals(myChangelistId);
         boolean isSkipped = !isFromActiveChangelist;
-        boolean isExcluded = !isFromActiveChangelist || isExcludedFromCommit;
+        boolean isExcluded = !isFromActiveChangelist || (myAllowExcludeChangesFromCommit && isExcludedFromCommit);
 
         changes.addAll(ContainerUtil.map(rangeFragments, fragment -> {
           return new MySimpleDiffChange(fragment, isExcluded, isSkipped, localRange.getChangelistId(), isExcludedFromCommit);