More logging-3 for AT-885 AssertionError: Overlapping highlighting sessions during analysis

Seams that somehow MyDaemonProgressIndicator.onCancel is not executed

GitOrigin-RevId: 2f5f5898995f810ebd2524fb9e56e49ac3775002
This commit is contained in:
Elena Shaverdova
2024-04-30 15:34:53 +00:00
committed by intellij-monorepo-bot
parent 80b70dc5b6
commit 43cc7451b2
@@ -89,7 +89,7 @@ public class DaemonProgressIndicator extends AbstractProgressIndicatorBase imple
private void doCancel(@Nullable Throwable cause, @NotNull String reason) {
if (tryCancel()) {
if (LOG.isDebugEnabled()) {
LOG.debug("doCancel(" + this +
LOG.debug("doCancel(" + this + " " + this.getClass() +
(reason.isEmpty() ? "" : ", reason: '" + reason + "'") +
(cause == null ? "" : ", cause: " + ExceptionUtil.getThrowableText(cause)) +
")"
@@ -99,7 +99,18 @@ public class DaemonProgressIndicator extends AbstractProgressIndicatorBase imple
if (cause != null) {
myTraceableDisposable.killExceptionally(cause);
}
ProgressManager.getInstance().executeNonCancelableSection(() -> onCancelled(reason));
if (LOG.isDebugEnabled()) {
LOG.debug("doCancel; just before onCancelled");
}
ProgressManager.getInstance().executeNonCancelableSection(() -> {
if (LOG.isDebugEnabled()) {
LOG.debug("doCancel; before onCancelled");
}
onCancelled(reason);
if (LOG.isDebugEnabled()) {
LOG.debug("doCancel; after onCancelled");
}
});
}
else if (LOG.isDebugEnabled()) {
LOG.debug("doCancel on already cancelled(" + this + ")");