From 866d41a86bb3cfbf7a5ca6408daa3db816e0eacc Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 2 Oct 2014 15:57:50 +0200
Subject: [PATCH] more SSR search result tweaks

---
 .../plugin/ui/UsageViewContext.java           | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java
index 1f592e6cf534..8f617e51bbf1 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UsageViewContext.java
@@ -59,13 +59,15 @@ public class UsageViewContext {
 
   public void configure(@NotNull UsageViewPresentation presentation) {
     final String pattern = myConfiguration.getMatchOptions().getSearchPattern();
-    presentation.setScopeText(myConfiguration.getMatchOptions().getScope().getDisplayName());
+    final String scopeText = myConfiguration.getMatchOptions().getScope().getDisplayName();
+    presentation.setScopeText(scopeText);
     final String usagesString = SSRBundle.message("occurrences.of", pattern);
     presentation.setUsagesString(usagesString);
     presentation.setTabText(StringUtil.shortenTextWithEllipsis(usagesString, 60, 0, false));
     presentation.setUsagesWord(SSRBundle.message("occurrence"));
-    presentation.setCodeUsagesString(SSRBundle.message("found.occurrences"));
+    presentation.setCodeUsagesString(SSRBundle.message("found.occurrences", scopeText));
     presentation.setTargetsNodeText(SSRBundle.message("targets.node.text"));
+    presentation.setCodeUsages(false);
   }
 
   protected void configureActions() {}
@@ -75,17 +77,7 @@ public class UsageViewContext {
     @NotNull
     @Override
     public String getPresentableText() {
-      final MatchOptions matchOptions = myConfiguration.getMatchOptions();
-      final String pattern = matchOptions.getSearchPattern();
-      final String scope = matchOptions.getScope().getDisplayName();
-      if (myConfiguration instanceof ReplaceConfiguration) {
-        final ReplaceConfiguration replaceConfiguration = (ReplaceConfiguration)myConfiguration;
-        final String replacement = replaceConfiguration.getOptions().getReplacement();
-        return SSRBundle.message("replace.occurrences.of.0.with.1.in.2", pattern, replacement, scope);
-      }
-      else {
-        return SSRBundle.message("occurrences.of.0.in.1", pattern, scope);
-      }
+      return myConfiguration.getMatchOptions().getSearchPattern();
     }
 
     @Override
@@ -174,7 +166,19 @@ public class UsageViewContext {
     @NotNull
     @Override
     public String getLongDescriptiveName() {
-      return StringUtil.shortenTextWithEllipsis(getPresentableText(), 150, 0, true);
+      final MatchOptions matchOptions = myConfiguration.getMatchOptions();
+      final String pattern = matchOptions.getSearchPattern();
+      final String scope = matchOptions.getScope().getDisplayName();
+      final String result;
+      if (myConfiguration instanceof ReplaceConfiguration) {
+        final ReplaceConfiguration replaceConfiguration = (ReplaceConfiguration)myConfiguration;
+        final String replacement = replaceConfiguration.getOptions().getReplacement();
+        result = SSRBundle.message("replace.occurrences.of.0.with.1.in.2", pattern, replacement, scope);
+      }
+      else {
+        result = SSRBundle.message("occurrences.of.0.in.1", pattern, scope);
+      }
+      return StringUtil.shortenTextWithEllipsis(result, 150, 0, true);
     }
   }
 }