From eff89a98a7fb16afc920cd8d26a80061378f5f46 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Mon, 4 May 2020 10:16:15 -0400 Subject: [PATCH] Fix v2 import path for go mod --- cmd/micro/clean.go | 4 ++-- cmd/micro/debug.go | 2 +- cmd/micro/initlua.go | 16 ++++++++-------- cmd/micro/micro.go | 12 ++++++------ go.mod | 2 +- internal/action/actions.go | 10 +++++----- internal/action/actions_posix.go | 2 +- internal/action/bindings.go | 4 ++-- internal/action/bufpane.go | 10 +++++----- internal/action/command.go | 10 +++++----- internal/action/globals.go | 2 +- internal/action/infocomplete.go | 6 +++--- internal/action/infopane.go | 8 ++++---- internal/action/pane.go | 2 +- internal/action/rawpane.go | 4 ++-- internal/action/tab.go | 10 +++++----- internal/action/terminal_supported.go | 2 +- internal/action/termpane.go | 6 +++--- internal/buffer/autocomplete.go | 2 +- internal/buffer/backup.go | 6 +++--- internal/buffer/buffer.go | 10 +++++----- internal/buffer/buffer_test.go | 2 +- internal/buffer/cursor.go | 2 +- internal/buffer/eventhandler.go | 6 +++--- internal/buffer/line_array.go | 2 +- internal/buffer/loc.go | 2 +- internal/buffer/message.go | 2 +- internal/buffer/save.go | 6 +++--- internal/buffer/search.go | 2 +- internal/buffer/serialize.go | 4 ++-- internal/buffer/settings.go | 4 ++-- internal/config/plugin.go | 2 +- internal/config/plugin_installer.go | 4 ++-- internal/config/settings.go | 2 +- internal/display/bufwindow.go | 8 ++++---- internal/display/infowindow.go | 10 +++++----- internal/display/statusline.go | 10 +++++----- internal/display/tabwindow.go | 8 ++++---- internal/display/termwindow.go | 8 ++++---- internal/display/uiwindow.go | 8 ++++---- internal/display/window.go | 2 +- internal/info/history.go | 2 +- internal/info/infobuffer.go | 2 +- internal/screen/screen.go | 4 ++-- internal/shell/shell.go | 2 +- internal/shell/terminal.go | 4 ++-- 46 files changed, 119 insertions(+), 119 deletions(-) diff --git a/cmd/micro/clean.go b/cmd/micro/clean.go index cfa65336..167f25a1 100644 --- a/cmd/micro/clean.go +++ b/cmd/micro/clean.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" + "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/zyedidia/micro/v2/internal/config" ) func shouldContinue() bool { diff --git a/cmd/micro/debug.go b/cmd/micro/debug.go index 7c13d9ce..5dc708ab 100644 --- a/cmd/micro/debug.go +++ b/cmd/micro/debug.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/util" ) // NullWriter simply sends writes into the void diff --git a/cmd/micro/initlua.go b/cmd/micro/initlua.go index ebac4ac5..01aee384 100644 --- a/cmd/micro/initlua.go +++ b/cmd/micro/initlua.go @@ -6,14 +6,14 @@ import ( lua "github.com/yuin/gopher-lua" luar "layeh.com/gopher-luar" - "github.com/zyedidia/micro/internal/action" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/display" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" - "github.com/zyedidia/micro/internal/util" + "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/display" + ulua "github.com/zyedidia/micro/v2/internal/lua" + "github.com/zyedidia/micro/v2/internal/screen" + "github.com/zyedidia/micro/v2/internal/shell" + "github.com/zyedidia/micro/v2/internal/util" ) func init() { diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 06024975..45e0e25b 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -13,12 +13,12 @@ import ( "github.com/go-errors/errors" isatty "github.com/mattn/go-isatty" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/internal/action" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" - "github.com/zyedidia/micro/internal/util" + "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/zyedidia/micro/v2/internal/shell" + "github.com/zyedidia/micro/v2/internal/util" "github.com/zyedidia/tcell" ) diff --git a/go.mod b/go.mod index dd775dae..422d11b9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/zyedidia/micro +module github.com/zyedidia/micro/v2 require ( github.com/blang/semver v3.5.1+incompatible diff --git a/internal/action/actions.go b/internal/action/actions.go index a482dac0..1147d6db 100644 --- a/internal/action/actions.go +++ b/internal/action/actions.go @@ -9,11 +9,11 @@ import ( shellquote "github.com/kballard/go-shellquote" "github.com/zyedidia/clipboard" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" - "github.com/zyedidia/micro/internal/util" + "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/zyedidia/tcell" ) diff --git a/internal/action/actions_posix.go b/internal/action/actions_posix.go index 1b69d943..15bc0aa1 100644 --- a/internal/action/actions_posix.go +++ b/internal/action/actions_posix.go @@ -5,7 +5,7 @@ package action import ( "syscall" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/screen" ) // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs. diff --git a/internal/action/bindings.go b/internal/action/bindings.go index 73f17886..247202f3 100644 --- a/internal/action/bindings.go +++ b/internal/action/bindings.go @@ -10,8 +10,8 @@ import ( "unicode" "github.com/zyedidia/json5" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/tcell" ) diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go index bb9fc827..0daf8afd 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -7,11 +7,11 @@ import ( luar "layeh.com/gopher-luar" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/display" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/screen" + "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/tcell" ) diff --git a/internal/action/command.go b/internal/action/command.go index 78508023..1218bc42 100644 --- a/internal/action/command.go +++ b/internal/action/command.go @@ -13,11 +13,11 @@ import ( "unicode/utf8" shellquote "github.com/kballard/go-shellquote" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" - "github.com/zyedidia/micro/internal/util" + "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" ) // A Command contains information about how to execute a command diff --git a/internal/action/globals.go b/internal/action/globals.go index 7de14d5f..4a3b8375 100644 --- a/internal/action/globals.go +++ b/internal/action/globals.go @@ -1,6 +1,6 @@ package action -import "github.com/zyedidia/micro/internal/buffer" +import "github.com/zyedidia/micro/v2/internal/buffer" var InfoBar *InfoPane var LogBufPane *BufPane diff --git a/internal/action/infocomplete.go b/internal/action/infocomplete.go index d6c16cb2..f39dfbda 100644 --- a/internal/action/infocomplete.go +++ b/internal/action/infocomplete.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/util" ) // This file is meant (for now) for autocompletion in command mode, not diff --git a/internal/action/infopane.go b/internal/action/infopane.go index e180c37f..c72c9ebd 100644 --- a/internal/action/infopane.go +++ b/internal/action/infopane.go @@ -4,10 +4,10 @@ import ( "bytes" "strings" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/display" - "github.com/zyedidia/micro/internal/info" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/buffer" + "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" ) diff --git a/internal/action/pane.go b/internal/action/pane.go index bcf1767e..4c919479 100644 --- a/internal/action/pane.go +++ b/internal/action/pane.go @@ -1,7 +1,7 @@ package action import ( - "github.com/zyedidia/micro/internal/display" + "github.com/zyedidia/micro/v2/internal/display" ) type Pane interface { diff --git a/internal/action/rawpane.go b/internal/action/rawpane.go index db6e9171..059679dc 100644 --- a/internal/action/rawpane.go +++ b/internal/action/rawpane.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/display" + "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/zyedidia/micro/v2/internal/display" "github.com/zyedidia/tcell" ) diff --git a/internal/action/tab.go b/internal/action/tab.go index 9e273772..9d5d82be 100644 --- a/internal/action/tab.go +++ b/internal/action/tab.go @@ -1,11 +1,11 @@ package action import ( - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/display" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/views" + "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/screen" + "github.com/zyedidia/micro/v2/internal/views" "github.com/zyedidia/tcell" ) diff --git a/internal/action/terminal_supported.go b/internal/action/terminal_supported.go index cb5cc3dc..bb978a15 100644 --- a/internal/action/terminal_supported.go +++ b/internal/action/terminal_supported.go @@ -4,7 +4,7 @@ package action import ( shellquote "github.com/kballard/go-shellquote" - "github.com/zyedidia/micro/internal/shell" + "github.com/zyedidia/micro/v2/internal/shell" ) // TermEmuSupported is a constant that marks if the terminal emulator is supported diff --git a/internal/action/termpane.go b/internal/action/termpane.go index 7fc0b8d1..8c75d04b 100644 --- a/internal/action/termpane.go +++ b/internal/action/termpane.go @@ -5,9 +5,9 @@ import ( "runtime" "github.com/zyedidia/clipboard" - "github.com/zyedidia/micro/internal/display" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" + "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" "github.com/zyedidia/terminal" ) diff --git a/internal/buffer/autocomplete.go b/internal/buffer/autocomplete.go index 1e5a7fc3..3bb4d307 100644 --- a/internal/buffer/autocomplete.go +++ b/internal/buffer/autocomplete.go @@ -8,7 +8,7 @@ import ( "strings" "unicode/utf8" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/util" ) // A Completer is a function that takes a buffer and returns info diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go index 56308843..bf5e6b71 100644 --- a/internal/buffer/backup.go +++ b/internal/buffer/backup.go @@ -7,9 +7,9 @@ import ( "path/filepath" "time" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/screen" + "github.com/zyedidia/micro/v2/internal/util" "golang.org/x/text/encoding" ) diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index fc74efe5..52fa262c 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -20,11 +20,11 @@ import ( luar "layeh.com/gopher-luar" dmp "github.com/sergi/go-diff/diffmatchpatch" - "github.com/zyedidia/micro/internal/config" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" - "github.com/zyedidia/micro/pkg/highlight" + "github.com/zyedidia/micro/v2/internal/config" + 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/micro/v2/pkg/highlight" "golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" diff --git a/internal/buffer/buffer_test.go b/internal/buffer/buffer_test.go index 15418fe3..ea017156 100644 --- a/internal/buffer/buffer_test.go +++ b/internal/buffer/buffer_test.go @@ -7,7 +7,7 @@ import ( testifyAssert "github.com/stretchr/testify/assert" lua "github.com/yuin/gopher-lua" - ulua "github.com/zyedidia/micro/internal/lua" + ulua "github.com/zyedidia/micro/v2/internal/lua" ) type operation struct { diff --git a/internal/buffer/cursor.go b/internal/buffer/cursor.go index 6ea9a3d1..0d1b9d84 100644 --- a/internal/buffer/cursor.go +++ b/internal/buffer/cursor.go @@ -4,7 +4,7 @@ import ( "unicode/utf8" "github.com/zyedidia/clipboard" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/util" ) // InBounds returns whether the given location is a valid character position in the given buffer diff --git a/internal/buffer/eventhandler.go b/internal/buffer/eventhandler.go index 4731ba98..4ce30241 100644 --- a/internal/buffer/eventhandler.go +++ b/internal/buffer/eventhandler.go @@ -6,9 +6,9 @@ import ( "unicode/utf8" dmp "github.com/sergi/go-diff/diffmatchpatch" - "github.com/zyedidia/micro/internal/config" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/config" + ulua "github.com/zyedidia/micro/v2/internal/lua" + "github.com/zyedidia/micro/v2/internal/screen" luar "layeh.com/gopher-luar" ) diff --git a/internal/buffer/line_array.go b/internal/buffer/line_array.go index 1452d39b..48ee1d15 100644 --- a/internal/buffer/line_array.go +++ b/internal/buffer/line_array.go @@ -7,7 +7,7 @@ import ( "sync" "unicode/utf8" - "github.com/zyedidia/micro/pkg/highlight" + "github.com/zyedidia/micro/v2/pkg/highlight" ) // Finds the byte index of the nth rune in a byte slice diff --git a/internal/buffer/loc.go b/internal/buffer/loc.go index 16a62f9b..ce55f468 100644 --- a/internal/buffer/loc.go +++ b/internal/buffer/loc.go @@ -3,7 +3,7 @@ package buffer import ( "unicode/utf8" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/util" ) // Loc stores a location diff --git a/internal/buffer/message.go b/internal/buffer/message.go index ad7e6560..ce3d4547 100644 --- a/internal/buffer/message.go +++ b/internal/buffer/message.go @@ -1,7 +1,7 @@ package buffer import ( - "github.com/zyedidia/micro/internal/config" + "github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/tcell" ) diff --git a/internal/buffer/save.go b/internal/buffer/save.go index 6f07ea6c..25b1f385 100644 --- a/internal/buffer/save.go +++ b/internal/buffer/save.go @@ -13,9 +13,9 @@ import ( "unicode" "unicode/utf8" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/screen" + "github.com/zyedidia/micro/v2/internal/util" "golang.org/x/text/encoding" "golang.org/x/text/encoding/htmlindex" "golang.org/x/text/transform" diff --git a/internal/buffer/search.go b/internal/buffer/search.go index d537347a..9550c01a 100644 --- a/internal/buffer/search.go +++ b/internal/buffer/search.go @@ -4,7 +4,7 @@ import ( "regexp" "unicode/utf8" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/util" ) func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) { diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go index 79c21f6e..c6a7c742 100644 --- a/internal/buffer/serialize.go +++ b/internal/buffer/serialize.go @@ -10,8 +10,8 @@ import ( "golang.org/x/text/encoding" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/util" ) // The SerializedBuffer holds the types that get serialized when a buffer is saved diff --git a/internal/buffer/settings.go b/internal/buffer/settings.go index 52abd2f4..156d842f 100644 --- a/internal/buffer/settings.go +++ b/internal/buffer/settings.go @@ -1,8 +1,8 @@ package buffer import ( - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/screen" ) func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error { diff --git a/internal/config/plugin.go b/internal/config/plugin.go index 9dceb60b..2642cfbd 100644 --- a/internal/config/plugin.go +++ b/internal/config/plugin.go @@ -5,7 +5,7 @@ import ( "log" lua "github.com/yuin/gopher-lua" - ulua "github.com/zyedidia/micro/internal/lua" + ulua "github.com/zyedidia/micro/v2/internal/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 14622623..8d4a716e 100644 --- a/internal/config/plugin_installer.go +++ b/internal/config/plugin_installer.go @@ -16,8 +16,8 @@ import ( "github.com/blang/semver" lua "github.com/yuin/gopher-lua" "github.com/zyedidia/json5" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/util" + ulua "github.com/zyedidia/micro/v2/internal/lua" + "github.com/zyedidia/micro/v2/internal/util" ) var ( diff --git a/internal/config/settings.go b/internal/config/settings.go index 5f5694e2..0c24987b 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -12,7 +12,7 @@ import ( "github.com/zyedidia/glob" "github.com/zyedidia/json5" - "github.com/zyedidia/micro/internal/util" + "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 a33875f3..fe7b8631 100644 --- a/internal/display/bufwindow.go +++ b/internal/display/bufwindow.go @@ -5,10 +5,10 @@ import ( "unicode/utf8" runewidth "github.com/mattn/go-runewidth" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "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/zyedidia/tcell" ) diff --git a/internal/display/infowindow.go b/internal/display/infowindow.go index e0d035cd..e3c09670 100644 --- a/internal/display/infowindow.go +++ b/internal/display/infowindow.go @@ -4,11 +4,11 @@ import ( "unicode/utf8" runewidth "github.com/mattn/go-runewidth" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/info" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "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/zyedidia/tcell" ) diff --git a/internal/display/statusline.go b/internal/display/statusline.go index c84215db..19ab77f6 100644 --- a/internal/display/statusline.go +++ b/internal/display/statusline.go @@ -12,11 +12,11 @@ import ( runewidth "github.com/mattn/go-runewidth" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - ulua "github.com/zyedidia/micro/internal/lua" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/zyedidia/micro/v2/internal/config" + ulua "github.com/zyedidia/micro/v2/internal/lua" + "github.com/zyedidia/micro/v2/internal/screen" + "github.com/zyedidia/micro/v2/internal/util" ) // StatusLine represents the information line at the bottom diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go index 94bdc23a..c16747a3 100644 --- a/internal/display/tabwindow.go +++ b/internal/display/tabwindow.go @@ -4,10 +4,10 @@ import ( "unicode/utf8" runewidth "github.com/mattn/go-runewidth" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/util" + "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" ) type TabWindow struct { diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go index c7d82ecb..256cf540 100644 --- a/internal/display/termwindow.go +++ b/internal/display/termwindow.go @@ -3,10 +3,10 @@ package display import ( "unicode/utf8" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/shell" + "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/tcell" "github.com/zyedidia/terminal" ) diff --git a/internal/display/uiwindow.go b/internal/display/uiwindow.go index ff59718f..90d6763d 100644 --- a/internal/display/uiwindow.go +++ b/internal/display/uiwindow.go @@ -1,10 +1,10 @@ package display import ( - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/screen" - "github.com/zyedidia/micro/internal/views" + "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/views" ) type UIWindow struct { diff --git a/internal/display/window.go b/internal/display/window.go index bed538c5..56787fff 100644 --- a/internal/display/window.go +++ b/internal/display/window.go @@ -1,7 +1,7 @@ package display import ( - "github.com/zyedidia/micro/internal/buffer" + "github.com/zyedidia/micro/v2/internal/buffer" ) type View struct { diff --git a/internal/info/history.go b/internal/info/history.go index 8668de10..03391b74 100644 --- a/internal/info/history.go +++ b/internal/info/history.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/zyedidia/micro/internal/config" + "github.com/zyedidia/micro/v2/internal/config" ) // LoadHistory attempts to load user history from configDir/buffers/history diff --git a/internal/info/infobuffer.go b/internal/info/infobuffer.go index 8e8790b3..9c33cf32 100644 --- a/internal/info/infobuffer.go +++ b/internal/info/infobuffer.go @@ -3,7 +3,7 @@ package info import ( "fmt" - "github.com/zyedidia/micro/internal/buffer" + "github.com/zyedidia/micro/v2/internal/buffer" ) // The InfoBuf displays messages and other info at the bottom of the screen. diff --git a/internal/screen/screen.go b/internal/screen/screen.go index e0c3a6ab..8eba870a 100644 --- a/internal/screen/screen.go +++ b/internal/screen/screen.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "github.com/zyedidia/micro/internal/config" - "github.com/zyedidia/micro/internal/util" + "github.com/zyedidia/micro/v2/internal/config" + "github.com/zyedidia/micro/v2/internal/util" "github.com/zyedidia/tcell" ) diff --git a/internal/shell/shell.go b/internal/shell/shell.go index 53bf67ce..f5871c79 100644 --- a/internal/shell/shell.go +++ b/internal/shell/shell.go @@ -11,7 +11,7 @@ import ( "strings" shellquote "github.com/kballard/go-shellquote" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/screen" ) // ExecCommand executes a command using exec diff --git a/internal/shell/terminal.go b/internal/shell/terminal.go index 340a8138..4de8de23 100644 --- a/internal/shell/terminal.go +++ b/internal/shell/terminal.go @@ -5,8 +5,8 @@ import ( "os/exec" "strconv" - "github.com/zyedidia/micro/internal/buffer" - "github.com/zyedidia/micro/internal/screen" + "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/terminal" )