From a586d0db8420774bb736981052730e51efca1dac Mon Sep 17 00:00:00 2001
From: Alan Donovan <adonovan@google.com>
Date: Mon, 20 Nov 2023 23:34:54 -0500
Subject: [PATCH] go/types/internal/play: show more types.Scope detail

Change-Id: Idc02ca548f4412af95bf08d5799a0ce286b1595c
Reviewed-on: https://go-review.googlesource.com/c/tools/+/543956
Reviewed-by: Robert Findley <rfindley@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
---
 go/types/internal/play/play.go | 38 +++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/go/types/internal/play/play.go b/go/types/internal/play/play.go
index 7a760e2d57d..8692d51f0b7 100644
--- a/go/types/internal/play/play.go
+++ b/go/types/internal/play/play.go
@@ -125,12 +125,39 @@ func handleSelectJSON(w http.ResponseWriter, req *http.Request) {
 		startOffset, endOffset, exact)
 	var innermostExpr ast.Expr
 	for i, n := range path {
+		// Show set of names defined in each scope.
+		scopeNames := ""
+		{
+			node := n
+			prefix := ""
+
+			// A function (Func{Decl.Lit}) doesn't have a scope of its
+			// own, nor does its Body: only nested BlockStmts do.
+			// The type parameters, parameters, and locals are all
+			// in the scope associated with the FuncType; show it.
+			switch n := n.(type) {
+			case *ast.FuncDecl:
+				node = n.Type
+				prefix = "Type."
+			case *ast.FuncLit:
+				node = n.Type
+				prefix = "Type."
+			}
+
+			if scope := pkg.TypesInfo.Scopes[node]; scope != nil {
+				scopeNames = fmt.Sprintf(" %sScope={%s}",
+					prefix,
+					strings.Join(scope.Names(), ", "))
+			}
+		}
+
 		// TODO(adonovan): turn these into links to highlight the source.
 		start, end := fset.Position(n.Pos()), fset.Position(n.End())
-		fmt.Fprintf(out, "[%d] %T @ %d:%d-%d:%d (#%d-%d)\n",
+		fmt.Fprintf(out, "[%d] %T @ %d:%d-%d:%d (#%d-%d)%s\n",
 			i, n,
 			start.Line, start.Column, end.Line,
-			end.Column, start.Offset, end.Offset)
+			end.Column, start.Offset, end.Offset,
+			scopeNames)
 		if e, ok := n.(ast.Expr); ok && innermostExpr == nil {
 			innermostExpr = e
 		}
@@ -282,7 +309,12 @@ func formatObj(out *strings.Builder, fset *token.FileSet, ref string, obj types.
 	// scope tree
 	fmt.Fprintf(out, "Scopes:\n")
 	for scope := obj.Parent(); scope != nil; scope = scope.Parent() {
-		fmt.Fprintln(out, scope)
+		var (
+			start = fset.Position(scope.Pos())
+			end   = fset.Position(scope.End())
+		)
+		fmt.Fprintf(out, "%d:%d-%d:%d: %s\n",
+			start.Line, start.Column, end.Line, end.Column, scope)
 	}
 }