Enable File.Rules() to find targets nested in comprehensions. (bazelb…

…uild#317)
scentini · May 31, 2018 · 82b2160 · 82b2160
1 parent 588d900
commit 82b2160
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/build/rule.go b/build/rule.go
@@ -43,15 +43,17 @@ func (f *File) Rules(kind string) []*Rule {
 	var all []*Rule
 
 	for _, stmt := range f.Stmt {
-		call, ok := stmt.(*CallExpr)
-		if !ok {
-			continue
-		}
-		rule := f.Rule(call)
-		if kind != "" && rule.Kind() != kind {
-			continue
-		}
-		all = append(all, rule)
+		Walk(stmt, func(x Expr, stk []Expr) {
+			call, ok := x.(*CallExpr)
+			if !ok {
+				return
+			}
+			rule := f.Rule(call)
+			if kind != "" && rule.Kind() != kind {
+				return
+			}
+			all = append(all, rule)
+		});
 	}
 
 	return all

diff --git a/build/rule_test.go b/build/rule_test.go
@@ -120,6 +120,24 @@ func TestRules(t *testing.T) {
 	compare(t, f.Rules("foo.bar.baz"), []*Rule{structRule})
 }
 
+func TestRulesNested(t *testing.T) {
+	f := &File{
+		Stmt: []Expr{
+			&ListExpr{
+				List: []Expr{
+					simpleCall,
+					structCall,
+				},
+			},
+		},
+	}
+
+	compare(t, f.Rules(""), []*Rule{simpleRule, structRule})
+	compare(t, f.Rules("java_binary"), []*Rule(nil))
+	compare(t, f.Rules("java_library"), []*Rule{simpleRule})
+	compare(t, f.Rules("foo.bar.baz"), []*Rule{structRule})
+}
+
 func TestImplicitName(t *testing.T) {
 	tests := []struct {
 		path        string