From a49766c8432da36989a67f2fd9d817d72fe6c4c8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 25 Aug 2015 09:41:14 +0200
Subject: [PATCH] PsiFormatUtil: don't show type annotations by default

---
 .../src/com/intellij/psi/util/PsiFormatUtil.java          | 8 +++++---
 .../daemon/impl/analysis/HighlightMessageUtil.java        | 2 +-
 .../src/com/intellij/psi/util/PsiFormatUtilBase.java      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java
index 3cb6ea25561b..feccd0171c95 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java
@@ -25,12 +25,12 @@ import org.jetbrains.annotations.Nullable;
 public class PsiFormatUtil extends PsiFormatUtilBase {
   @MagicConstant(flags = {
     SHOW_MODIFIERS, SHOW_TYPE, TYPE_AFTER, SHOW_CONTAINING_CLASS, SHOW_FQ_NAME, SHOW_NAME, SHOW_MODIFIERS,
-    SHOW_INITIALIZER, SHOW_RAW_TYPE, SHOW_RAW_NON_TOP_TYPE, SHOW_FQ_CLASS_NAMES})
+    SHOW_INITIALIZER, SHOW_RAW_TYPE, SHOW_RAW_NON_TOP_TYPE, SHOW_FQ_CLASS_NAMES, USE_INTERNAL_CANONICAL_TEXT})
   public @interface FormatVariableOptions { }
 
   @MagicConstant(flags = {
     SHOW_MODIFIERS, MODIFIERS_AFTER, SHOW_TYPE, TYPE_AFTER, SHOW_CONTAINING_CLASS, SHOW_FQ_NAME, SHOW_NAME,
-    SHOW_PARAMETERS, SHOW_THROWS, SHOW_RAW_TYPE, SHOW_RAW_NON_TOP_TYPE, SHOW_FQ_CLASS_NAMES})
+    SHOW_PARAMETERS, SHOW_THROWS, SHOW_RAW_TYPE, SHOW_RAW_NON_TOP_TYPE, SHOW_FQ_CLASS_NAMES, USE_INTERNAL_CANONICAL_TEXT})
   public @interface FormatMethodOptions { }
 
   @MagicConstant(flags = {
@@ -388,7 +388,9 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
       }
     }
     if (type == null) return "null";
-    return (options & SHOW_FQ_CLASS_NAMES) == 0 ? type.getPresentableText() : type.getInternalCanonicalText();
+    return (options & SHOW_FQ_CLASS_NAMES) == 0 ? type.getPresentableText() :
+           (options & USE_INTERNAL_CANONICAL_TEXT) == 0 ? type.getCanonicalText(false) :
+           type.getInternalCanonicalText();
   }
 
   public static String formatReference(PsiJavaCodeReferenceElement ref, int options) {
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java
index e15ab355db2f..cb1d26b946b3 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java
@@ -43,7 +43,7 @@ public class HighlightMessageUtil {
     else if (symbol instanceof PsiMethod) {
       symbolName = PsiFormatUtil.formatMethod((PsiMethod)symbol,
                                               substitutor, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS,
-                                              PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.SHOW_FQ_CLASS_NAMES);
+                                              PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.SHOW_FQ_CLASS_NAMES | PsiFormatUtilBase.USE_INTERNAL_CANONICAL_TEXT);
     }
     else if (symbol instanceof PsiVariable) {
       symbolName = ((PsiVariable)symbol).getName();
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java b/platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java
index cf308a904881..24b820cd84c0 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java
@@ -38,6 +38,7 @@ public abstract class PsiFormatUtilBase {
   public static final int SHOW_ANONYMOUS_CLASS_VERBOSE = 0x8000; // class
   public static final int SHOW_RAW_TYPE = 0x10000; //type
   public static final int SHOW_RAW_NON_TOP_TYPE = 0x20000;
+  public static final int USE_INTERNAL_CANONICAL_TEXT = 0x40000; // variable/method/parameter types
   public static final int MAX_PARAMS_TO_SHOW = 7;
 
   protected static void appendSpaceIfNeeded(StringBuilder buffer) {