gopls/internal/golang: highlight typeswitch break correctly

Fixes golang/go#65752

Change-Id: I99a44c85c92615fbf3f4b1d34ab63a24454c8e85
Reviewed-on: https://go-review.googlesource.com/c/tools/+/564955
Auto-Submit: Alan Donovan <[email protected]>
Reviewed-by: Robert Findley <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: adonovan

gopls/internal/golang/highlight.go

@@ -103,7 +103,7 @@ func highlightPath(path []ast.Node, file *ast.File, info *types.Info) (map[posRa
 		highlightIdentifier(node, file, info, result)
 	case *ast.ForStmt, *ast.RangeStmt:
 		highlightLoopControlFlow(path, info, result)
-	case *ast.SwitchStmt:
+	case *ast.SwitchStmt, *ast.TypeSwitchStmt:
 		highlightSwitchFlow(path, info, result)
 	case *ast.BranchStmt:
 		// BREAK can exit a loop, switch or select, while CONTINUE exit a loop so
@@ -309,7 +309,7 @@ func highlightUnlabeledBreakFlow(path []ast.Node, info *types.Info, result map[p
 		case *ast.ForStmt, *ast.RangeStmt:
 			highlightLoopControlFlow(path, info, result)
 			return // only highlight the innermost statement
-		case *ast.SwitchStmt:
+		case *ast.SwitchStmt, *ast.TypeSwitchStmt:
 			highlightSwitchFlow(path, info, result)
 			return
 		case *ast.SelectStmt:
@@ -331,7 +331,7 @@ func highlightLabeledFlow(path []ast.Node, info *types.Info, stmt *ast.BranchStm
 			switch label.Stmt.(type) {
 			case *ast.ForStmt, *ast.RangeStmt:
 				highlightLoopControlFlow([]ast.Node{label.Stmt, label}, info, result)
-			case *ast.SwitchStmt:
+			case *ast.SwitchStmt, *ast.TypeSwitchStmt:
 				highlightSwitchFlow([]ast.Node{label.Stmt, label}, info, result)
 			}
 			return
@@ -381,7 +381,7 @@ Outer:
 		switch n.(type) {
 		case *ast.ForStmt, *ast.RangeStmt:
 			return loop == n
-		case *ast.SwitchStmt, *ast.SelectStmt:
+		case *ast.SwitchStmt, *ast.TypeSwitchStmt, *ast.SelectStmt:
 			return false
 		}
 		b, ok := n.(*ast.BranchStmt)
@@ -434,7 +434,7 @@ Outer:
 	// Reverse walk the path till we get to the switch statement.
 	for i := range path {
 		switch n := path[i].(type) {
-		case *ast.SwitchStmt:
+		case *ast.SwitchStmt, *ast.TypeSwitchStmt:
 			switchNodeLabel = labelFor(path[i:])
 			if stmtLabel == nil || switchNodeLabel == stmtLabel {
 				switchNode = n
@@ -457,7 +457,7 @@ Outer:
 	// Traverse AST to find break statements within the same switch.
 	ast.Inspect(switchNode, func(n ast.Node) bool {
 		switch n.(type) {
-		case *ast.SwitchStmt:
+		case *ast.SwitchStmt, *ast.TypeSwitchStmt:
 			return switchNode == n
 		case *ast.ForStmt, *ast.RangeStmt, *ast.SelectStmt:
 			return false

gopls/internal/test/marker/testdata/highlight/switchbreak.txt

@@ -0,0 +1,21 @@
+This is a regression test for issue 65752: a break in a switch should
+highlight the switch, not the enclosing loop.
+
+-- a.go --
+package a
+
+func _(x any) {
+	for {
+		// type switch
+		switch x.(type) { //@loc(tswitch, "switch")
+		default:
+			break //@highlight("break", tswitch, "break")
+		}
+
+		// value switch
+		switch { //@loc(vswitch, "switch")
+		default:
+			break //@highlight("break", vswitch, "break")
+		}
+	}
+}