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

vcs: cleanup - inline method with a single usage

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-05-29 21:33:23 +03:00
committed by Aleksey Pivovarov
parent a3b01c9c5b
commit ce4a75f229
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java
+8 -2
View File
@@ -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;
platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java
-9
View File
@@ -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<VirtualFile> getModifiedWithoutEditing();
@NotNull