fix #1446: better processing for ranges and channel types

go-lang-plugin-org · Mar 18, 2015 · 34443d6 · 34443d6
1 parent e277091
commit 34443d6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/com/goide/psi/impl/GoPsiImplUtil.java b/src/com/goide/psi/impl/GoPsiImplUtil.java
@@ -529,6 +529,9 @@ private static GoType processRangeClause(@NotNull GoVarDefinition o, @NotNull Go
         PsiElement resolve = typeRef.getReference().resolve();
         if (resolve instanceof GoTypeSpec) {
           type = ((GoTypeSpec)resolve).getType();
+          if (type instanceof GoChannelType) {
+            return type.getType();
+          }
         }
       }
       if (type instanceof GoArrayOrSliceType && i == 1) return type.getType();

diff --git a/testData/highlighting/ranges.go b/testData/highlighting/ranges.go
@@ -60,4 +60,22 @@ func main() {
     for _, <error descr="Unused variable 'd'">d</error> := range <error descr="Unresolved reference 'd'">d</error>.Packets {
     }
 }
-func create() []*Person {return make([]*Person, 0)}
+func create() []*Person {return make([]*Person, 0)}
+
+type myStruct struct {
+    MyVal bool
+}
+
+type myChanType chan myStruct
+
+func chanFn(c myChanType) {
+    for v := range c {
+             fmt.Printf("Got %v\n", v.MyVal) // v.MyVal is unresolved
+    }
+}
+
+func <warning>main2</warning>() {
+    ch := make(myChanType)
+    go chanFn(ch)
+    ch <- myStruct{true}
+}