From 85f1eb9790d9258aef29bac14430b17fe985e8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Delma=CC=80s?= Date: Sat, 16 Dec 2017 01:27:30 +0000 Subject: [PATCH] =?UTF-8?q?status=20message=20for=20=E2=80=9Esearch=20all?= =?UTF-8?q?=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/de/dreamlab/dash/SearchService.java | 32 +++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/de/dreamlab/dash/SearchService.java b/src/de/dreamlab/dash/SearchService.java index ec4e201..407804d 100644 --- a/src/de/dreamlab/dash/SearchService.java +++ b/src/de/dreamlab/dash/SearchService.java @@ -87,6 +87,7 @@ public void search(@Nonnull Editor editor, @Nullable Project project, @Nullable } // open dash + showStatusMessage(project, null, null); launcher.search(new ArrayList<>(), query); } @@ -106,32 +107,37 @@ public void smartSearch(@Nonnull Editor editor, @Nullable Project project, @Null return; } + // open dash + showStatusMessage(project, resolvedLanguage, language); + launcher.search(keywordLookup.findKeywords(new LookupInfoDictionary(language, psiElement, project, psiFile, virtualFile)), query); + + /* + use the following command to display information about the sdk in use in the event log. intended for development purposes. + showSdkDebug(AbstractSdkKeyword.findSdk(psiElement, project, psiFile, virtualFile)); + */ + } + + private void showStatusMessage(final @Nullable Project project, final @Nullable String resolvedLanguage, final @Nullable Language language) + { + if ( project == null ) { + return; + } // show status message for potential troubleshooting final StringBuilder messageBuilder = new StringBuilder(); if ( resolvedLanguage == null ) { - messageBuilder.append("Searching all docsets in Dash"); + messageBuilder.append("Searching all documentation"); } else { - messageBuilder.append(String.format("Searching \"%s\" docsets in Dash", resolvedLanguage)); + messageBuilder.append(String.format("Smart-Searching \"%s\" documentation", resolvedLanguage)); } if ( language != null && !language.getID().equals(resolvedLanguage) ) { messageBuilder.append(String.format(". Based on \"%s\" context.", language.getID())); } - if ( project != null ) { - StatusBarUtil.setStatusBarInfo(project, messageBuilder.toString()); - } - - // open dash - launcher.search(keywordLookup.findKeywords(new LookupInfoDictionary(language, psiElement, project, psiFile, virtualFile)), query); - - /* - use the following command to display information about the sdk in use in the event log. intended for development purposes. - showSdkDebug(AbstractSdkKeyword.findSdk(psiElement, project, psiFile, virtualFile)); - */ + StatusBarUtil.setStatusBarInfo(project, messageBuilder.toString()); } private void showSdkDebug(@Nullable Sdk sdk)