internal/refactor/inline: work around channel type misformatting

This change adds parens around the type in T(x) conversions where T is a receive-only channel type, as previously it would be misformatted as a receive of a receive. Updates golang/go#63362 Change-Id: I935b5598d4bc3ea57dd52964e8b02005f5e6ef72 Reviewed-on: https://go-review.googlesource.com/c/tools/+/532576 Reviewed-by: Robert Findley <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
golang · Oct 5, 2023 · 2be977e · 2be977e
1 parent 0ba9c84
commit 2be977e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/internal/refactor/inline/falcon.go b/internal/refactor/inline/falcon.go
@@ -610,10 +610,7 @@ func (st *falconState) expr(e ast.Expr) (res any) { // = types.TypeAndValue | as
 			// Possible "value out of range".
 			kX := st.expr(e.Args[0])
 			if kX != nil && isBasic(tv.Type, types.IsConstType) {
-				conv := &ast.CallExpr{
-					Fun:  makeIdent(st.typename(tv.Type)),
-					Args: []ast.Expr{st.toExpr(kX)},
-				}
+				conv := convert(makeIdent(st.typename(tv.Type)), st.toExpr(kX))
 				if is[ast.Expr](kX) {
 					st.emit(conv)
 				}

diff --git a/internal/refactor/inline/inline.go b/internal/refactor/inline/inline.go
@@ -1284,10 +1284,7 @@ next:
 			// a binding decl or when using the literalization
 			// strategy.
 			if len(param.info.Refs) > 0 && !trivialConversion(args[i].typ, params[i].obj) {
-				arg.expr = &ast.CallExpr{
-					Fun:  params[i].fieldType, // formatter adds parens as needed
-					Args: []ast.Expr{arg.expr},
-				}
+				arg.expr = convert(params[i].fieldType, arg.expr)
 				logf("param %q: adding explicit %s -> %s conversion around argument",
 					param.info.Name, args[i].typ, params[i].obj.Type())
 			}

diff --git a/internal/refactor/inline/inline_test.go b/internal/refactor/inline/inline_test.go
@@ -382,6 +382,12 @@ func TestBasics(t *testing.T) {
 	print(s, s, 0, 0)
 }`,
 		},
+		{
+			"Workaround for T(x) misformatting (#63362).",
+			`func f(ch <-chan int) { <-ch }`,
+			`func _(ch chan int) { f(ch) }`,
+			`func _(ch chan int) { <-(<-chan int)(ch) }`,
+		},
 	})
 }
 

diff --git a/internal/refactor/inline/util.go b/internal/refactor/inline/util.go
@@ -103,3 +103,17 @@ func intersects[K comparable, T1, T2 any](x map[K]T1, y map[K]T2) bool {
 	}
 	return false
 }
+
+// convert returns syntax for the conversion T(x).
+func convert(T, x ast.Expr) *ast.CallExpr {
+	// The formatter generally adds parens as needed,
+	// but before go1.22 it had a bug (#63362) for
+	// channel types that requires this workaround.
+	if ch, ok := T.(*ast.ChanType); ok && ch.Dir == ast.RECV {
+		T = &ast.ParenExpr{X: T}
+	}
+	return &ast.CallExpr{
+		Fun:  T,
+		Args: []ast.Expr{x},
+	}
+}