Review marks

Author: wbars

src/com/goide/inspections/unresolved/GoAddStructFieldFix.java

@@ -17,7 +17,9 @@
 package com.goide.inspections.unresolved;
 
 import com.goide.psi.GoFieldDeclaration;
+import com.goide.psi.GoReferenceExpression;
 import com.goide.psi.GoStructType;
+import com.goide.psi.GoType;
 import com.goide.psi.impl.GoElementFactory;
 import com.intellij.codeInspection.LocalQuickFixOnPsiElement;
 import com.intellij.openapi.project.Project;
@@ -27,6 +29,7 @@
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -35,7 +38,7 @@ public class GoAddStructFieldFix extends LocalQuickFixOnPsiElement {
   private final String myFieldText;
   private final String myTypeText;
 
-  protected GoAddStructFieldFix(String fieldText, String typeText, @NotNull GoStructType element) {
+  protected GoAddStructFieldFix(String fieldText, String typeText, @NotNull PsiElement element) {
     super(element);
     myFieldText = fieldText;
     myTypeText = typeText;
@@ -49,11 +52,19 @@ public String getText() {
 
   @Override
   public void invoke(@NotNull Project project, @NotNull PsiFile file, @NotNull PsiElement startElement, @NotNull PsiElement endElement) {
-    GoStructType structType = ObjectUtils.tryCast(startElement, GoStructType.class);
+    GoStructType structType = resolveStructType(startElement);
     if (structType == null) return;
     List<GoFieldDeclaration> declarations = structType.getFieldDeclarationList();
     PsiElement anchor = !declarations.isEmpty() ? ContainerUtil.getLastItem(declarations) : structType.getLbrace();
-    if (anchor != null) structType.addAfter(GoElementFactory.createFieldDeclaration(project, myFieldText, myTypeText), anchor);
+    structType.addAfter(GoElementFactory.createFieldDeclaration(project, myFieldText, myTypeText), anchor);
+  }
+
+  @Nullable
+  private static GoStructType resolveStructType(@NotNull PsiElement startElement) {
+    GoReferenceExpression referenceExpression = ObjectUtils.tryCast(startElement, GoReferenceExpression.class);
+    GoReferenceExpression qualifier = referenceExpression != null ? referenceExpression.getQualifier() : null;
+    GoType type = qualifier != null ? qualifier.getGoType(null) : null;
+    return type != null ? ObjectUtils.tryCast(type.getUnderlyingType(), GoStructType.class) : null;
   }
 
   @Nls

src/com/goide/inspections/unresolved/GoUnresolvedReferenceInspection.java

@@ -79,7 +79,7 @@ else if (reference.resolve() == null) {
           GoType type = qualifier != null ? qualifier.getGoType(null) : null;
           GoStructType structType = type != null ? ObjectUtils.tryCast(type.getUnderlyingType(), GoStructType.class) : null;
           if (!"_".equals(reference.getCanonicalText()) && structType != null) {
-            fixes = new LocalQuickFix[]{new GoAddStructFieldFix(reference.getCanonicalText(), getTypeName(o), structType)};
+            fixes = new LocalQuickFix[]{new GoAddStructFieldFix(reference.getCanonicalText(), getTypeName(o), o)};
           }
           else if (isProhibited(o, qualifier)) {
             fixes = createImportPackageFixes(o, reference, holder.isOnTheFly());