From b53292e65006ebead42dd77210b6a470133ff39a Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 16 Jul 2015 19:29:37 +0300 Subject: [PATCH] IDEA-142615 Configure link in Git "Push Commits" dialog does not jump to Force Push configuration Update filter *after* showing the specified configurable to filter out it correctly --- .../openapi/options/newEditor/SettingsEditor.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java index cc848824d968..075cc56bdcc1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java @@ -63,7 +63,7 @@ final class SettingsEditor extends AbstractEditor implements DataProvider { private final SpotlightPainter mySpotlightPainter; private final Banner myBanner; - SettingsEditor(Disposable parent, Project project, ConfigurableGroup[] groups, Configurable configurable, String filter) { + SettingsEditor(Disposable parent, Project project, ConfigurableGroup[] groups, Configurable configurable, final String filter) { super(parent); myProperties = PropertiesComponent.getInstance(project); @@ -248,8 +248,12 @@ final class SettingsEditor extends AbstractEditor implements DataProvider { configurable = ConfigurableVisitor.ALL.find(groups); } } - myFilter.update(filter, false, true); - myTreeView.select(configurable); + myTreeView.select(configurable).doWhenDone(new Runnable() { + @Override + public void run() { + myFilter.update(filter, false, true); + } + }); Disposer.register(this, myTreeView); installSpotlightRemover(); }