From ab8c242044a7ea3f979bd32d1b1b1d97bb0d065e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Wed, 21 Jan 2026 19:33:13 +0100 Subject: [PATCH] gofmt after renaming the URL --- cmd/micro/micro.go | 4 ++-- cmd/micro/micro_test.go | 4 ++-- internal/action/actions.go | 2 +- internal/action/bindings.go | 2 +- internal/action/bufpane.go | 4 ++-- internal/action/infopane.go | 2 +- internal/action/rawpane.go | 2 +- internal/action/tab.go | 2 +- internal/action/termpane.go | 4 ++-- internal/buffer/buffer.go | 2 +- internal/buffer/buffer_test.go | 4 ++-- internal/buffer/eventhandler.go | 2 +- internal/buffer/message.go | 2 +- internal/clipboard/terminal.go | 2 +- internal/config/plugin.go | 2 +- internal/config/plugin_installer.go | 2 +- internal/config/settings.go | 2 +- internal/display/bufwindow.go | 2 +- internal/display/infowindow.go | 2 +- internal/display/statusline.go | 2 +- internal/display/tabwindow.go | 2 +- internal/display/termwindow.go | 4 ++-- internal/screen/screen.go | 2 +- internal/shell/terminal.go | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 9dbcd1c4..bafb1795 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -18,8 +18,6 @@ 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/micro-editor/micro/v2/internal/action" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/clipboard" @@ -27,6 +25,8 @@ import ( "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/shell" "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/tcell/v2" + lua "github.com/yuin/gopher-lua" ) var ( diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go index 1042d58d..09cad432 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/micro-editor/micro/v2/internal/action" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/tcell/v2" + "github.com/stretchr/testify/assert" ) var tempDir string diff --git a/internal/action/actions.go b/internal/action/actions.go index 40fbe61d..491199f7 100644 --- a/internal/action/actions.go +++ b/internal/action/actions.go @@ -11,7 +11,6 @@ import ( "time" shellquote "github.com/kballard/go-shellquote" - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/clipboard" "github.com/micro-editor/micro/v2/internal/config" @@ -19,6 +18,7 @@ import ( "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/shell" "github.com/micro-editor/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 c3bd058a..555a21b8 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/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/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 22dbce88..df6a20f8 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -6,14 +6,14 @@ import ( luar "layeh.com/gopher-luar" - "github.com/micro-editor/tcell/v2" - lua "github.com/yuin/gopher-lua" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/display" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/tcell/v2" + lua "github.com/yuin/gopher-lua" ) type BufAction any diff --git a/internal/action/infopane.go b/internal/action/infopane.go index 3f39da14..6ecd9552 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/display" "github.com/micro-editor/micro/v2/internal/info" "github.com/micro-editor/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 5852bdf3..e75e8577 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/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 8e9384c5..fa991f3e 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/display" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/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 c66e95c7..4a0d71e9 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/micro-editor/micro/v2/internal/clipboard" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/display" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/tcell/v2" + "github.com/micro-editor/terminal" ) type TermKeyAction func(*TermPane) diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index 8bc1b295..2735ca46 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -17,12 +17,12 @@ import ( luar "layeh.com/gopher-luar" - dmp "github.com/sergi/go-diff/diffmatchpatch" "github.com/micro-editor/micro/v2/internal/config" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/micro/v2/pkg/highlight" + dmp "github.com/sergi/go-diff/diffmatchpatch" "golang.org/x/text/encoding" "golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/unicode" diff --git a/internal/buffer/buffer_test.go b/internal/buffer/buffer_test.go index 6f79872f..6f3d5ce7 100644 --- a/internal/buffer/buffer_test.go +++ b/internal/buffer/buffer_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - lua "github.com/yuin/gopher-lua" "github.com/micro-editor/micro/v2/internal/config" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/util" + "github.com/stretchr/testify/assert" + lua "github.com/yuin/gopher-lua" ) type operation struct { diff --git a/internal/buffer/eventhandler.go b/internal/buffer/eventhandler.go index f0c90aa5..87b2a73a 100644 --- a/internal/buffer/eventhandler.go +++ b/internal/buffer/eventhandler.go @@ -4,11 +4,11 @@ import ( "bytes" "time" - dmp "github.com/sergi/go-diff/diffmatchpatch" "github.com/micro-editor/micro/v2/internal/config" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" + dmp "github.com/sergi/go-diff/diffmatchpatch" luar "layeh.com/gopher-luar" ) diff --git a/internal/buffer/message.go b/internal/buffer/message.go index 4cb57aa2..b2ab4e34 100644 --- a/internal/buffer/message.go +++ b/internal/buffer/message.go @@ -1,8 +1,8 @@ package buffer import ( - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/tcell/v2" ) type MsgType int diff --git a/internal/clipboard/terminal.go b/internal/clipboard/terminal.go index 64d30031..fac159cd 100644 --- a/internal/clipboard/terminal.go +++ b/internal/clipboard/terminal.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/tcell/v2" ) type terminalClipboard struct{} diff --git a/internal/config/plugin.go b/internal/config/plugin.go index a16e0387..931e773e 100644 --- a/internal/config/plugin.go +++ b/internal/config/plugin.go @@ -4,8 +4,8 @@ import ( "errors" "log" - lua "github.com/yuin/gopher-lua" ulua "github.com/micro-editor/micro/v2/internal/lua" + lua "github.com/yuin/gopher-lua" ) // ErrNoSuchFunction is returned when Call is executed on a function that does not exist diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go index 880ac6c1..ea14e42b 100644 --- a/internal/config/plugin_installer.go +++ b/internal/config/plugin_installer.go @@ -14,9 +14,9 @@ import ( "github.com/blang/semver" "github.com/micro-editor/json5" - lua "github.com/yuin/gopher-lua" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/util" + lua "github.com/yuin/gopher-lua" ) var ( diff --git a/internal/config/settings.go b/internal/config/settings.go index 7182e9f9..b7097087 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/micro-editor/json5" - "github.com/zyedidia/glob" "github.com/micro-editor/micro/v2/internal/util" + "github.com/zyedidia/glob" "golang.org/x/text/encoding/htmlindex" ) diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go index 186fe0c0..2a317a51 100644 --- a/internal/display/bufwindow.go +++ b/internal/display/bufwindow.go @@ -5,11 +5,11 @@ import ( "strings" runewidth "github.com/mattn/go-runewidth" - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/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 03d15d48..39ca7277 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/info" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/tcell/v2" ) type InfoWindow struct { diff --git a/internal/display/statusline.go b/internal/display/statusline.go index 808a09df..3500355b 100644 --- a/internal/display/statusline.go +++ b/internal/display/statusline.go @@ -10,12 +10,12 @@ import ( luar "layeh.com/gopher-luar" runewidth "github.com/mattn/go-runewidth" - lua "github.com/yuin/gopher-lua" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" ulua "github.com/micro-editor/micro/v2/internal/lua" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" + lua "github.com/yuin/gopher-lua" ) // StatusLine represents the information line at the bottom diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go index 9d7f26b4..ad57963b 100644 --- a/internal/display/tabwindow.go +++ b/internal/display/tabwindow.go @@ -2,11 +2,11 @@ package display import ( runewidth "github.com/mattn/go-runewidth" - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/tcell/v2" ) type TabWindow struct { diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go index a87a464c..0dcea5a8 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/micro/v2/internal/shell" "github.com/micro-editor/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 938342c6..4b2c5642 100644 --- a/internal/screen/screen.go +++ b/internal/screen/screen.go @@ -6,8 +6,8 @@ import ( "os" "sync" - "github.com/micro-editor/tcell/v2" "github.com/micro-editor/micro/v2/internal/config" + "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 76d590f8..e348f57a 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/micro-editor/micro/v2/internal/buffer" "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/terminal" ) type TermType int