space before type in file structure

2026-09-27 10:03:11 +07:00 · 2012-07-27 17:42:59 +02:00
parent daf89aba0e
commit a8843ed4a0
20 changed files with 112 additions and 111 deletions
@@ -17,6 +17,7 @@ package com.intellij.ide.structureView.impl.java;

 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.ide.util.treeView.smartTree.SortableTreeElement;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiSubstitutor;
 import com.intellij.psi.util.PsiFormatUtil;
@@ -36,11 +37,11 @@ public class PsiFieldTreeElement extends JavaClassTreeElementBase<PsiField> impl
  }

  public String getPresentableText() {
-    return PsiFormatUtil.formatVariable(
+    return StringUtil.replace(PsiFormatUtil.formatVariable(
      getElement(),
      PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE | PsiFormatUtil.TYPE_AFTER | PsiFormatUtil.SHOW_INITIALIZER,
      PsiSubstitutor.EMPTY
-    );
+    ), ":", ": ");
  }

  public PsiField getField() {
@@ -67,12 +67,12 @@ public class PsiMethodTreeElement extends JavaClassTreeElementBase<PsiMethod> im
  }

  public String getPresentableText() {
-    return PsiFormatUtil.formatMethod(
+    return StringUtil.replace(PsiFormatUtil.formatMethod(
      getElement(),
      PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_NAME |
                            PsiFormatUtilBase.SHOW_TYPE | PsiFormatUtilBase.TYPE_AFTER | PsiFormatUtilBase.SHOW_PARAMETERS,
      PsiFormatUtilBase.SHOW_TYPE
-    );
+    ), ":", ": ");
  }


@@ -1,4 +1,4 @@
 -AnonymousType.java
 -AnonymousType
-  -foo():void
+  -foo(): void
   [$1]
@@ -1,5 +1,5 @@
 -Camel.java
 -Camel
-  [doSomethingWithMyHead():void]
-  getSomeArtHeader():void
-  getSomeHead():void
+  [doSomethingWithMyHead(): void]
+  getSomeArtHeader(): void
+  getSomeHead(): void
@@ -1,5 +1,5 @@
 -Camel2.java
 -Camel2
-  doSomeArtHeader():void
-  [doSomeHead():void]
-  doSomethingWithMyHead():void
+  doSomeArtHeader(): void
+  [doSomeHead(): void]
+  doSomethingWithMyHead(): void
@@ -1,4 +1,4 @@
 -ReturnValue.java
 -ReturnValue
-  getLocationOnScreen():Point
-  [getPoint():Point]
+  getLocationOnScreen(): Point
+  [getPoint(): Point]
@@ -1,5 +1,5 @@
 -SelectLeafFirst.java
 -SelectLeafFirst
-  [clear():void]
+  [clear(): void]
  -ClearClass
-   clear():void
+   clear(): void
@@ -1,5 +1,5 @@
 -SelectLeafFirst2.java
 -SelectLeafFirst2
-  clear():void
+  clear(): void
  -ClearClass
-   [clear():void]
+   [clear(): void]
@@ -1,5 +1,5 @@
 -SelectLeafFirst3.java
 -SelectLeafFirst3
-  [clear():void]
+  [clear(): void]
  -ClearClass
-   clear():void
+   clear(): void
@@ -1,5 +1,5 @@
 -SelectLeafFirst4.java
 -SelectLeafFirst4
-  clear():void
+  clear(): void
  -ClearClass
-   [clear():void]
+   [clear(): void]
@@ -1,6 +1,6 @@
 -Simple.java
 -Simple
-  [fff():void]
-  fff2():void
-  fff3():void
-  fff4():void
+  [fff(): void]
+  fff2(): void
+  fff3(): void
+  fff4(): void
@@ -1,23 +1,23 @@
 -AnonymousAsConstantInInterface.java
 -AnonymousAsConstantInInterface
-  -getAMethod():void
+  -getAMethod(): void
   -$1
-    getA():void
-    getA1():void
-    getA2():void
-    getA3():void
-    getA4():void
-    getA5():void
-    getA6():void
-    getA7():void
-    getA8():void
-    -DEFAULT:BuggyInterface = new BuggyInterface() {...}
+    getA(): void
+    getA1(): void
+    getA2(): void
+    getA3(): void
+    getA4(): void
+    getA5(): void
+    getA6(): void
+    getA7(): void
+    getA8(): void
+    -DEFAULT: BuggyInterface = new BuggyInterface() {...}
     -$1
-      [getA1():void]
-      getA2():void
-      getA3():void
-      getA4():void
-      getA5():void
-      getA6():void
-      getA7():void
-      getA8():void
+      [getA1(): void]
+      getA2(): void
+      getA3(): void
+      getA4(): void
+      getA5(): void
+      getA6(): void
+      getA7(): void
+      getA8(): void
@@ -1,16 +1,16 @@
 -Simple.java
 -Simple
-  aaa():void
-  bbb():void
-  clone():Object
-  equals(Object):boolean
-  [fff():void]
-  finalize():void
-  getClass():Class<?>
-  hashCode():int
-  notify():void
-  notifyAll():void
-  toString():String
-  wait():void
-  wait(long):void
-  wait(long, int):void
+  aaa(): void
+  bbb(): void
+  clone(): Object
+  equals(Object): boolean
+  [fff(): void]
+  finalize(): void
+  getClass(): Class<?>
+  hashCode(): int
+  notify(): void
+  notifyAll(): void
+  toString(): String
+  wait(): void
+  wait(long): void
+  wait(long, int): void
@@ -1,8 +1,8 @@
 -Anonymous.java
 -Anonymous
  Anonymous()
-  foo():void
-  num1:int
-  num2:int
-  -[o:Object = new Object() {...}]
+  foo(): void
+  num1: int
+  num2: int
+  -[o: Object = new Object() {...}]
   $1
@@ -1,10 +1,10 @@
 -AnonymousInAnonymous.java
 -AnonymousInAnonymous
  AnonymousInAnonymous()
-  -foo():void
+  -foo(): void
   -$1
-    -toString():String
+    -toString(): String
     -$1
-      [method():void]
-  num1:int
-  num2:int
+      [method(): void]
+  num1: int
+  num2: int
@@ -1,6 +1,6 @@
 -Constructor.java
 -Constructor
  [Constructor()]
-  foo():void
-  num1:int
-  num2:int
+  foo(): void
+  num1: int
+  num2: int
@@ -1,6 +1,6 @@
 -Field.java
 -Field
  Field()
-  foo():void
-  num1:int
-  [num2:int]
+  foo(): void
+  num1: int
+  [num2: int]
@@ -1,6 +1,6 @@
 -InsideClass.java
 -[InsideClass]
  InsideClass()
-  foo():void
-  num1:int
-  num2:int
+  foo(): void
+  num1: int
+  num2: int
@@ -1,6 +1,6 @@
 -Method.java
 -Method
  Method()
-  [foo():void]
-  num1:int
-  num2:int
+  [foo(): void]
+  num1: int
+  num2: int
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http: //www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -42,8 +42,8 @@ class Foo {
        assertTreeEqual(component.getTree(), """-a.groovy
 -Foo
  Foo(int, int)
-  foo(int, int):Object
-  prop:int
+  foo(int, int): Object
+  prop: int
 """);
      }
    });
@@ -67,34 +67,34 @@ class Bar extends Foo {
        assertTreeEqual(component.getTree(), """-a.groovy
 -Foo
  Foo(int, int)
-  foo(int, int):Object
-  getClass():Class<? extends Object>
-  clone():Object
-  equals(Object):boolean
-  hashCode():int
-  wait(long):void
-  wait(long, int):void
-  wait():void
-  notify():void
-  finalize():void
-  toString():String
-  notifyAll():void
-  prop:int
+  foo(int, int): Object
+  getClass(): Class<? extends Object>
+  clone(): Object
+  equals(Object): boolean
+  hashCode(): int
+  wait(long): void
+  wait(long, int): void
+  wait(): void
+  notify(): void
+  finalize(): void
+  toString(): String
+  notifyAll(): void
+  prop: int
 -Bar
-  bar(int):Object
-  getClass():Class<? extends Object>
-  clone():Object
-  equals(Object):boolean
-  hashCode():int
-  foo(int, int):Object
-  wait(long):void
-  wait(long, int):void
-  wait():void
-  notify():void
-  finalize():void
-  toString():String
-  notifyAll():void
-  prop:int
+  bar(int): Object
+  getClass(): Class<? extends Object>
+  clone(): Object
+  equals(Object): boolean
+  hashCode(): int
+  foo(int, int): Object
+  wait(long): void
+  wait(long, int): void
+  wait(): void
+  notify(): void
+  finalize(): void
+  toString(): String
+  notifyAll(): void
+  prop: int
 """);
      }
    });
@@ -116,8 +116,8 @@ class Foo {
        component.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
        assertTreeEqual(component.getTree(), """-a.groovy
 -Foo
-  foo():void
-  prop:int
+  foo(): void
+  prop: int
 """);
      }
    });