From 1a9ea6f738cfafab83a5e0e828e60f0bf68bffee Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sun, 14 Jan 2024 17:11:42 +0900 Subject: [PATCH] Remove 'replace' directive for 'go install' compatibility Close #3577 --- go.mod | 5 ++--- go.sum | 7 +++++-- src/options.go | 2 +- src/terminal.go | 2 +- src/tui/light.go | 2 +- src/tui/tcell.go | 2 +- src/util/util.go | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 1fb4938d..d5ff7758 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,8 @@ module github.com/junegunn/fzf require ( github.com/gdamore/tcell/v2 v2.5.4 + github.com/junegunn/go-runewidth v0.0.0-20240114080738-1b95d8d53ad8 github.com/mattn/go-isatty v0.0.17 - github.com/mattn/go-runewidth v0.0.14 github.com/mattn/go-shellwords v1.0.12 github.com/rivo/uniseg v0.4.4 github.com/saracen/walker v0.1.3 @@ -11,11 +11,10 @@ require ( golang.org/x/term v0.16.0 ) -replace github.com/mattn/go-runewidth => github.com/junegunn/go-runewidth v0.0.0-20240107035126-7bd7c14af5de - require ( github.com/gdamore/encoding v1.0.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect golang.org/x/sync v0.5.0 // indirect golang.org/x/text v0.5.0 // indirect ) diff --git a/go.sum b/go.sum index 31d823a2..00432fac 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,17 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell/v2 v2.5.4 h1:TGU4tSjD3sCL788vFNeJnTdzpNKIw1H5dgLnJRQVv/k= github.com/gdamore/tcell/v2 v2.5.4/go.mod h1:dZgRy5v4iMobMEcWNYBtREnDZAT9DYmfqIkrgEMxLyw= -github.com/junegunn/go-runewidth v0.0.0-20240107035126-7bd7c14af5de h1:k3C1QnSBeTR/UiQXAd/pa3+Q9qBLWMbYGSbGY9rQLNY= -github.com/junegunn/go-runewidth v0.0.0-20240107035126-7bd7c14af5de/go.mod h1:0UHkAM+54N73YUsApYbo/TCY6NqlFO1u6TtHSaweqb4= +github.com/junegunn/go-runewidth v0.0.0-20240114080738-1b95d8d53ad8 h1:qcSgFcU7GG0oYYbUzJJvv2AcJRPzjVZLwrL4ZahMpOw= +github.com/junegunn/go-runewidth v0.0.0-20240114080738-1b95d8d53ad8/go.mod h1:Mq6NazeZhIIQPMFoInCi35AktcN/MuW2elHsDK5N52w= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/saracen/walker v0.1.3 h1:YtcKKmpRPy6XJTHJ75J2QYXXZYWnZNQxPCVqZSHVV/g= diff --git a/src/options.go b/src/options.go index 2962f4bb..b2d702d2 100644 --- a/src/options.go +++ b/src/options.go @@ -12,7 +12,7 @@ import ( "github.com/junegunn/fzf/src/tui" "github.com/junegunn/fzf/src/util" - "github.com/mattn/go-runewidth" + "github.com/junegunn/go-runewidth" "github.com/mattn/go-shellwords" ) diff --git a/src/terminal.go b/src/terminal.go index 67f5cedf..77543e25 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - "github.com/mattn/go-runewidth" + "github.com/junegunn/go-runewidth" "github.com/rivo/uniseg" "github.com/junegunn/fzf/src/tui" diff --git a/src/tui/light.go b/src/tui/light.go index a7ff27b7..ae7cc0cb 100644 --- a/src/tui/light.go +++ b/src/tui/light.go @@ -10,7 +10,7 @@ import ( "time" "unicode/utf8" - "github.com/mattn/go-runewidth" + "github.com/junegunn/go-runewidth" "github.com/rivo/uniseg" "golang.org/x/term" diff --git a/src/tui/tcell.go b/src/tui/tcell.go index bcbae7f3..d1180ac7 100644 --- a/src/tui/tcell.go +++ b/src/tui/tcell.go @@ -10,7 +10,7 @@ import ( "github.com/gdamore/tcell/v2/encoding" "github.com/junegunn/fzf/src/util" - "github.com/mattn/go-runewidth" + "github.com/junegunn/go-runewidth" "github.com/rivo/uniseg" ) diff --git a/src/util/util.go b/src/util/util.go index 73f53daf..91884378 100644 --- a/src/util/util.go +++ b/src/util/util.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/junegunn/go-runewidth" "github.com/mattn/go-isatty" - "github.com/mattn/go-runewidth" "github.com/rivo/uniseg" )