From 7281c9f0fc8e1439ae342eb1fb245ed098709be0 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 19 Apr 2021 16:45:22 +0200 Subject: [PATCH] call indicator.setIndeterminate() in various strategic places to avoid "this indicator is indeterminate" assertion GitOrigin-RevId: c7f4418c4b8f608ef1bf22785101f258080847ba --- .../src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java | 2 +- .../com/intellij/refactoring/inline/GenericInlineHandler.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 25051e283a76..5a25bef903cb 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -291,7 +291,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { progress.pushState(); try { progress.setText(IndexingBundle.message("psi.scanning.files.progress")); - + progress.setIndeterminate(false); Processor localProcessor = localProcessor(searcher, processor); diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java index 5c54e60f5e18..bbed89458852 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java @@ -93,6 +93,7 @@ public final class GenericInlineHandler { } Consumer perform = indicator -> { + indicator.setIndeterminate(false); for (int i = 0; i < usages.length; i++) { indicator.setFraction((double) i / usages.length); inlineReference(usages[i], element, inliners); @@ -106,7 +107,8 @@ public final class GenericInlineHandler { if (Registry.is("run.refactorings.under.progress")) { ((ApplicationImpl)ApplicationManager.getApplication()) .runWriteActionWithNonCancellableProgressInDispatchThread(commandName, project, null, perform); - } else { + } + else { perform.accept(new EmptyProgressIndicator()); } });