Tone down close closer

closecloser/analyzer.go

@@ -22,7 +22,7 @@ func run(pass *analysis.Pass) (any, error) {
 	c := newCloseCollector(pass, ipr)
 
 	ipr.Nodes([]ast.Node{
-		&ast.FuncDecl{},
+		&ast.File{},
 		&ast.AssignStmt{},
 		&ast.ValueSpec{},
 	},
@@ -32,14 +32,8 @@ func run(pass *analysis.Pass) (any, error) {
 			}
 			var ids []*ast.Ident
 			switch n := n.(type) {
-			case *ast.FuncDecl:
-				// NOTE:
-				// As of now, the analyzer does not report test functions.
-				// It is because:
-				//     - resources can be implicitly closed by t.Cleanup()
-				//     - people tend to write tests that do not close resources
-				// I think it is not desirable but this is practically helpful anyway.
-				if isTestOrTestHelper(n, pass) {
+			case *ast.File:
+				if utils.IsTestRelatedFile(n) {
 					return false
 				}
 			case *ast.AssignStmt:

closecloser/ignored.go

@@ -20,7 +20,9 @@ func shouldAllowUnclosed(expr ast.Expr, pass *analysis.Pass) bool {
 }
 
 func isAllowedCall(call *ast.CallExpr, pass *analysis.Pass) bool {
-	if isAllowedMethodCall(call, pass) {
+	if isMethodCall(call, pass) {
+		// closer returned by method call is allowed.
+		// its lifecycle might be managed by the receiver.
 		return true
 	}
 	if isAllowedFuncCall(call, pass) {
@@ -29,40 +31,22 @@ func isAllowedCall(call *ast.CallExpr, pass *analysis.Pass) bool {
 	return false
 }
 
-func isAllowedMethodCall(call *ast.CallExpr, pass *analysis.Pass) bool {
+func isMethodCall(call *ast.CallExpr, pass *analysis.Pass) bool {
 	fun, ok := call.Fun.(*ast.SelectorExpr)
 	if !ok {
 		return false
 	}
-	ty := pass.TypesInfo.TypeOf(fun.X)
-	if ty == nil {
-		return false
-	}
-
-	if implementsCloser(ty) {
-		return true
-	}
-
-	pt, ok := ty.(*types.Pointer)
-	if ok {
-		ty = pt.Elem()
-	}
-
-	nt, ok := ty.(*types.Named)
+	ident, ok := fun.X.(*ast.Ident)
 	if !ok {
-		return false
+		return true
 	}
-	obj := nt.Obj()
-	if obj.Pkg() == nil {
+	ty := pass.TypesInfo.ObjectOf(ident)
+	if ty == nil {
 		return false
 	}
-	m := method{
-		pkg:  obj.Pkg().Path(),
-		typ:  nt.Obj().Name(),
-		name: fun.Sel.Name,
-	}
-	_, ok = allowedMethods[m]
-	return ok
+
+	_, ok = ty.(*types.PkgName)
+	return !ok
 }
 
 func isAllowedFuncCall(call *ast.CallExpr, pass *analysis.Pass) bool {
@@ -86,18 +70,6 @@ func isAllowedFuncCall(call *ast.CallExpr, pass *analysis.Pass) bool {
 	return ok
 }
 
-var allowedMethods = map[method]struct{}{
-	{"os/exec", "Cmd", "StdinPipe"}:  {},
-	{"os/exec", "Cmd", "StdoutPipe"}: {},
-	{"os/exec", "Cmd", "StderrPipe"}: {},
-}
-
-type method struct {
-	pkg  string
-	typ  string
-	name string
-}
-
 var allowedFuns = map[fun]struct{}{}
 
 type fun struct {

closecloser/testdata/testing.go → closecloser/testdata/testing_test.go

@@ -1,4 +1,4 @@
-package testdata
+package testdata_test
 
 import (
 	"os"