Handle KeyValueExpr properly

esimonov · Feb 20, 2021 · 70b30c6 · 70b30c6
1 parent 67b6923
commit 70b30c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go
@@ -193,12 +193,8 @@ func (nom namedOccurrenceMap) checkExpression(candidate ast.Expr, ifPos token.Po
 			if !ok {
 				continue
 			}
-			if ident, ok := kv.Key.(*ast.Ident); ok {
-				nom.checkExpression(ident, ifPos)
-			}
-			if ident, ok := kv.Value.(*ast.Ident); ok {
-				nom.checkExpression(ident, 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
@@ -244,7 +244,7 @@ func notUsed_SwitchStmt_Body_Assignment_OK() {
 	}
 }
 
-func notUsed_CompositeLiteral_OK() map[int]struct{} {
+func notUsed_CompositeLiteral_Map_OK() map[int]struct{} {
 	a := 0
 	if a != 0 {
 		return nil
@@ -255,6 +255,17 @@ func notUsed_CompositeLiteral_OK() map[int]struct{} {
 	return map[int]struct{}{a: b}
 }
 
+func notUsed_CompositeLiteral_Struct_OK() dummyType {
+	d := getDummy()
+	if d.interf == 0 {
+		return d
+	}
+
+	return dummyType{
+		interf: getValue(d),
+	}
+}
+
 func notUsed_MultipleAssignments_OK() interface{} {
 	a, b := getTwoValues()
 	if a != nil {