move check for default case inside suggested fix functions

golang · Feb 7, 2024 · e2e08f6 · e2e08f6
1 parent 18d0bb8
commit e2e08f6
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/gopls/internal/analysis/fillswitch/fillswitch.go b/gopls/internal/analysis/fillswitch/fillswitch.go
@@ -50,10 +50,6 @@ func Diagnose(inspect *inspector.Inspector, start, end token.Pos, pkg *types.Pac
 				return // non-overlapping
 			}
 
-			if defaultHandled(expr.Body) {
-				return
-			}
-
 			namedType, err := namedTypeFromSwitch(expr, info)
 			if err != nil {
 				return
@@ -79,10 +75,6 @@ func Diagnose(inspect *inspector.Inspector, start, end token.Pos, pkg *types.Pac
 				return // non-overlapping
 			}
 
-			if defaultHandled(expr.Body) {
-				return
-			}
-
 			namedType, err := namedTypeFromTypeSwitch(expr, info)
 			if err != nil {
 				return
@@ -109,6 +101,10 @@ func Diagnose(inspect *inspector.Inspector, start, end token.Pos, pkg *types.Pac
 }
 
 func suggestedFixTypeSwitch(stmt *ast.TypeSwitchStmt, pkg *types.Package, info *types.Info) (*analysis.SuggestedFix, error) {
+	if defaultHandled(stmt.Body) {
+		return nil, nil
+	}
+
 	namedType, err := namedTypeFromTypeSwitch(stmt, info)
 	if err != nil {
 		return nil, err
@@ -163,6 +159,10 @@ func suggestedFixTypeSwitch(stmt *ast.TypeSwitchStmt, pkg *types.Package, info *
 }
 
 func suggestedFixSwitch(stmt *ast.SwitchStmt, pkg *types.Package, info *types.Info) (*analysis.SuggestedFix, error) {
+	if defaultHandled(stmt.Body) {
+		return nil, nil
+	}
+
 	namedType, err := namedTypeFromSwitch(stmt, info)
 	if err != nil {
 		return nil, err