From 71f0e6f390ece64dd3aa031e4bf2434aea80f35f Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 16 Jun 2016 20:23:29 +0300
Subject: [PATCH] EA-84110 - INRE: FileBasedIndexImpl.handleDumbMode

---
 .../java/JavaBreadcrumbsInfoProvider.java     | 64 ++++++++++++++-----
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/java/java-impl/src/com/intellij/lang/java/JavaBreadcrumbsInfoProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaBreadcrumbsInfoProvider.java
index 473febe17aaf..551d6ce3efc9 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaBreadcrumbsInfoProvider.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaBreadcrumbsInfoProvider.java
@@ -25,6 +25,9 @@ import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static com.intellij.openapi.util.text.StringUtil.htmlEmphasize;
+import static com.intellij.psi.PsiNameHelper.getShortClassName;
+
 /**
  * @author gregsh
  */
@@ -45,38 +48,69 @@ public class JavaBreadcrumbsInfoProvider extends BreadcrumbsInfoProvider {
   public String getElementInfo(@NotNull PsiElement e) {
     if (e instanceof PsiLambdaExpression) {
       PsiType type = DumbService.isDumb(e.getProject()) ? null : ((PsiFunctionalExpression)e).getFunctionalInterfaceType();
-      return type == null ? "<lambda>" : "lambda " + PsiNameHelper.getShortClassName(type.getCanonicalText());
+      return type == null ? "<lambda>" : "lambda " + getShortClassName(type.getCanonicalText());
     }
-    return ElementDescriptionUtil.getElementDescription(e, UsageViewShortNameLocation.INSTANCE);
+    String description = ElementDescriptionUtil.getElementDescription(e, UsageViewShortNameLocation.INSTANCE);
+    String suffix = e instanceof PsiParameterListOwner? "()" :
+                    //e instanceof PsiAnonymousClass || e instanceof PsiClassInitializer ? " {}" :
+                    null;
+    return suffix != null ? description + suffix : description;
   }
 
   @Nullable
   @Override
   public String getElementTooltip(@NotNull PsiElement e) {
     if (e instanceof PsiLambdaExpression) return getLambdaDescription((PsiLambdaExpression)e);
+    if (e instanceof PsiMethod) return getMethodPresentableText((PsiMethod)e);
     return ElementDescriptionUtil.getElementDescription(e, RefactoringDescriptionLocation.WITH_PARENT);
   }
 
+  @NotNull
+  private static String getMethodPresentableText(PsiMethod e) {
+    boolean isDumb = DumbService.isDumb(e.getProject());
+    StringBuilder sb = new StringBuilder(e.isConstructor() ? "constructor" : "method");
+    PsiType type = e.getReturnType();
+    if (type != null) {
+      String shortClassName = getShortClassName(type.getCanonicalText(false));
+      sb.append(" ").append(htmlEmphasize(shortClassName));
+    }
+    sb.append(" ").append(htmlEmphasize(e.getName()));
+    appendParameters(e, sb, false, isDumb);
+    return sb.toString();
+  }
+
   @NotNull
   private static String getLambdaDescription(@NotNull PsiLambdaExpression e) {
     boolean isDumb = DumbService.isDumb(e.getProject());
     StringBuilder sb = new StringBuilder("lambda");
     PsiType functionalInterfaceType = isDumb ? null : e.getFunctionalInterfaceType();
     if (functionalInterfaceType != null) {
-      String shortClassName = PsiNameHelper.getShortClassName(functionalInterfaceType.getCanonicalText());
-      sb.append(" ").append(StringUtil.htmlEmphasize(shortClassName));
-    }
-    PsiParameter[] parameters = e.getParameterList().getParameters();
-    if (parameters.length > 0) {
-      sb.append(" (");
-      for (int i = 0; i < parameters.length; i++) {
-        if (i > 0) sb.append(", ");
-        String str = isDumb ? null : PsiNameHelper.getShortClassName(parameters[i].getType().getCanonicalText());
-        if (StringUtil.isEmpty(str)) str = StringUtil.notNullize(parameters[i].getName());
-        sb.append(StringUtil.htmlEmphasize(str));
-      }
-      sb.append(")");
+      String shortClassName = getShortClassName(functionalInterfaceType.getCanonicalText(false));
+      sb.append(" ").append(htmlEmphasize(shortClassName));
     }
+    appendParameters(e, sb, true, isDumb);
     return sb.toString();
   }
+
+  private static void appendParameters(@NotNull PsiParameterListOwner e, StringBuilder sb, boolean skipIfEmpty, boolean isDumb) {
+    PsiParameter[] parameters = e.getParameterList().getParameters();
+    if (parameters.length == 0 && skipIfEmpty) return;
+    if (skipIfEmpty) sb.append(" ");
+    sb.append("(");
+    for (int i = 0; i < parameters.length; i++) {
+      if (i > 0) sb.append(", ");
+      String typeStr;
+      if (isDumb) {
+        PsiTypeElement typeElement = parameters[i].getTypeElement();
+        typeStr = typeElement == null ? "" : typeElement.getText();
+      }
+      else {
+        typeStr = parameters[i].getType().getCanonicalText(false);
+      }
+      String str = getShortClassName(typeStr);
+      if (StringUtil.isEmpty(str)) str = StringUtil.notNullize(parameters[i].getName());
+      sb.append(htmlEmphasize(str));
+    }
+    sb.append(")");
+  }
 }