From f5956ec1e2bbde04425137170f2ec703f9e37258 Mon Sep 17 00:00:00 2001 From: Vera Petrenkova Date: Wed, 4 Jun 2025 18:04:40 +0200 Subject: [PATCH] [find in files] IJPL-186012 keep the validation order and show "validation in progress" as the last state GitOrigin-RevId: c0dd8cdeda691da885bc22e084b2f7dec94667e8 --- .../intellij/find/impl/FindPopupDirectoryChooser.java | 3 --- .../src/com/intellij/find/impl/FindPopupPanel.java | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java index a23ab4594926..e5091d09c792 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupDirectoryChooser.java @@ -159,9 +159,6 @@ public final class FindPopupDirectoryChooser extends JPanel { } public @Nullable ValidationInfo validate(@NotNull FindModel model) { - if (FindKey.isEnabled() && !myFindPopupPanel.isBackendValidationFinished()) { - return new ValidationInfo(FindBundle.message("find.directory.validation.in.progress")).asWarning(); - } if (FindKey.isEnabled()) return null; VirtualFile directory = FindInProjectUtil.getDirectory(model); return getDirectoryValidationInfo(directory != null); diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 51ef0a8f8e22..47ef0ae2a3ac 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -1498,6 +1498,10 @@ public final class FindPopupPanel extends JBPanel implements Fin } private @Nullable("null means OK") ValidationInfo getValidationInfo(@NotNull FindModel model) { + ValidationInfo scopeValidationInfo = myScopeUI.validate(model, mySelectedScope); + if (scopeValidationInfo != null) { + return scopeValidationInfo; + } if (!myHelper.canSearchThisString()) { return new ValidationInfo(FindBundle.message("find.empty.search.text.error"), mySearchComponent); } @@ -1555,9 +1559,8 @@ public final class FindPopupPanel extends JBPanel implements Fin return new ValidationInfo(FindBundle.message("find.filter.invalid.file.mask.error", mask), header.fileMaskField); } } - ValidationInfo scopeValidationInfo = myScopeUI.validate(model, mySelectedScope); - if (scopeValidationInfo != null) { - return scopeValidationInfo; + if (FindKey.isEnabled() && !isBackendValidationFinished()) { + return new ValidationInfo(FindBundle.message("find.directory.validation.in.progress")).asWarning(); } return null; }