From 8ff0c669c53c3bcca67dc3b2b78e2c6e36f53daf Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 5 Feb 2018 17:52:13 +0300 Subject: [PATCH] IDEA-185964 vcs: disable "Added in not active changelist" file status for vcs that support partial changelists --- .../conflicts/ChangelistConflictFileStatusProvider.java | 4 ++-- .../vcs/changes/conflicts/ChangelistConflictTracker.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java index f17e2b0580f7..a2c279d57919 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java @@ -23,7 +23,6 @@ import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vcs.impl.FileStatusProvider; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.JBColor; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,7 +61,8 @@ public class ChangelistConflictFileStatusProvider implements FileStatusProvider else if (options.HIGHLIGHT_NON_ACTIVE_CHANGELIST) { FileStatus status = myChangeListManager.getStatus(virtualFile); if (status == FileStatus.MODIFIED || status == FileStatus.ADDED) { - if (!myConflictTracker.isFromActiveChangelist(virtualFile)) { + if (myConflictTracker.shouldDetectConflictsFor(virtualFile) && + !myConflictTracker.isFromActiveChangelist(virtualFile)) { return status == FileStatus.MODIFIED ? MODIFIED_OUTSIDE : ADDED_OUTSIDE; } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java index 6ec2e911caca..dc4a75814bb7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java @@ -184,7 +184,7 @@ public class ChangelistConflictTracker { return changeList == null || changeList.isDefault(); } - private boolean shouldDetectConflictsFor(@NotNull VirtualFile file) { + public boolean shouldDetectConflictsFor(@NotNull VirtualFile file) { return !LineStatusTrackerManager.getInstance(myProject).arePartialChangelistsEnabled(file); }