MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PsiFormatUtil: don't show type annotations by default

Browse Source
This commit is contained in:
peter
2015-08-25 09:43:57 +02:00
parent 0a00b1d1fb
commit a49766c843
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java
+5 -3
View File
@@ -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) {
java/java-psi-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java
+1 -1
View File
@@ -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();
platform/core-api/src/com/intellij/psi/util/PsiFormatUtilBase.java
+1
View File
@@ -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) {