MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: do not highlight excluded from commit changes if feature is disabled

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-02-26 18:43:26 +03:00
parent 4a67c6f304
commit 8012652699
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java
+1 -1
View File
@@ -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);