go.mod: require go-delve/liner instead of peterh/liner (#2905)

Use of `replace` in go.mod breaks delve installation using `go install`. (see golang/go#40276) Workaround this limitation by explicitly require the fork github.com/go-delve/liner. go-delve/[email protected] already has go.mod module name fixed to be github.com/go-delve/liner. Fixes #2904
go-delve · Feb 14, 2022 · cec23c0 · cec23c0
1 parent dee4437
commit cec23c0
Show file tree

Hide file tree

Showing 45 changed files with 2,612 additions and 1,066 deletions.
diff --git a/_fixtures/issue528.go b/_fixtures/issue528.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/peterh/liner"
+	"github.com/go-delve/liner"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -2,18 +2,17 @@ module github.com/go-delve/delve
 
 go 1.16
 
-replace github.com/peterh/liner v1.2.2 => github.com/go-delve/liner v1.2.2-1
-
 require (
 	github.com/cilium/ebpf v0.7.0
 	github.com/cosiner/argv v0.1.0
 	github.com/creack/pty v1.1.9
 	github.com/derekparker/trie v0.0.0-20200317170641-1fdf38b7b0e9
+	github.com/go-delve/liner v1.2.2-1
 	github.com/google/go-dap v0.6.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/mattn/go-colorable v0.0.9
 	github.com/mattn/go-isatty v0.0.3
-	github.com/peterh/liner v1.2.2
+	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.1.3
 	github.com/stretchr/testify v1.7.0 // indirect

diff --git a/go.sum b/go.sum
@@ -135,8 +135,9 @@ github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRU
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -167,6 +168,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=

diff --git a/pkg/terminal/starbind/repl.go b/pkg/terminal/starbind/repl.go
@@ -41,7 +41,7 @@ import (
 	"go.starlark.net/starlark"
 	"go.starlark.net/syntax"
 
-	"github.com/peterh/liner"
+	"github.com/go-delve/liner"
 )
 
 // REPL executes a read, eval, print loop.

diff --git a/pkg/terminal/terminal.go b/pkg/terminal/terminal.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 
 	"github.com/derekparker/trie"
-	"github.com/peterh/liner"
+	"github.com/go-delve/liner"
 
 	"github.com/go-delve/delve/pkg/config"
 	"github.com/go-delve/delve/pkg/locspec"

diff --git a/vendor/github.com/peterh/liner/COPYING → vendor/github.com/go-delve/liner/COPYING b/vendor/github.com/peterh/liner/COPYING → vendor/github.com/go-delve/liner/COPYING
diff --git a/vendor/github.com/peterh/liner/README.md → vendor/github.com/go-delve/liner/README.md b/vendor/github.com/peterh/liner/README.md → vendor/github.com/go-delve/liner/README.md
diff --git a/vendor/github.com/peterh/liner/bsdinput.go → vendor/github.com/go-delve/liner/bsdinput.go b/vendor/github.com/peterh/liner/bsdinput.go → vendor/github.com/go-delve/liner/bsdinput.go
diff --git a/vendor/github.com/peterh/liner/common.go → vendor/github.com/go-delve/liner/common.go b/vendor/github.com/peterh/liner/common.go → vendor/github.com/go-delve/liner/common.go
diff --git a/.../github.com/peterh/liner/fallbackinput.go → ...ithub.com/go-delve/liner/fallbackinput.go b/.../github.com/peterh/liner/fallbackinput.go → ...ithub.com/go-delve/liner/fallbackinput.go
diff --git a/vendor/github.com/peterh/liner/go.mod → vendor/github.com/go-delve/liner/go.mod b/vendor/github.com/peterh/liner/go.mod → vendor/github.com/go-delve/liner/go.mod
diff --git a/vendor/github.com/peterh/liner/go.sum → vendor/github.com/go-delve/liner/go.sum b/vendor/github.com/peterh/liner/go.sum → vendor/github.com/go-delve/liner/go.sum
diff --git a/vendor/github.com/peterh/liner/input.go → vendor/github.com/go-delve/liner/input.go b/vendor/github.com/peterh/liner/input.go → vendor/github.com/go-delve/liner/input.go
diff --git a/...r/github.com/peterh/liner/input_darwin.go → ...github.com/go-delve/liner/input_darwin.go b/...r/github.com/peterh/liner/input_darwin.go → ...github.com/go-delve/liner/input_darwin.go
diff --git a/...or/github.com/peterh/liner/input_linux.go → .../github.com/go-delve/liner/input_linux.go b/...or/github.com/peterh/liner/input_linux.go → .../github.com/go-delve/liner/input_linux.go
diff --git a/.../github.com/peterh/liner/input_solaris.go → ...ithub.com/go-delve/liner/input_solaris.go b/.../github.com/peterh/liner/input_solaris.go → ...ithub.com/go-delve/liner/input_solaris.go
diff --git a/.../github.com/peterh/liner/input_windows.go → ...ithub.com/go-delve/liner/input_windows.go b/.../github.com/peterh/liner/input_windows.go → ...ithub.com/go-delve/liner/input_windows.go
diff --git a/vendor/github.com/peterh/liner/line.go → vendor/github.com/go-delve/liner/line.go b/vendor/github.com/peterh/liner/line.go → vendor/github.com/go-delve/liner/line.go
diff --git a/vendor/github.com/peterh/liner/output.go → vendor/github.com/go-delve/liner/output.go b/vendor/github.com/peterh/liner/output.go → vendor/github.com/go-delve/liner/output.go
diff --git a/...github.com/peterh/liner/output_solaris.go → ...thub.com/go-delve/liner/output_solaris.go b/...github.com/peterh/liner/output_solaris.go → ...thub.com/go-delve/liner/output_solaris.go
diff --git a/...or/github.com/peterh/liner/output_unix.go → .../github.com/go-delve/liner/output_unix.go b/...or/github.com/peterh/liner/output_unix.go → .../github.com/go-delve/liner/output_unix.go
diff --git a/...github.com/peterh/liner/output_windows.go → ...thub.com/go-delve/liner/output_windows.go b/...github.com/peterh/liner/output_windows.go → ...thub.com/go-delve/liner/output_windows.go
diff --git a/...or/github.com/peterh/liner/signal_unix.go → .../github.com/go-delve/liner/signal_unix.go b/...or/github.com/peterh/liner/signal_unix.go → .../github.com/go-delve/liner/signal_unix.go
diff --git a/...github.com/peterh/liner/signal_windows.go → ...thub.com/go-delve/liner/signal_windows.go b/...github.com/peterh/liner/signal_windows.go → ...thub.com/go-delve/liner/signal_windows.go
diff --git a/vendor/github.com/peterh/liner/unixmode.go → vendor/github.com/go-delve/liner/unixmode.go b/vendor/github.com/peterh/liner/unixmode.go → vendor/github.com/go-delve/liner/unixmode.go
diff --git a/...thub.com/peterh/liner/unixmode_solaris.go → ...ub.com/go-delve/liner/unixmode_solaris.go b/...thub.com/peterh/liner/unixmode_solaris.go → ...ub.com/go-delve/liner/unixmode_solaris.go
diff --git a/vendor/github.com/peterh/liner/width.go → vendor/github.com/go-delve/liner/width.go b/vendor/github.com/peterh/liner/width.go → vendor/github.com/go-delve/liner/width.go
diff --git a/vendor/github.com/mattn/go-runewidth/.travis.yml b/vendor/github.com/mattn/go-runewidth/.travis.yml
diff --git a/.../github.com/mattn/go-runewidth/README.mkd → ...r/github.com/mattn/go-runewidth/README.md b/.../github.com/mattn/go-runewidth/README.mkd → ...r/github.com/mattn/go-runewidth/README.md
diff --git a/vendor/github.com/mattn/go-runewidth/go.mod b/vendor/github.com/mattn/go-runewidth/go.mod
diff --git a/vendor/github.com/mattn/go-runewidth/go.sum b/vendor/github.com/mattn/go-runewidth/go.sum
diff --git a/vendor/github.com/mattn/go-runewidth/go.test.sh b/vendor/github.com/mattn/go-runewidth/go.test.sh