MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

drop ancient and now dangerous "idea.ProcessCanceledException"

Browse Source 
See IDEA-304945 and async action update.

GitOrigin-RevId: 7a10430fcdf52c65bd110114627fa5b0bb6b2a93
This commit is contained in:
Gregory.Shrago
2022-11-12 14:16:54 +04:00
committed by intellij-monorepo-bot
parent a1f670ab9d
commit 7d5e20ae93
4 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/idea.properties
View File

@@ -52,14 +52,6 @@ idea.no.launcher=false
#---------------------------------------------------------------------
idea.dynamic.classpath=false
#---------------------------------------------------------------------
# Uncomment this property to prevent IDE from throwing ProcessCanceledException when user activity
# detected. This option is only useful for plugin developers, while debugging PSI related activities
# performed in background error analysis thread.
# DO NOT UNCOMMENT THIS UNLESS YOU'RE DEBUGGING IDE ITSELF. Significant slowdowns and lockups will happen otherwise.
#---------------------------------------------------------------------
#idea.ProcessCanceledException=disabled
#---------------------------------------------------------------------
# There are two possible values of idea.popup.weight property: "heavy" and "medium".
# If you have WM configured as "Focus follows mouse with Auto Raise" then you have to

4
platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
View File

@@ -44,8 +44,6 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
static final int CHECK_CANCELED_DELAY_MILLIS = 10;
private final AtomicInteger myUnsafeProgressCount = new AtomicInteger(0);
public static final boolean ENABLED = !"disabled".equals(System.getProperty("idea.ProcessCanceledException"));
private ScheduledFuture<?> myCheckCancelledFuture; // guarded by threadsUnderIndicator
// indicator -> threads which are running under this indicator.
@@ -706,7 +704,7 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
synchronized (threadsUnderIndicator) {
boolean hasCanceledIndicator = !threadsUnderCanceledIndicator.isEmpty();
ourCheckCanceledBehavior = !hasCheckCanceledHooks() && !hasCanceledIndicator ? CheckCanceledBehavior.NONE :
hasCanceledIndicator && ENABLED ? CheckCanceledBehavior.INDICATOR_PLUS_HOOKS :
hasCanceledIndicator ? CheckCanceledBehavior.INDICATOR_PLUS_HOOKS :
CheckCanceledBehavior.ONLY_HOOKS;
}
}

3
platform/platform-impl/src/com/intellij/openapi/application/impl/ReadMostlyRWLock.java
View File

@@ -6,7 +6,6 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.impl.CoreProgressManager;
import com.intellij.util.containers.ConcurrentList;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
@@ -150,7 +149,7 @@ final class ReadMostlyRWLock {
private void throwIfImpatient(Reader status) throws ApplicationUtil.CannotRunReadActionException {
// when client explicitly runs in non-cancelable block do not throw from within nested read actions
if (status.impatientReads && writeRequested && !ProgressManager.getInstance().isInNonCancelableSection() && CoreProgressManager.ENABLED) {
if (status.impatientReads && writeRequested && !ProgressManager.getInstance().isInNonCancelableSection()) {
throw ApplicationUtil.CannotRunReadActionException.create();
}
}

8
updater/testData/bin/idea.properties
View File

@@ -85,14 +85,6 @@ idea.fatal.error.notification=disabled
# Workaround for slow scrolling in JDK6
swing.bufferPerWindow=false
#-----------------------------------------------------------------------
# Uncomment this property to prevent IDEA from throwing ProcessCanceledException when user activity
# detected. This option is only useful for plugin developers, while debugging PSI related activities
# performed in background error analysis thread.
# DO NOT UNCOMMENT THIS UNLESS YOU'RE DEBUGGING IDEA ITSELF. Significant slowdowns and lockups will happen otherwise.
#-----------------------------------------------------------------------
#idea.ProcessCanceledException=disabled
#----------------------------------------------------------------------
# Removing this property may lead to editor performance degradation under X-Windows.
#----------------------------------------------------------------------