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

IDEA-106293 vcs: unconditionally drop FileStatus cache after Local Changes update

Browse Source 
If typing in an unchanged file is quickly reverted, file could stuck in "modified" state.
ex: on "Ctrl+V Ctrl+S Ctrl+Z" action sequence

* File modified
-- DocumentListener in FileStatusManager marks its status as "modified"
* File saved on disk
-- CLM refresh is scheduled
* Changes in document are reverted
-- LineStatusTracker notices, that all changes are reverted and saves the file on disk again.
-- Another CLM refresh is scheduled
* CLM refresh finished, but no changes are detected (as the file is no longer modified on disk)
-- FileStatus refresh in ChangeListWorker is skipped
This commit is contained in:
Aleksey Pivovarov
2018-07-18 19:21:59 +03:00
parent b55a271468
commit 0ec7ee057a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+4 -7
View File
@@ -618,7 +618,7 @@ public class ChangeListWorker {
@NotNull PlusMinusModify<BaseRevision> deltaListener) {
HashMap<Change, ListData> oldChangeMappings = new HashMap<>(myChangeMappings);
boolean somethingChanged = notifyPathsChanged(myIdx, updatedWorker.myIdx, deltaListener);
notifyPathsChanged(myIdx, updatedWorker.myIdx, deltaListener);
myIdx.copyFrom(updatedWorker.myIdx);
myChangeMappings.clear();
@@ -654,9 +654,7 @@ public class ChangeListWorker {
}
}
if (somethingChanged) {
FileStatusManager.getInstance(myProject).fileStatusesChanged();
}
FileStatusManager.getInstance(myProject).fileStatusesChanged();
if (myMainWorker) {
myDelayedNotificator.allChangeListsMappingsChanged();
@@ -667,8 +665,8 @@ public class ChangeListWorker {
}
}
private static boolean notifyPathsChanged(@NotNull ChangeListsIndexes was, @NotNull ChangeListsIndexes became,
@NotNull PlusMinusModify<BaseRevision> deltaListener) {
private static void notifyPathsChanged(@NotNull ChangeListsIndexes was, @NotNull ChangeListsIndexes became,
@NotNull PlusMinusModify<BaseRevision> deltaListener) {
final Set<BaseRevision> toRemove = new HashSet<>();
final Set<BaseRevision> toAdd = new HashSet<>();
final Set<BeforeAfter<BaseRevision>> toModify = new HashSet<>();
@@ -683,7 +681,6 @@ public class ChangeListWorker {
for (BeforeAfter<BaseRevision> beforeAfter : toModify) {
deltaListener.modify(beforeAfter.getBefore(), beforeAfter.getAfter());
}
return !toRemove.isEmpty() || !toAdd.isEmpty();
}
void setChangeLists(@NotNull Collection<LocalChangeListImpl> lists) {