QuickDoc: fix typelist representation

Author: zolotov

src/com/goide/GoDocumentationProvider.java

@@ -34,17 +34,13 @@
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScopesCore;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 
 public class GoDocumentationProvider extends AbstractDocumentationProvider {
   private static final GoCommentsConverter COMMENTS_CONVERTER = new GoCommentsConverter();
@@ -242,7 +238,7 @@ else if (type instanceof GoPointerType) {
         return replaceInnerTypes(type, ((GoPointerType)type).getType());
       }
       else if (type instanceof GoTypeList) {
-        return replaceInnerTypes(type, ArrayUtil.toObjectArray(GoType.class, ((GoTypeList)type).getTypeList()));
+        return "(" + replaceInnerTypes(type, ((GoTypeList)type).getTypeList()) + ")";
       }
 
       GoTypeReferenceExpression typeRef = GoPsiImplUtil.getTypeReference(type);
@@ -259,13 +255,18 @@ else if (type instanceof GoTypeList) {
 
   @NotNull
   private static String replaceInnerTypes(@NotNull GoType type, GoType... innerTypes) {
+    return replaceInnerTypes(type, Arrays.asList(innerTypes));
+  }
+  
+  @NotNull
+  private static String replaceInnerTypes(@NotNull GoType type, @NotNull List<GoType> innerTypes) {
     StringBuilder result = new StringBuilder();
     String typeText = type.getText();
     int initialOffset = type.getTextRange().getStartOffset();
     int lastStartOffset = type.getTextLength();
     ContainerUtil.sort(innerTypes, ELEMENT_BY_RANGE_COMPARATOR);
-    for (int i = innerTypes.length - 1; i >= 0; i--) {
-      GoType innerType = innerTypes[i];
+    for (int i = innerTypes.size() - 1; i >= 0; i--) {
+      GoType innerType = innerTypes.get(i);
       if (innerType != null) {
         TextRange range = innerType.getTextRange().shiftRight(-initialOffset);
         result.insert(0, XmlStringUtil.escapeString(typeText.substring(range.getEndOffset(), lastStartOffset)));

testData/doc/signature.go

@@ -0,0 +1,4 @@
+package a; 
+func _() {Fo<caret>o()}
+// If n < 0, there is no limit on the number of replacements.
+func Foo(a map[int]*string, b (string), c string, int) (<-chan string, int) {return c}

testData/doc/signature.txt

@@ -0,0 +1,6 @@
+<b>func Foo(a map[<a href="psi_element://builtin#int">int</a>]*<a href="psi_element://builtin#string">string</a>, b (<a href="psi_element://builtin#string">string</a>), c <a href="psi_element://builtin#string">string</a>, <a href="psi_element://builtin#int">int</a>) (&lt;-chan <a href="psi_element://builtin#string">string</a>, <a href="psi_element://builtin#int">int</a>)</b>
+<p>If n &lt; 0, there is no limit on the number of replacements.
+</p>
+
+=====
+https://godoc.org/null#Foo

tests/com/goide/GoDocumentationProviderTest.java

@@ -46,6 +46,7 @@ protected LightProjectDescriptor getProjectDescriptor() {
   public void testPackageOnImportAlias()          { doTest(); }
   public void testTypeResultDefinition()          { doTest(); }
   public void testMultilineTypeListDefinition()   { doTest(); }
+  public void testSignature()                     { doTest(); }
 
   public void testMultiBlockDoc()                 { doConverterTest(); }
   public void testIndentedBlock()                 { doConverterTest(); }