import: Use micro-editor/tcell (legacy) instead of zyedidia/tcell (zyedidia#3593)

JoeKar · web-flow · commit 6600430e8861 · 2025-01-04T15:55:46.000+01:00
diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY
@@ -430,7 +430,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 github.com/gdamore/tcell/LICENSE
 ================
-github.com/zyedidia/tcell/LICENSE (fork)
+github.com/micro-editor/tcell/LICENSE (fork)
 ================
 
 
diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
@@ -26,7 +26,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 var (
diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 var tempDir string
diff --git a/go.mod b/go.mod
@@ -7,14 +7,14 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-runewidth v0.0.7
+	github.com/micro-editor/tcell/v2 v2.0.11
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/sergi/go-diff v1.1.0
 	github.com/stretchr/testify v1.4.0
 	github.com/yuin/gopher-lua v1.1.1
 	github.com/zyedidia/clipper v0.1.1
 	github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
 	github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d
-	github.com/zyedidia/tcell/v2 v2.0.10
 	github.com/zyedidia/terminal v0.0.0-20230315200948-4b3bcf6dddef
 	golang.org/x/text v0.3.8
 	gopkg.in/yaml.v2 v2.2.8
@@ -28,7 +28,6 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.1.0 // indirect
-	github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8 // indirect
 	github.com/zyedidia/poller v1.0.1 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -25,6 +25,8 @@ github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tW
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/micro-editor/tcell/v2 v2.0.11 h1:USjdpBSmbocx2yPARbY19KcUSj+ZerScrdmBqGjzoX4=
+github.com/micro-editor/tcell/v2 v2.0.11/go.mod h1:kVYk6NOwYJrboL/7IA7cCupk4o2NzyF/0UMLjeEJN/s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -36,7 +38,6 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8 h1:woqigIZtZUZxws1zZA99nAvuz2mQrxtWsuZSR9c8I/A=
 github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod h1:6Yhx5ZJl5942QrNRWLwITArVT9okUXc5c3brgWJMoDc=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
@@ -54,8 +55,6 @@ github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8
 github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod h1:NDJSTTYWivnza6zkRapeX2/LwhKPEMQ7bJxqgDVT78I=
 github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s=
 github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
-github.com/zyedidia/tcell/v2 v2.0.10 h1:6fbbYAx/DYc9A//4jU1OeBrxtc9qJxYCZXCtGQbtTWU=
-github.com/zyedidia/tcell/v2 v2.0.10/go.mod h1:i4NNlquIQXFeNecrOgxDQQJdu+7LmTi3g62asvmwUws=
 github.com/zyedidia/terminal v0.0.0-20230315200948-4b3bcf6dddef h1:LeB4Qs0Tss4r/Qh8pfsTTqagDYHysfKJLYzAH3MVfu0=
 github.com/zyedidia/terminal v0.0.0-20230315200948-4b3bcf6dddef/go.mod h1:zeb8MJdcCObFKVvur3n2B4BANIPuo2Q8r4iiNs9Enx0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
diff --git a/internal/action/actions.go b/internal/action/actions.go
@@ -18,7 +18,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 // ScrollUp is not an action
diff --git a/internal/action/bindings.go b/internal/action/bindings.go
@@ -14,7 +14,7 @@ import (
 	"github.com/zyedidia/json5"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 var Binder = map[string]func(e Event, action string){
diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go
@@ -13,7 +13,7 @@ import (
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type BufAction interface{}
diff --git a/internal/action/events.go b/internal/action/events.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type Event interface {
diff --git a/internal/action/infopane.go b/internal/action/infopane.go
@@ -8,7 +8,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/info"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type InfoKeyAction func(*InfoPane)
diff --git a/internal/action/keytree.go b/internal/action/keytree.go
@@ -3,7 +3,7 @@ package action
 import (
 	"bytes"
 
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type PaneKeyAction func(Pane) bool
diff --git a/internal/action/rawpane.go b/internal/action/rawpane.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/display"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type RawPane struct {
diff --git a/internal/action/tab.go b/internal/action/tab.go
@@ -9,7 +9,7 @@ import (
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/views"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 // The TabList is a list of tabs and a window to display the tab bar
diff --git a/internal/action/termpane.go b/internal/action/termpane.go
@@ -9,7 +9,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/terminal"
 )
 
diff --git a/internal/buffer/message.go b/internal/buffer/message.go
@@ -2,7 +2,7 @@ package buffer
 
 import (
 	"github.com/zyedidia/micro/v2/internal/config"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type MsgType int
diff --git a/internal/clipboard/terminal.go b/internal/clipboard/terminal.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type terminalClipboard struct{}
diff --git a/internal/config/colorscheme.go b/internal/config/colorscheme.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 // DefStyle is Micro's default style
diff --git a/internal/config/colorscheme_test.go b/internal/config/colorscheme_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 func TestSimpleStringToStyle(t *testing.T) {
diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go
@@ -8,7 +8,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 // The BufWindow provides a way of displaying a certain section of a buffer.
diff --git a/internal/display/infowindow.go b/internal/display/infowindow.go
@@ -7,7 +7,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/info"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 type InfoWindow struct {
diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go
@@ -2,7 +2,7 @@ package display
 
 import (
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go
@@ -6,7 +6,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/terminal"
 )
 
diff --git a/internal/screen/screen.go b/internal/screen/screen.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell/v2"
+	"github.com/micro-editor/tcell/v2"
 )
 
 // Screen is the tcell screen we use to draw to the terminal

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/zyedidia/micro/v2/internal/screen"`
`27`	`27`	`"github.com/zyedidia/micro/v2/internal/shell"`
`28`	`28`	`"github.com/zyedidia/micro/v2/internal/util"`
`29`		`- "github.com/zyedidia/tcell/v2"`
	`29`	`+ "github.com/micro-editor/tcell/v2"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/zyedidia/micro/v2/internal/buffer"`
`13`	`13`	`"github.com/zyedidia/micro/v2/internal/config"`
`14`	`14`	`"github.com/zyedidia/micro/v2/internal/screen"`
`15`		`- "github.com/zyedidia/tcell/v2"`
	`15`	`+ "github.com/micro-editor/tcell/v2"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var tempDir string`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"github.com/zyedidia/micro/v2/internal/screen"`
`19`	`19`	`"github.com/zyedidia/micro/v2/internal/shell"`
`20`	`20`	`"github.com/zyedidia/micro/v2/internal/util"`
`21`		`- "github.com/zyedidia/tcell/v2"`
	`21`	`+ "github.com/micro-editor/tcell/v2"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// ScrollUp is not an action`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/zyedidia/json5"`
`15`	`15`	`"github.com/zyedidia/micro/v2/internal/config"`
`16`	`16`	`"github.com/zyedidia/micro/v2/internal/screen"`
`17`		`- "github.com/zyedidia/tcell/v2"`
	`17`	`+ "github.com/micro-editor/tcell/v2"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`var Binder = map[string]func(e Event, action string){`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`ulua "github.com/zyedidia/micro/v2/internal/lua"`
`14`	`14`	`"github.com/zyedidia/micro/v2/internal/screen"`
`15`	`15`	`"github.com/zyedidia/micro/v2/internal/util"`
`16`		`- "github.com/zyedidia/tcell/v2"`
	`16`	`+ "github.com/micro-editor/tcell/v2"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`type BufAction interface{}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/zyedidia/tcell/v2"`
	`9`	`+ "github.com/micro-editor/tcell/v2"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type Event interface {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/zyedidia/micro/v2/internal/display"`
`9`	`9`	`"github.com/zyedidia/micro/v2/internal/info"`
`10`	`10`	`"github.com/zyedidia/micro/v2/internal/util"`
`11`		`- "github.com/zyedidia/tcell/v2"`
	`11`	`+ "github.com/micro-editor/tcell/v2"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type InfoKeyAction func(*InfoPane)`