From ce4a75f2291c2559ad5ecfab5a1568c6f631b708 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 27 Apr 2017 15:37:47 +0300 Subject: [PATCH] vcs: cleanup - inline method with a single usage --- .../VcsContentAnnotationExceptionFilter.java | 10 ++++++++-- .../openapi/vcs/changes/ChangeListManager.java | 9 --------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java b/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java index 62fdede9213f..9f7d584b5c46 100644 --- a/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java +++ b/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java @@ -32,6 +32,7 @@ import com.intellij.openapi.localVcs.UpToDateLineNumberProvider; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.Trinity; +import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.impl.UpToDateLineNumberProviderImpl; @@ -116,8 +117,13 @@ public class VcsContentAnnotationExceptionFilter implements Filter, FilterMixin if (VcsRevisionNumber.NULL.equals(recentChangeRevision)) { recentChangeRevision = null; } - if (localChangesCorrector.isFileAlreadyIdentifiedAsChanged(vf) || ChangeListManager.isFileChanged(myProject, vf) || - recentChangeRevision != null) { + + FileStatus status = ChangeListManager.getInstance(myProject).getStatus(vf); + boolean isFileChanged = FileStatus.NOT_CHANGED.equals(status) || + FileStatus.UNKNOWN.equals(status) || + FileStatus.IGNORED.equals(status); + + if (localChangesCorrector.isFileAlreadyIdentifiedAsChanged(vf) || isFileChanged || recentChangeRevision != null) { final Document document = getDocumentForFile(worker); if (document == null) return; diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java index ee216564a9d6..47a6690f5320 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java @@ -150,15 +150,6 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract String isFreezed(); public abstract boolean isFreezedWithNotification(@Nullable String modalTitle); - public static boolean isFileChanged(final Project project, final VirtualFile vf) { - FileStatus status = getInstance(project).getStatus(vf); - if (FileStatus.NOT_CHANGED.equals(status) || FileStatus.UNKNOWN.equals(status) || FileStatus.IGNORED.equals(status)) { - return false; - } - return true; - } - - public abstract List getModifiedWithoutEditing(); @NotNull