[rename] collect names under progress

KTIJ-28795 GitOrigin-RevId: 2bc2d470729e1e29db99b9f674ac180a7c25c6cd
2026-09-27 10:03:11 +07:00 · 2025-02-21 22:25:36 +00:00
parent fd8c551c89
commit cd8cd59b3c
1 changed files with 6 additions and 3 deletions
@@ -180,10 +180,13 @@ public class RenameDialog extends RefactoringDialog implements RenameRefactoring
    if (initialName != null) {
      result.add(initialName);
    }
-    result.addAll(myPredefinedSuggestedNames);
-    result.add(UsageViewUtil.getShortName(myPsiElement));
    mySuggestedNameInfo = ActionUtil.underModalProgress(myProject, RefactoringBundle.message("progress.title.collecting.suggested.names"),
-                                                        () -> NameSuggestionProvider.suggestNames(myPsiElement, myNameSuggestionContext, result));
+                                                        () -> {
+                                                          result.addAll(myPredefinedSuggestedNames);
+                                                          result.add(UsageViewUtil.getShortName(myPsiElement));
+                                                          return NameSuggestionProvider.suggestNames(myPsiElement, myNameSuggestionContext,
+                                                                                                     result);
+                                                        });
    return ArrayUtilRt.toStringArray(result);
  }