diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 9e86a41f..e43073b4 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -18,6 +18,7 @@ import ( "github.com/go-errors/errors" isatty "github.com/mattn/go-isatty" + "github.com/micro-editor/tcell/v2" lua "github.com/yuin/gopher-lua" "github.com/zyedidia/micro/v2/internal/action" "github.com/zyedidia/micro/v2/internal/buffer" @@ -26,7 +27,6 @@ import ( "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/shell" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" ) var ( diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go index 5470ee0c..31007cb1 100644 --- a/cmd/micro/micro_test.go +++ b/cmd/micro/micro_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/go-errors/errors" + "github.com/micro-editor/tcell/v2" "github.com/stretchr/testify/assert" "github.com/zyedidia/micro/v2/internal/action" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/screen" - "github.com/micro-editor/tcell/v2" ) var tempDir string diff --git a/internal/action/actions.go b/internal/action/actions.go index 4bbc93cf..48469fec 100644 --- a/internal/action/actions.go +++ b/internal/action/actions.go @@ -11,6 +11,7 @@ import ( "time" shellquote "github.com/kballard/go-shellquote" + "github.com/micro-editor/tcell/v2" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/clipboard" "github.com/zyedidia/micro/v2/internal/config" @@ -18,7 +19,6 @@ import ( "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/shell" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" ) // ScrollUp is not an action diff --git a/internal/action/bindings.go b/internal/action/bindings.go index 5283afc8..c8c6afb2 100644 --- a/internal/action/bindings.go +++ b/internal/action/bindings.go @@ -12,10 +12,10 @@ import ( "unicode" "github.com/micro-editor/json5" + "github.com/micro-editor/tcell/v2" "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/util" - "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 index 0161fcc4..da6be701 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -6,6 +6,7 @@ import ( luar "layeh.com/gopher-luar" + "github.com/micro-editor/tcell/v2" lua "github.com/yuin/gopher-lua" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/config" @@ -13,7 +14,6 @@ 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/micro-editor/tcell/v2" ) type BufAction interface{} diff --git a/internal/action/infopane.go b/internal/action/infopane.go index b6207443..4ebb1c0d 100644 --- a/internal/action/infopane.go +++ b/internal/action/infopane.go @@ -3,12 +3,12 @@ package action import ( "bytes" + "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/display" "github.com/zyedidia/micro/v2/internal/info" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" ) type InfoKeyAction func(*InfoPane) diff --git a/internal/action/rawpane.go b/internal/action/rawpane.go index 6d292e9d..6448259c 100644 --- a/internal/action/rawpane.go +++ b/internal/action/rawpane.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" + "github.com/micro-editor/tcell/v2" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/display" - "github.com/micro-editor/tcell/v2" ) type RawPane struct { diff --git a/internal/action/tab.go b/internal/action/tab.go index 1c8d0d71..b813c806 100644 --- a/internal/action/tab.go +++ b/internal/action/tab.go @@ -3,13 +3,13 @@ package action import ( luar "layeh.com/gopher-luar" + "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/display" ulua "github.com/zyedidia/micro/v2/internal/lua" "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/views" - "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 index 5151c8f9..2eea819f 100644 --- a/internal/action/termpane.go +++ b/internal/action/termpane.go @@ -4,13 +4,13 @@ import ( "errors" "runtime" + "github.com/micro-editor/tcell/v2" + "github.com/micro-editor/terminal" "github.com/zyedidia/micro/v2/internal/clipboard" "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/display" "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/shell" - "github.com/micro-editor/tcell/v2" - "github.com/micro-editor/terminal" ) type TermKeyAction func(*TermPane) diff --git a/internal/buffer/message.go b/internal/buffer/message.go index 3b289445..4c8fc35c 100644 --- a/internal/buffer/message.go +++ b/internal/buffer/message.go @@ -1,8 +1,8 @@ package buffer import ( - "github.com/zyedidia/micro/v2/internal/config" "github.com/micro-editor/tcell/v2" + "github.com/zyedidia/micro/v2/internal/config" ) type MsgType int diff --git a/internal/clipboard/terminal.go b/internal/clipboard/terminal.go index 00648b4e..1d5a4be2 100644 --- a/internal/clipboard/terminal.go +++ b/internal/clipboard/terminal.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/zyedidia/micro/v2/internal/screen" "github.com/micro-editor/tcell/v2" + "github.com/zyedidia/micro/v2/internal/screen" ) type terminalClipboard struct{} diff --git a/internal/config/colorscheme_test.go b/internal/config/colorscheme_test.go index 729b4e6a..5aeeeeba 100644 --- a/internal/config/colorscheme_test.go +++ b/internal/config/colorscheme_test.go @@ -3,8 +3,8 @@ package config import ( "testing" - "github.com/stretchr/testify/assert" "github.com/micro-editor/tcell/v2" + "github.com/stretchr/testify/assert" ) func TestSimpleStringToStyle(t *testing.T) { diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go index 63b5d5ff..c10a3b08 100644 --- a/internal/config/plugin_installer.go +++ b/internal/config/plugin_installer.go @@ -13,8 +13,8 @@ import ( "sync" "github.com/blang/semver" - lua "github.com/yuin/gopher-lua" "github.com/micro-editor/json5" + lua "github.com/yuin/gopher-lua" ulua "github.com/zyedidia/micro/v2/internal/lua" "github.com/zyedidia/micro/v2/internal/util" ) diff --git a/internal/config/settings.go b/internal/config/settings.go index 6061e49a..14e5f18b 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/zyedidia/glob" "github.com/micro-editor/json5" + "github.com/zyedidia/glob" "github.com/zyedidia/micro/v2/internal/util" "golang.org/x/text/encoding/htmlindex" ) diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go index a3cbce33..0d83041b 100644 --- a/internal/display/bufwindow.go +++ b/internal/display/bufwindow.go @@ -4,11 +4,11 @@ import ( "strconv" runewidth "github.com/mattn/go-runewidth" + "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" "github.com/zyedidia/micro/v2/internal/util" - "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 index f856ee75..878d40ff 100644 --- a/internal/display/infowindow.go +++ b/internal/display/infowindow.go @@ -2,12 +2,12 @@ package display import ( runewidth "github.com/mattn/go-runewidth" + "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/info" "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" ) type InfoWindow struct { diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go index 9784de90..40d051c6 100644 --- a/internal/display/termwindow.go +++ b/internal/display/termwindow.go @@ -1,13 +1,13 @@ package display import ( + "github.com/micro-editor/tcell/v2" + "github.com/micro-editor/terminal" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/shell" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" - "github.com/micro-editor/terminal" ) type TermWindow struct { diff --git a/internal/screen/screen.go b/internal/screen/screen.go index 99d77444..6855da71 100644 --- a/internal/screen/screen.go +++ b/internal/screen/screen.go @@ -6,9 +6,9 @@ import ( "os" "sync" + "github.com/micro-editor/tcell/v2" "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/util" - "github.com/micro-editor/tcell/v2" ) // Screen is the tcell screen we use to draw to the terminal diff --git a/internal/shell/terminal.go b/internal/shell/terminal.go index ca08c325..150400d3 100644 --- a/internal/shell/terminal.go +++ b/internal/shell/terminal.go @@ -5,9 +5,9 @@ import ( "os/exec" "strconv" + "github.com/micro-editor/terminal" "github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/screen" - "github.com/micro-editor/terminal" ) type TermType int