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

towards compound ids

Browse Source
This commit is contained in:
Ilya Klyuchnikov
2014-07-10 10:35:35 +02:00
committed by peter
parent bacb5f5e28
commit c8e0bef1dc
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisHandler.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class BytecodeAnalysisHandler extends AbstractProjectComponent {
@Nullable
protected static String getExternalName(@NotNull PsiModifierListOwner listOwner) {
String rawExternalName = PsiFormatUtil.getRawExternalName(listOwner, false, Integer.MAX_VALUE);
String rawExternalName = PsiFormatUtil.getRawExternalName(listOwner);
if (rawExternalName != null) {
rawExternalName = rawExternalName.replace("...)", "[])");
}
java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java
+6 -19
View File
@@ -451,12 +451,8 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
}
@Nullable
public static String getRawExternalName(PsiModifierListOwner owner, final boolean showParamName, int maxParamsToShow) {
public static String getRawExternalName(PsiModifierListOwner owner) {
final StringBuilder builder = new StringBuilder();
if (owner instanceof PsiClass) {
ClassUtil.formatClassName((PsiClass)owner, builder);
return builder.toString();
}
final PsiClass psiClass = PsiTreeUtil.getParentOfType(owner, PsiClass.class, false);
if (psiClass == null) return null;
ClassUtil.formatClassName(psiClass, builder);
@@ -464,11 +460,8 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
builder.append(" ");
formatMethod((PsiMethod)owner, PsiSubstitutor.EMPTY,
SHOW_NAME | SHOW_FQ_NAME | SHOW_TYPE | SHOW_RAW_TYPE | SHOW_PARAMETERS | SHOW_FQ_CLASS_NAMES,
showParamName ? SHOW_NAME | SHOW_TYPE | SHOW_RAW_TYPE| SHOW_FQ_CLASS_NAMES : SHOW_TYPE | SHOW_RAW_TYPE | SHOW_FQ_CLASS_NAMES,
maxParamsToShow, builder);
}
else if (owner instanceof PsiField) {
builder.append(" ").append(((PsiField)owner).getName());
SHOW_TYPE | SHOW_RAW_TYPE | SHOW_FQ_CLASS_NAMES,
Integer.MAX_VALUE, builder);
}
else if (owner instanceof PsiParameter) {
final PsiElement declarationScope = ((PsiParameter)owner).getDeclarationScope();
@@ -480,16 +473,10 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
builder.append(" ");
formatMethod(psiMethod, PsiSubstitutor.EMPTY,
SHOW_NAME | SHOW_FQ_NAME | SHOW_TYPE | SHOW_RAW_TYPE | SHOW_PARAMETERS | SHOW_FQ_CLASS_NAMES,
showParamName ? SHOW_NAME | SHOW_TYPE | SHOW_RAW_TYPE | SHOW_FQ_CLASS_NAMES : SHOW_TYPE | SHOW_RAW_TYPE | SHOW_FQ_CLASS_NAMES,
maxParamsToShow, builder);
SHOW_TYPE | SHOW_RAW_TYPE | SHOW_FQ_CLASS_NAMES,
Integer.MAX_VALUE, builder);
builder.append(" ");
if (showParamName) {
formatVariable((PsiVariable)owner, SHOW_NAME, PsiSubstitutor.EMPTY, builder);
}
else {
builder.append(psiMethod.getParameterList().getParameterIndex((PsiParameter)owner));
}
builder.append(psiMethod.getParameterList().getParameterIndex((PsiParameter)owner));
}
else {
return null;