From 71eb4a28b21ba5a26dd726939ee3ce293ff1bc65 Mon Sep 17 00:00:00 2001
From: Jonathan Hall <flimzy@flimzy.com>
Date: Mon, 29 Jan 2024 11:06:43 +0100
Subject: [PATCH] Invert a couple conditionals to reduce indentation

---
 format/format.go | 66 +++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/format/format.go b/format/format.go
index d511499..13db467 100644
--- a/format/format.go
+++ b/format/format.go
@@ -705,42 +705,44 @@ func (f *fumpter) applyPre(c *astutil.Cursor) {
 
 	// Clothe naked returns
 	case *ast.ReturnStmt:
-		if node.Results == nil { // We have either a naked return, or a function with no return values
-			parents, _ := astutil.PathEnclosingInterval(f.astFile, node.Pos(), node.End())
-			var results *ast.FieldList
-			// Find the nearest ancestor that is either a func declaration or func literal
-		parentLoop:
-			for _, parent := range parents {
-				switch p := parent.(type) {
-				case *ast.FuncDecl:
-					results = p.Type.Results
-					break parentLoop
-				case *ast.FuncLit:
-					results = p.Type.Results
-					break parentLoop
-				}
+		if node.Results != nil {
+			break
+		} // We have either a naked return, or a function with no return values
+		parents, _ := astutil.PathEnclosingInterval(f.astFile, node.Pos(), node.End())
+		var results *ast.FieldList
+		// Find the nearest ancestor that is either a func declaration or func literal
+	parentLoop:
+		for _, parent := range parents {
+			switch p := parent.(type) {
+			case *ast.FuncDecl:
+				results = p.Type.Results
+				break parentLoop
+			case *ast.FuncLit:
+				results = p.Type.Results
+				break parentLoop
 			}
-			if fields := results.NumFields(); fields > 0 { // The function has return values; let's clothe the return
-				node.Results = make([]ast.Expr, 0, fields)
-			nameLoop:
-				for _, result := range results.List {
-					for _, ident := range result.Names {
-						name := ident.Name
-						if name == "_" { // we can't handle blank names just yet, abort the transform
-							node.Results = nil
-							break nameLoop
-						}
-						node.Results = append(node.Results, &ast.Ident{
-							NamePos: node.Pos(), // Use the Pos of the return statement, to not interfere with comment placement
-							Name:    name,
-						})
-					}
-				}
-				if len(node.Results) > 0 {
-					c.Replace(node)
+		}
+		if fields := results.NumFields(); fields <= 0 {
+			break
+		} // The function has return values; let's clothe the return
+		node.Results = make([]ast.Expr, 0, results.NumFields())
+	nameLoop:
+		for _, result := range results.List {
+			for _, ident := range result.Names {
+				name := ident.Name
+				if name == "_" { // we can't handle blank names just yet, abort the transform
+					node.Results = nil
+					break nameLoop
 				}
+				node.Results = append(node.Results, &ast.Ident{
+					NamePos: node.Pos(), // Use the Pos of the return statement, to not interfere with comment placement
+					Name:    name,
+				})
 			}
 		}
+		if len(node.Results) > 0 {
+			c.Replace(node)
+		}
 	}
 }