Merge branch 'main' into analyze-regex

gnoverse · Aug 1, 2024 · b35b956 · b35b956
2 parents c3d5c13 + 3843478
commit b35b956
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/internal/lints/detect_cycle_test.go b/internal/lints/detect_cycle_test.go
@@ -48,13 +48,12 @@ func outer() {
 
 	cycle := newCycle()
 	result := cycle.detectCycles(f)
-	if len(result) != 6 {
+	if len(result) != 4 {
 		// [B A B]
 		// [B A B]
 		// [x y x]
 		// [b a b]
 		// [outer outer$anon<address> outer]
-		// [outer outer]
 		t.Errorf("unexpected result: %v", result)
 	}
 }
diff --git a/internal/lints/detect_cycles.go b/internal/lints/detect_cycles.go
@@ -48,7 +48,9 @@ func (c *cycle) analyzeFuncDecl(fn *ast.FuncDecl) {
 		switch x := n.(type) {
 		case *ast.CallExpr:
 			if ident, ok := x.Fun.(*ast.Ident); ok {
-				c.dependencies[name] = append(c.dependencies[name], ident.Name)
+				if ident.Name == name {
+					c.dependencies[name] = append(c.dependencies[name], ident.Name)
+				}
 			}
 		case *ast.FuncLit:
 			c.analyzeFuncLit(x, name)
@@ -135,7 +137,7 @@ func (c *cycle) dfs(name string) {
 	for _, dep := range c.dependencies[name] {
 		if !c.visited[dep] {
 			c.dfs(dep)
-		} else if contains(c.stack, dep) {
+		} else if contains(c.stack, dep) && dep != name {
 			cycle := append(c.stack[indexOf(c.stack, dep):], dep)
 			res := fmt.Sprintf("%v", cycle)
 			c.cycles = append(c.cycles, res)