variables with same name as struct fields are masked by struct fields, fix #1531

Author: ignatov

gen/com/goide/psi/GoTypeSpec.java

@@ -244,7 +244,7 @@ TypeDeclaration ::= 'type' ( TypeSpec | '(' TypeSpecs? ')' ) {pin(".*")=1}
 private TypeSpecs ::= TypeSpec (semi TypeSpec)* semi? {pin=1}
 TypeSpec ::= identifier Type {
   pin=1
-  methods=[getGoType getMethods]
+  methods=[getGoType getMethods shouldGoDeeper]
   stubClass="com.goide.stubs.GoTypeSpecStub"
 }
 

gen/com/goide/psi/impl/GoTypeSpecImpl.java

@@ -788,6 +788,10 @@ public static boolean shouldGoDeeper(@SuppressWarnings("UnusedParameters") GoImp
     return false;
   }
 
+  public static boolean shouldGoDeeper(@SuppressWarnings("UnusedParameters") GoTypeSpec o) {
+    return false;
+  }
+
   public static boolean isForSideEffects(@NotNull GoImportSpec o) {
     return "_".equals(o.getAlias());
   }

grammars/go.bnf

@@ -0,0 +1,7 @@
+package main
+
+func main() {
+	type demo struct { Field1 int }
+	var /*def*/Field1 int
+	 /*ref*/Field1 = 1
+}

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

@@ -56,6 +56,7 @@ public class GoLegacyResolveVarsTest extends GoLegacyResolveTestBase {
   public void testVarInSwitchTypeWithNamedSwitchGuard()             { doTest(); }
   public void testVarDeclarationInSelectCommClauseSend()            { doTest(); }
   public void testVarDeclarationOutsideSwitch()                     { doTest(); }
+  public void testVarVsInnerTypes()                                 { doTest(); }
 
   public void testFromDefaultImportedPackage()                      { doDirTest(); }
   public void testLocalPackageDefinitionsShouldBeResolvedFirst()    { doDirTest(); }