From c9a17ef7d9501d9a389f069f168723330b865b37 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Wed, 24 May 2023 18:37:01 +0200 Subject: Change `isFirstErrorDeferEndPosSet()` to `deferAssignsError()` The previous function didn't make enough sense without the context of when `firstErrorDeferEndPos` is set. Use a different function named for what we actually want to know. --- defererr.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'defererr.go') diff --git a/defererr.go b/defererr.go index d21b0b6..54cedcf 100644 --- a/defererr.go +++ b/defererr.go @@ -50,8 +50,8 @@ func (s *functionState) setFirstErrorDeferEndPos(pos token.Pos) { s.firstErrorDeferEndPos = pos } -func (s *functionState) isFirstErrorDeferEndPosSet() bool { - return s.firstErrorDeferEndPos != -1 +func (s *functionState) deferAssignsError() bool { + return s.deferErrorVar != nil } func checkFunctions(pass *analysis.Pass, node ast.Node) { @@ -143,7 +143,9 @@ func checkFunctions(pass *analysis.Pass, node ast.Node) { fmt.Printf("fState: %#v\n", fState) - if !fState.isFirstErrorDeferEndPosSet() { + // Stop if the `defer` closure does not assign to an error + // variable. + if !fState.deferAssignsError() { return true } -- cgit v1.2.3