Process Idents in CompositeLit (issue #9)

esimonov · Mar 12, 2021 · c1bcdfa · c1bcdfa
1 parent 70b30c6
commit c1bcdfa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go
@@ -189,12 +189,13 @@ func (nom namedOccurrenceMap) checkExpression(candidate ast.Expr, ifPos token.Po
 		}
 	case *ast.CompositeLit:
 		for _, el := range v.Elts {
-			kv, ok := el.(*ast.KeyValueExpr)
-			if !ok {
-				continue
+			switch v := el.(type) {
+			case *ast.Ident:
+				nom.checkExpression(v, ifPos)
+			case *ast.KeyValueExpr:
+				nom.checkExpression(v.Key, ifPos)
+				nom.checkExpression(v.Value, ifPos)
 			}
-			nom.checkExpression(kv.Key, ifPos)
-			nom.checkExpression(kv.Value, ifPos)
 		}
 	case *ast.FuncLit:
 		for _, el := range v.Body.List {

diff --git a/testdata/testdata.go b/testdata/testdata.go
@@ -266,6 +266,14 @@ func notUsed_CompositeLiteral_Struct_OK() dummyType {
 	}
 }
 
+func notUsed_CompositeLiteral_Array_OK() []interface{} {
+	v := getValue()
+	if v == nil {
+		return nil
+	}
+	return []interface{}{v}
+}
+
 func notUsed_MultipleAssignments_OK() interface{} {
 	a, b := getTwoValues()
 	if a != nil {