From 8bbee943c276b2d9ede00dcfde4b35065bf0d978 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Thu, 21 Feb 2019 14:50:36 +0300 Subject: [PATCH] don't use DumbAwareRunnable in 'invokeLater' calls - it doesn't make any difference --- .../intellij/jarRepository/RepositoryLibrarySynchronizer.java | 3 +-- .../openapi/editor/ex/util/LexerEditorHighlighter.java | 3 +-- .../intellij/codeInsight/daemon/impl/PassExecutorService.java | 3 +-- .../codeInsight/highlighting/BraceHighlightingHandler.java | 3 +-- .../src/com/intellij/util/ui/update/UiNotifyConnector.java | 3 +-- .../com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java | 4 ++-- .../intellij/openapi/wm/impl/welcomeScreen/WelcomeFrame.java | 3 +-- .../src/com/intellij/platform/PlatformVcsDetector.java | 2 +- 8 files changed, 9 insertions(+), 15 deletions(-) diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java index 2f99274968e9..7b5de7df0543 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java +++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java @@ -25,7 +25,6 @@ import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; @@ -156,7 +155,7 @@ public class RepositoryLibrarySynchronizer implements StartupActivity, DumbAware return false; }); - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { + ApplicationManager.getApplication().invokeLater(() -> { for (Library library : toSync) { if (LibraryTableImplUtil.isValidLibrary(library)) { RepositoryUtils.reloadDependencies(project, (LibraryEx)library); diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java index 4dd79138ef7f..66d858953a39 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java @@ -22,7 +22,6 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.progress.ProcessCanceledException; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; @@ -381,7 +380,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc } if(myEditor != null && !ApplicationManager.getApplication().isHeadlessEnvironment()) { - UIUtil.invokeLaterIfNeeded((DumbAwareRunnable)() -> myEditor.repaint(0, textLength)); + UIUtil.invokeLaterIfNeeded(() -> myEditor.repaint(0, textLength)); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index c7b517576ea4..df829fb2d998 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -26,7 +26,6 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; @@ -485,7 +484,7 @@ class PassExecutorService implements Disposable { @NotNull final DaemonProgressIndicator updateProgress, @NotNull final AtomicInteger threadsToStartCountdown, @NotNull Runnable callbackOnApplied) { - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { + ApplicationManager.getApplication().invokeLater(() -> { if (isDisposed() || myProject.isDisposed() || !fileEditor.isValid()) { updateProgress.cancel(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java index 6aa58e4aa17d..11594610cdb9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java @@ -31,7 +31,6 @@ import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; import com.intellij.openapi.progress.util.ProgressIndicatorUtils; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Conditions; import com.intellij.openapi.util.Key; @@ -109,7 +108,7 @@ public class BraceHighlightingHandler { PsiFile injected = psiFile instanceof PsiBinaryFile || !isValidFile(psiFile) ? null : getInjectedFileIfAny(editor, project, offset, psiFile, alarm); - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { + ApplicationManager.getApplication().invokeLater(() -> { try { if (isValidEditor(editor) && isValidFile(injected)) { EditorEx newEditor = (EditorEx)InjectedLanguageUtil.getInjectedEditorForInjectedFile(editor, injected); diff --git a/platform/platform-api/src/com/intellij/util/ui/update/UiNotifyConnector.java b/platform/platform-api/src/com/intellij/util/ui/update/UiNotifyConnector.java index d1fe06532d50..91aaafb5ca9d 100644 --- a/platform/platform-api/src/com/intellij/util/ui/update/UiNotifyConnector.java +++ b/platform/platform-api/src/com/intellij/util/ui/update/UiNotifyConnector.java @@ -19,7 +19,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; @@ -52,7 +51,7 @@ public class UiNotifyConnector implements Disposable, HierarchyListener{ if (isDisposed()) return; if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) > 0) { - final Runnable runnable = (DumbAwareRunnable)() -> { + final Runnable runnable = () -> { final Component c = myComponent.get(); if (isDisposed() || c == null) return; diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java index 03a24d4b5add..7647a0347eef 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java @@ -180,7 +180,7 @@ public class FileStatusManagerImpl extends FileStatusManager implements ProjectC return; } if (!ApplicationManager.getApplication().isDispatchThread()) { - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> fileStatusesChanged(), ModalityState.any()); + ApplicationManager.getApplication().invokeLater(() -> fileStatusesChanged(), ModalityState.any()); return; } @@ -212,7 +212,7 @@ public class FileStatusManagerImpl extends FileStatusManager implements ProjectC public void fileStatusChanged(final VirtualFile file) { final Application application = ApplicationManager.getApplication(); if (!application.isDispatchThread() && !application.isUnitTestMode()) { - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> fileStatusChanged(file)); + ApplicationManager.getApplication().invokeLater(() -> fileStatusChanged(file)); return; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeFrame.java index 0adefc768ad2..625b55868548 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeFrame.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeFrame.java @@ -13,7 +13,6 @@ import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerListener; @@ -169,7 +168,7 @@ public class WelcomeFrame extends JFrame implements IdeFrame, AccessibleContextA return; } - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { + ApplicationManager.getApplication().invokeLater(() -> { WindowManagerImpl windowManager = (WindowManagerImpl)WindowManager.getInstance(); windowManager.disposeRootFrame(); IdeFrameImpl[] frames = windowManager.getAllProjectFrames(); diff --git a/platform/vcs-impl/src/com/intellij/platform/PlatformVcsDetector.java b/platform/vcs-impl/src/com/intellij/platform/PlatformVcsDetector.java index 95081d5764eb..d5da87341e7f 100644 --- a/platform/vcs-impl/src/com/intellij/platform/PlatformVcsDetector.java +++ b/platform/vcs-impl/src/com/intellij/platform/PlatformVcsDetector.java @@ -26,7 +26,7 @@ public class PlatformVcsDetector implements ProjectComponent { @Override public void projectOpened() { StartupManager.getInstance(myProject).runWhenProjectIsInitialized((DumbAwareRunnable)() -> { - final DumbAwareRunnable runnable = () -> { + final Runnable runnable = () -> { VirtualFile file = ProjectBaseDirectory.getInstance(myProject).getBaseDir(myProject.getBaseDir()); if (myVcsManager.needAutodetectMappings()) { AbstractVcs vcs = myVcsManager.findVersioningVcs(file);