From c8e0bef1dc65c8f6b003e222fe03b619bee11e23 Mon Sep 17 00:00:00 2001
From: Ilya Klyuchnikov <ilya.klyuchnikov@gmail.com>
Date: Tue, 10 Jun 2014 09:03:11 +0400
Subject: [PATCH] towards compound ids

---
 .../BytecodeAnalysisHandler.java              |  2 +-
 .../com/intellij/psi/util/PsiFormatUtil.java  | 25 +++++--------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisHandler.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisHandler.java
index 607658318539..679c190b5b1f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisHandler.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisHandler.java
@@ -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("...)", "[])");
     }
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 e293135b6370..885f1bd9a444 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
@@ -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;