gopls/internal/golang: add test for (unfixed) issue 65098

The test confirms the reported problematic behavior,
and investigation shows it to be (as suspected) a dup of

Also, a couple of minor cleanups from static analyzers.

Updates golang/go#58461
Updates golang/go#65098

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

Author: adonovan

gopls/internal/golang/rename.go

@@ -54,6 +54,7 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -169,13 +170,7 @@ func PrepareRename(ctx context.Context, snapshot *cache.Snapshot, f file.Handle,
 
 func prepareRenamePackageName(ctx context.Context, snapshot *cache.Snapshot, pgf *parsego.File) (*PrepareItem, error) {
 	// Does the client support file renaming?
-	fileRenameSupported := false
-	for _, op := range snapshot.Options().SupportedResourceOperations {
-		if op == protocol.Rename {
-			fileRenameSupported = true
-			break
-		}
-	}
+	fileRenameSupported := slices.Contains(snapshot.Options().SupportedResourceOperations, protocol.Rename)
 	if !fileRenameSupported {
 		return nil, errors.New("can't rename package: LSP client does not support file renaming")
 	}
@@ -438,13 +433,7 @@ func Rename(ctx context.Context, snapshot *cache.Snapshot, f file.Handle, pp pro
 		// become reordered) and that are either identical or
 		// non-overlapping.
 		diff.SortEdits(edits)
-		filtered := edits[:0]
-		for i, edit := range edits {
-			if i == 0 || edit != filtered[len(filtered)-1] {
-				filtered = append(filtered, edit)
-			}
-		}
-		edits = filtered
+		edits = slices.Compact(edits)
 
 		// TODO(adonovan): the logic above handles repeat edits to the
 		// same file URI (e.g. as a member of package p and p_test) but
@@ -541,15 +530,15 @@ func renameOrdinary(ctx context.Context, snapshot *cache.Snapshot, f file.Handle
 		//
 		// Note that unlike Funcs, TypeNames are always canonical (they are "left"
 		// of the type parameters, unlike methods).
-		switch obj.(type) { // avoid "obj :=" since cases reassign the var
+		switch obj0 := obj.(type) { // avoid "obj :=" since cases reassign the var
 		case *types.TypeName:
 			if _, ok := types.Unalias(obj.Type()).(*types.TypeParam); ok {
 				// As with capitalized function parameters below, type parameters are
 				// local.
 				goto skipObjectPath
 			}
 		case *types.Func:
-			obj = obj.(*types.Func).Origin()
+			obj = obj0.Origin()
 		case *types.Var:
 			// TODO(adonovan): do vars need the origin treatment too? (issue #58462)
 
@@ -563,7 +552,7 @@ func renameOrdinary(ctx context.Context, snapshot *cache.Snapshot, f file.Handle
 			// objectpath, the classifies them as local vars, but as
 			// they came from export data they lack syntax and the
 			// correct scope tree (issue #61294).
-			if !obj.(*types.Var).IsField() && !typesinternal.IsPackageLevel(obj) {
+			if !obj0.IsField() && !typesinternal.IsPackageLevel(obj) {
 				goto skipObjectPath
 			}
 		}

gopls/internal/test/marker/testdata/rename/issue65098.txt

@@ -0,0 +1,49 @@
+This is a test for issue 65098: a renaming in package a does not
+propagate to package b, even though the two packages are coupled via
+an assignment in c, which is renamed.
+
+     c
+    / \
+   a   b
+
+The bug (a dup of #58461) is not yet fixed, so the golden file records
+the wrong behavior (i.e. no changes to package b).
+TODO(adonovan): fix.
+
+-- go.mod --
+module example.com
+go 1.12
+
+-- a/a.go --
+package a
+
+type I interface {
+	F() //@ rename("F", "FF", fToFF)
+}
+
+-- b/b.go --
+package b
+
+type S struct{}
+
+func (s S) F() {}
+
+-- c/c.go --
+package c
+
+import (
+	"example.com/a"
+	"example.com/b"
+)
+
+var _ a.I = b.S{}
+var _ = a.I.F
+
+-- @fToFF/a/a.go --
+@@ -4 +4 @@
+-	F() //@ rename("F", "FF", fToFF)
++	FF() //@ rename("F", "FF", fToFF)
+-- @fToFF/c/c.go --
+@@ -9 +9 @@
+-var _ = a.I.F
++var _ = a.I.FF

gopls/internal/test/marker/testdata/rename/methods.txt

@@ -1,8 +1,5 @@
 This test exercises renaming of interface methods.
 
-The golden is currently wrong due to https://github.com/golang/go/issues/58506:
-the reference to B.F in package b should be renamed too.
-
 -- go.mod --
 module example.com
 go 1.12
@@ -25,6 +22,8 @@ type B interface { F() } //@rename("F", "G", BfToG)
 var _ B = a.A(0)
 var _ B = c.C(0)
 
+var _ = B.F
+
 -- c/c.go --
 package c
 
@@ -47,6 +46,9 @@ b/b.go:6:20:	(rename example.com/b.B.F if you intend to change both types)
 @@ -6 +6 @@
 -type B interface { F() } //@rename("F", "G", BfToG)
 +type B interface { G() } //@rename("F", "G", BfToG)
+@@ -11 +11 @@
+-var _ = B.F
++var _ = B.G
 -- @BfToG/d/d.go --
 @@ -5 +5 @@
 -var _ = b.B.F