IJPL-255 replace Application.assertIsDispatchThread -> `ThreadingAs…

…sertions.assertEventDispatchThread` GitOrigin-RevId: da80a0648ffce76e93f35f72afc93334b21fe9a2
JetBrains · Sep 22, 2023 · c973850 · c973850
1 parent 5797a83
commit c973850
Show file tree

Hide file tree

Showing 246 changed files with 900 additions and 756 deletions.
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -49,6 +49,7 @@
 import com.intellij.util.Chunk;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.ThrowableRunnable;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.CollectionFactory;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.DateFormatUtil;
@@ -386,7 +387,7 @@ private void startup(final CompileScope scope,
                        final boolean withModalProgress,
                        final CompileStatusNotification callback,
                        final CompilerMessage message) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     ModalityState modalityState = ModalityState.current();
 
     final boolean isUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();

diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
@@ -42,6 +42,7 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiMethodUtil;
 import com.intellij.util.PathUtil;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -256,7 +257,7 @@ public static VirtualFile showDialogAndCreateManifest(final ArtifactEditorContex
 
   @Nullable
   public static VirtualFile createManifestFile(final @NotNull VirtualFile directory, final @NotNull Project project) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     try {
       return WriteAction.compute(() -> {
         VirtualFile dir = directory;

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextUtil.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextUtil.java
@@ -9,7 +9,6 @@
 import com.intellij.debugger.engine.events.DebuggerCommandImpl;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
 import com.intellij.debugger.ui.impl.watch.ThreadDescriptorImpl;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
@@ -19,6 +18,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XSourcePosition;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +27,7 @@
 
 public final class DebuggerContextUtil {
   public static void setStackFrame(final DebuggerStateManager manager, final StackFrameProxyImpl stackFrame) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     final DebuggerContextImpl context = manager.getContext();
 
     final DebuggerSession session = context.getDebuggerSession();
@@ -53,7 +53,7 @@ protected void action() {
   }
 
   public static void setThread(DebuggerStateManager contextManager, ThreadDescriptorImpl item) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     final DebuggerSession session = contextManager.getContext().getDebuggerSession();
     final DebuggerContextImpl newContext =

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -1,7 +1,10 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.debugger.impl;
 
-import com.intellij.debugger.*;
+import com.intellij.debugger.DebugEnvironment;
+import com.intellij.debugger.DebuggerManagerEx;
+import com.intellij.debugger.JavaDebuggerBundle;
+import com.intellij.debugger.NameMapper;
 import com.intellij.debugger.engine.*;
 import com.intellij.debugger.ui.breakpoints.BreakpointManager;
 import com.intellij.debugger.ui.tree.render.BatchEvaluator;
@@ -17,7 +20,6 @@
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.RunContentWithExecutorListener;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
@@ -33,6 +35,7 @@
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.psi.PsiClass;
 import com.intellij.util.EventDispatcher;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
@@ -143,7 +146,7 @@ public void globalSchemeChange(EditorColorsScheme scheme) {
   @Nullable
   @Override
   public DebuggerSession getSession(DebugProcess process) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     return ContainerUtil.find(getSessions(), debuggerSession -> process == debuggerSession.getProcess());
   }
 
@@ -360,7 +363,7 @@ public void setState(@NotNull final DebuggerContextImpl context,
                          DebuggerSession.State state,
                          DebuggerSession.Event event,
                          String description) {
-      ApplicationManager.getApplication().assertIsDispatchThread();
+      ThreadingAssertions.assertEventDispatchThread();
       myDebuggerSession = context.getDebuggerSession();
       if (myDebuggerSession != null) {
         myDebuggerSession.getContextManager().setState(context, state, event, description);

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
@@ -41,6 +41,7 @@
 import com.intellij.unscramble.ThreadState;
 import com.intellij.util.Alarm;
 import com.intellij.util.TimeoutUtil;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xdebugger.AbstractDebuggerSession;
@@ -158,7 +159,7 @@ public void setState(@NotNull final DebuggerContextImpl context,
                          final State state,
                          final Event event,
                          final @NlsContexts.Label String description) {
-      ApplicationManager.getApplication().assertIsDispatchThread();
+      ThreadingAssertions.assertEventDispatchThread();
       final DebuggerSession session = context.getDebuggerSession();
       LOG.assertTrue(session == DebuggerSession.this || session == null);
       final Runnable setStateRunnable = () -> {
@@ -418,7 +419,7 @@ public boolean isRunning() {
   }
 
   private SuspendContextImpl getSuspendContext() {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     return getContextManager().getContext().getSuspendContext();
   }
 

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -32,6 +32,7 @@
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.PsiField;
 import com.intellij.util.concurrency.AppExecutorUtil;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.xdebugger.XDebuggerManager;
@@ -191,7 +192,7 @@ public StepIntoBreakpoint addStepIntoBreakpoint(@NotNull BreakpointStepMethodFil
 
   @Nullable
   public LineBreakpoint<?> addLineBreakpoint(Document document, int lineIndex, Consumer<JavaLineBreakpointProperties> setupAction) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     if (!LineBreakpoint.canAddLineBreakpoint(myProject, document, lineIndex)) {
       return null;
     }
@@ -228,7 +229,7 @@ public FieldBreakpoint addFieldBreakpoint(@NotNull Document document, int offset
 
   @Nullable
   public FieldBreakpoint addFieldBreakpoint(Document document, int lineIndex, String fieldName) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     XLineBreakpoint xBreakpoint = addXLineBreakpoint(JavaFieldBreakpointType.class, document, lineIndex);
     Breakpoint javaBreakpoint = getJavaBreakpoint(xBreakpoint);
     if (javaBreakpoint instanceof FieldBreakpoint fieldBreakpoint) {
@@ -241,7 +242,7 @@ public FieldBreakpoint addFieldBreakpoint(Document document, int lineIndex, Stri
 
   @Nullable
   public ExceptionBreakpoint addExceptionBreakpoint(@NotNull final String exceptionClassName, final String packageName) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     final JavaExceptionBreakpointType type = XDebuggerUtil.getInstance().findBreakpointType(JavaExceptionBreakpointType.class);
     return WriteAction.compute(() -> {
       XBreakpoint<JavaExceptionBreakpointProperties> xBreakpoint = XDebuggerManager.getInstance(myProject).getBreakpointManager()
@@ -259,7 +260,7 @@ public ExceptionBreakpoint addExceptionBreakpoint(@NotNull final String exceptio
 
   @Nullable
   public MethodBreakpoint addMethodBreakpoint(Document document, int lineIndex) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     XLineBreakpoint xBreakpoint = addXLineBreakpoint(JavaMethodBreakpointType.class, document, lineIndex);
     if (getJavaBreakpoint(xBreakpoint) instanceof MethodBreakpoint methodBreakpoint) {

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
@@ -26,13 +26,13 @@
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.actionSystem.DataProvider;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.NlsContexts;
 import com.intellij.ui.SpeedSearchComparator;
 import com.intellij.ui.TreeSpeedSearch;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.ui.tree.TreeUtil;
 import com.sun.jdi.ThreadReference;
 import org.jetbrains.annotations.NotNull;
@@ -282,7 +282,7 @@ public final void treeChanged() {
   protected abstract void build(DebuggerContextImpl context);
 
   public void rebuild(final DebuggerContextImpl context) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     final DebugProcessImpl process = context.getDebugProcess();
     if (process == null) {
       return; // empty context, no process available yet

diff --git a/java/idea-ui/src/com/intellij/jarFinder/AbstractAttachSourceProvider.java b/java/idea-ui/src/com/intellij/jarFinder/AbstractAttachSourceProvider.java
@@ -19,6 +19,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.io.HttpRequests;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -92,7 +93,7 @@ public String getBusyText() {
 
     @Override
     public @NotNull ActionCallback perform(@NotNull List<? extends LibraryOrderEntry> orderEntriesContainingFile) {
-      ApplicationManager.getApplication().assertIsDispatchThread();
+      ThreadingAssertions.assertEventDispatchThread();
 
       ActionCallback callback = new ActionCallback();
       callback.setDone();

diff --git a/.../com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/.../com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
@@ -17,7 +17,6 @@
 import com.intellij.ide.util.projectWizard.NamePathComponent;
 import com.intellij.ide.util.projectWizard.ProjectWizardUtil;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.extensions.BaseExtensionPointName;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.*;
@@ -48,6 +47,7 @@
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.ui.navigation.Place;
 import com.intellij.util.PlatformIcons;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
@@ -194,7 +194,7 @@ protected Collection<? extends ProjectStructureElement> getProjectStructureEleme
   @Override
   protected void updateSelection(@Nullable NamedConfigurable configurable) {
     myProjectStructureConfigurable.getFacetStructureConfigurable().disposeMultipleSettingsEditor();
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     super.updateSelection(configurable);
     if (configurable != null) {
       updateModuleEditorSelection(configurable);

diff --git a/...src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryResolveErrorNotification.java b/...src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryResolveErrorNotification.java
@@ -7,9 +7,9 @@
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
 import com.intellij.notification.NotificationsManager;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,7 +29,7 @@ class RepositoryLibraryResolveErrorNotification extends Notification {
   }
 
   void addLibraryResolveError(@NotNull RepositoryLibraryProperties lib) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     myErrors.add(lib.getMavenId());
     String message;
@@ -50,7 +50,7 @@ void addLibraryResolveError(@NotNull RepositoryLibraryProperties lib) {
   }
 
   static synchronized void showOrUpdate(@NotNull RepositoryLibraryProperties libWithError, @NotNull Project project) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     RepositoryLibraryResolveErrorNotification[] notifications =
       NotificationsManager.getNotificationsManager().getNotificationsOfType(RepositoryLibraryResolveErrorNotification.class, project);
     RepositoryLibraryResolveErrorNotification notification = notifications.length > 0 ? notifications[0] : null;

diff --git a/...l-refactorings/src/com/intellij/refactoring/extractMethod/preview/PreviewDiffRequest.java b/...l-refactorings/src/com/intellij/refactoring/extractMethod/preview/PreviewDiffRequest.java
@@ -8,7 +8,6 @@
 import com.intellij.diff.tools.simple.SimpleDiffViewer;
 import com.intellij.diff.tools.util.base.DiffViewerBase;
 import com.intellij.diff.tools.util.base.DiffViewerListener;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.CaretModel;
 import com.intellij.openapi.editor.ScrollType;
@@ -17,6 +16,7 @@
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.util.Couple;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -41,7 +41,7 @@ class PreviewDiffRequest extends SimpleDiffRequest {
   }
 
   public void setViewer(FrameDiffTool.DiffViewer viewer) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     if (viewer instanceof UnifiedDiffViewer) {
       myCaretTracker = new UnifiedCaretTracker((UnifiedDiffViewer)viewer);
@@ -55,7 +55,7 @@ else if (viewer instanceof SimpleDiffViewer) {
   }
 
   public void onNodeSelected(@NotNull FragmentNode node) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     Couple<TextRange> bounds = myLinesBounds.get(node);
     if (bounds != null && myCaretTracker != null) {
@@ -64,7 +64,7 @@ public void onNodeSelected(@NotNull FragmentNode node) {
   }
 
   public void onInitialized() {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
 
     myInitialized = true;
   }

diff --git a/...va-impl-refactorings/src/com/intellij/refactoring/extractMethod/preview/PreviewPanel.java b/...va-impl-refactorings/src/com/intellij/refactoring/extractMethod/preview/PreviewPanel.java
@@ -21,6 +21,7 @@
 import com.intellij.ui.scale.JBUIScale;
 import com.intellij.usages.impl.UsageModelTracker;
 import com.intellij.util.Alarm;
+import com.intellij.util.concurrency.ThreadingAssertions;
 import com.intellij.util.ui.DialogUtil;
 import com.intellij.util.ui.components.BorderLayoutPanel;
 import one.util.streamex.StreamEx;
@@ -153,7 +154,7 @@ private void updateLater() {
   }
 
   private void updateImmediately() {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    ThreadingAssertions.assertEventDispatchThread();
     if (myProject.isDisposed()) return;
 
     boolean isModified = myDiffPanel.isModified();