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: abort ongoing "Local Changes" refresh on mapping change

Browse Source 
Handle PCE that is thrown from 'iterateScopes()' in the same manner as thrown from ChangeProvider.

follow-up: 8563db42426bdf4443148da3a699c972e8d678d8
           574b61f361094f3fdf78e72fab4c3d515005fa60

GitOrigin-RevId: c5c03a3cec55598760c37aa0b30504023471b890
This commit is contained in:
Aleksey Pivovarov
2020-06-15 14:23:13 +03:00
committed by intellij-monorepo-bot
parent 3c622cd60e
commit 41c51ab95a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+9 -4
View File
@@ -483,9 +483,13 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Change
SensitiveProgressWrapper vcsIndicator = new SensitiveProgressWrapper(ProgressManager.getInstance().getProgressIndicator());
invalidated.doWhenCanceled(() -> vcsIndicator.cancel());
ProgressManager.getInstance().executeProcessUnderProgress(() -> {
iterateScopes(dataHolder, scopes, vcsIndicator);
}, vcsIndicator);
try {
ProgressManager.getInstance().executeProcessUnderProgress(() -> {
iterateScopes(dataHolder, scopes, vcsIndicator);
}, vcsIndicator);
}
catch (ProcessCanceledException ignore) {
}
boolean takeChanges;
synchronized (myDataLock) {
@@ -658,7 +662,8 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Change
catch (VcsException e) {
handleUpdateException(e);
}
catch (ProcessCanceledException ignore) {
catch (ProcessCanceledException e) {
throw e;
}
catch (Throwable t) {
LOG.debug(t);