[completion] wrong pointer type detection for short variable declaration, fix #2222

Author: ignatov

src/com/goide/GoDocumentationProvider.java

@@ -39,6 +39,7 @@
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NotNull;
@@ -222,7 +223,10 @@ else if (type instanceof GoArrayOrSliceType) {
         return replaceInnerTypes(type, contextImportPath, ((GoArrayOrSliceType)type).getType());
       }
       else if (type instanceof GoPointerType) {
-        return replaceInnerTypes(type, contextImportPath, ((GoPointerType)type).getType());
+        GoType inner = ((GoPointerType)type).getType();
+        return inner instanceof GoSpecType
+               ? getTypePresentation(inner, contextImportPath)
+               : replaceInnerTypes(type, contextImportPath, inner);
       }
       else if (type instanceof GoTypeList) {
         return "(" + replaceInnerTypes(type, contextImportPath, ((GoTypeList)type).getTypeList()) + ")";
@@ -273,7 +277,7 @@ private static String replaceInnerTypes(@NotNull GoType type, @Nullable String c
   private static String replaceInnerTypes(@NotNull GoType type, @Nullable String contextImportPath, @NotNull List<GoType> innerTypes) {
     StringBuilder result = new StringBuilder();
     String typeText = type.getText();
-    int initialOffset = type.getTextRange().getStartOffset();
+    int initialOffset = ObjectUtils.notNull(type.getTextRange(), TextRange.EMPTY_RANGE).getStartOffset();
     int lastStartOffset = type.getTextLength();
     ContainerUtil.sort(innerTypes, ELEMENT_BY_RANGE_COMPARATOR);
     for (int i = innerTypes.size() - 1; i >= 0; i--) {

src/com/goide/psi/impl/GoPsiImplUtil.java

@@ -329,6 +329,7 @@ public static GoType getGoTypeInner(@NotNull final GoExpression o, @Nullable Res
     if (o instanceof GoUnaryExpr) {
       GoExpression e = ((GoUnaryExpr)o).getExpression();
       GoType type = e == null ? null : findBaseType(e.getGoType(context));
+      if (type != null && ((GoUnaryExpr)o).getBitAnd() != null) return new LightPointerType(type);
       if (type instanceof GoChannelType && ((GoUnaryExpr)o).getSendChannel() != null) return ((GoChannelType)type).getType();
       if (type instanceof GoPointerType && ((GoUnaryExpr)o).getMul() != null) return ((GoPointerType)type).getType();
       return type;
@@ -640,6 +641,9 @@ else if (type instanceof GoSpecType) {
   @NotNull
   public static String getText(@Nullable GoType o) {
     if (o == null) return "";
+    if (o instanceof GoPointerType && ((GoPointerType)o).getType() instanceof GoSpecType) {
+      return "*" + getText(((GoPointerType)o).getType());
+    }
     if (o instanceof GoSpecType) {
       String fqn = getFqn(getTypeSpecSafe(o));
       if (fqn != null) {