tree 4fb9fdab9db61f18cde7bf52861af9eac0c8519e
parent bd5dfbb418a5bf32b879b69ebe164771b55db1f3
author Tim King <taking@google.com> 1671043870 -0800
committer Tim King <taking@google.com> 1675200238 +0000

go/analysis: improve error message on duplicate fixes

Improves the error message on conflicting overlapping fix suggestions.

Example output:
```
conflicting edits from other and rename on /path/example/foo.go

first edits:
--- base
+++ other
@@ -1,8 +1,8 @@
 package other

 func Foo() {
-       bar := 12
+       bbaz := 12
-       _ = bar
+       _ = bbaz
 }

 // the end

second edits:
--- base
+++ rename
@@ -1,8 +1,8 @@
 package other

 func Foo() {
-       bar := 12
+       baz := 12
-       _ = bar
+       _ = baz
 }

 // the end
```

Rewrite of applyFixes to no longer use trees and to consolidate edits by file uniqueness.

Fixes golang/go#56535

Change-Id: Ia683888c51a97a357715796b434c2d6ef92c4fef
Reviewed-on: https://go-review.googlesource.com/c/tools/+/457615
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
Run-TryBot: Tim King <taking@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>