Fix v2 import path for go mod

This commit is contained in:
Zachary Yedidia 2020-05-04 10:16:15 -04:00
parent 221d8f462a
commit eff89a98a7
46 changed files with 119 additions and 119 deletions

View file

@ -10,8 +10,8 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
) )
func shouldContinue() bool { func shouldContinue() bool {

View file

@ -4,7 +4,7 @@ import (
"log" "log"
"os" "os"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// NullWriter simply sends writes into the void // NullWriter simply sends writes into the void

View file

@ -6,14 +6,14 @@ import (
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
luar "layeh.com/gopher-luar" luar "layeh.com/gopher-luar"
"github.com/zyedidia/micro/internal/action" "github.com/zyedidia/micro/v2/internal/action"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
func init() { func init() {

View file

@ -13,12 +13,12 @@ import (
"github.com/go-errors/errors" "github.com/go-errors/errors"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
"github.com/zyedidia/micro/internal/action" "github.com/zyedidia/micro/v2/internal/action"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/zyedidia/micro module github.com/zyedidia/micro/v2
require ( require (
github.com/blang/semver v3.5.1+incompatible github.com/blang/semver v3.5.1+incompatible

View file

@ -9,11 +9,11 @@ import (
shellquote "github.com/kballard/go-shellquote" shellquote "github.com/kballard/go-shellquote"
"github.com/zyedidia/clipboard" "github.com/zyedidia/clipboard"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -5,7 +5,7 @@ package action
import ( import (
"syscall" "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. // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs.

View file

@ -10,8 +10,8 @@ import (
"unicode" "unicode"
"github.com/zyedidia/json5" "github.com/zyedidia/json5"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -7,11 +7,11 @@ import (
luar "layeh.com/gopher-luar" luar "layeh.com/gopher-luar"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -13,11 +13,11 @@ import (
"unicode/utf8" "unicode/utf8"
shellquote "github.com/kballard/go-shellquote" shellquote "github.com/kballard/go-shellquote"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// A Command contains information about how to execute a command // A Command contains information about how to execute a command

View file

@ -1,6 +1,6 @@
package action package action
import "github.com/zyedidia/micro/internal/buffer" import "github.com/zyedidia/micro/v2/internal/buffer"
var InfoBar *InfoPane var InfoBar *InfoPane
var LogBufPane *BufPane var LogBufPane *BufPane

View file

@ -5,9 +5,9 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// This file is meant (for now) for autocompletion in command mode, not // This file is meant (for now) for autocompletion in command mode, not

View file

@ -4,10 +4,10 @@ import (
"bytes" "bytes"
"strings" "strings"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
"github.com/zyedidia/micro/internal/info" "github.com/zyedidia/micro/v2/internal/info"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -1,7 +1,7 @@
package action package action
import ( import (
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
) )
type Pane interface { type Pane interface {

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -1,11 +1,11 @@
package action package action
import ( import (
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/views" "github.com/zyedidia/micro/v2/internal/views"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -4,7 +4,7 @@ package action
import ( import (
shellquote "github.com/kballard/go-shellquote" 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 // TermEmuSupported is a constant that marks if the terminal emulator is supported

View file

@ -5,9 +5,9 @@ import (
"runtime" "runtime"
"github.com/zyedidia/clipboard" "github.com/zyedidia/clipboard"
"github.com/zyedidia/micro/internal/display" "github.com/zyedidia/micro/v2/internal/display"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
"github.com/zyedidia/terminal" "github.com/zyedidia/terminal"
) )

View file

@ -8,7 +8,7 @@ import (
"strings" "strings"
"unicode/utf8" "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 // A Completer is a function that takes a buffer and returns info

View file

@ -7,9 +7,9 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"golang.org/x/text/encoding" "golang.org/x/text/encoding"
) )

View file

@ -20,11 +20,11 @@ import (
luar "layeh.com/gopher-luar" luar "layeh.com/gopher-luar"
dmp "github.com/sergi/go-diff/diffmatchpatch" dmp "github.com/sergi/go-diff/diffmatchpatch"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/micro/pkg/highlight" "github.com/zyedidia/micro/v2/pkg/highlight"
"golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/htmlindex"
"golang.org/x/text/encoding/unicode" "golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform" "golang.org/x/text/transform"

View file

@ -7,7 +7,7 @@ import (
testifyAssert "github.com/stretchr/testify/assert" testifyAssert "github.com/stretchr/testify/assert"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
) )
type operation struct { type operation struct {

View file

@ -4,7 +4,7 @@ import (
"unicode/utf8" "unicode/utf8"
"github.com/zyedidia/clipboard" "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 // InBounds returns whether the given location is a valid character position in the given buffer

View file

@ -6,9 +6,9 @@ import (
"unicode/utf8" "unicode/utf8"
dmp "github.com/sergi/go-diff/diffmatchpatch" dmp "github.com/sergi/go-diff/diffmatchpatch"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
luar "layeh.com/gopher-luar" luar "layeh.com/gopher-luar"
) )

View file

@ -7,7 +7,7 @@ import (
"sync" "sync"
"unicode/utf8" "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 // Finds the byte index of the nth rune in a byte slice

View file

@ -3,7 +3,7 @@ package buffer
import ( import (
"unicode/utf8" "unicode/utf8"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// Loc stores a location // Loc stores a location

View file

@ -1,7 +1,7 @@
package buffer package buffer
import ( import (
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -13,9 +13,9 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"golang.org/x/text/encoding" "golang.org/x/text/encoding"
"golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/htmlindex"
"golang.org/x/text/transform" "golang.org/x/text/transform"

View file

@ -4,7 +4,7 @@ import (
"regexp" "regexp"
"unicode/utf8" "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) { func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {

View file

@ -10,8 +10,8 @@ import (
"golang.org/x/text/encoding" "golang.org/x/text/encoding"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// The SerializedBuffer holds the types that get serialized when a buffer is saved // The SerializedBuffer holds the types that get serialized when a buffer is saved

View file

@ -1,8 +1,8 @@
package buffer package buffer
import ( import (
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
) )
func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error { func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {

View file

@ -5,7 +5,7 @@ import (
"log" "log"
lua "github.com/yuin/gopher-lua" 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 // ErrNoSuchFunction is returned when Call is executed on a function that does not exist

View file

@ -16,8 +16,8 @@ import (
"github.com/blang/semver" "github.com/blang/semver"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
"github.com/zyedidia/json5" "github.com/zyedidia/json5"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
var ( var (

View file

@ -12,7 +12,7 @@ import (
"github.com/zyedidia/glob" "github.com/zyedidia/glob"
"github.com/zyedidia/json5" "github.com/zyedidia/json5"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/htmlindex"
) )

View file

@ -5,10 +5,10 @@ import (
"unicode/utf8" "unicode/utf8"
runewidth "github.com/mattn/go-runewidth" runewidth "github.com/mattn/go-runewidth"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -4,11 +4,11 @@ import (
"unicode/utf8" "unicode/utf8"
runewidth "github.com/mattn/go-runewidth" runewidth "github.com/mattn/go-runewidth"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/info" "github.com/zyedidia/micro/v2/internal/info"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -12,11 +12,11 @@ import (
runewidth "github.com/mattn/go-runewidth" runewidth "github.com/mattn/go-runewidth"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
ulua "github.com/zyedidia/micro/internal/lua" ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
// StatusLine represents the information line at the bottom // StatusLine represents the information line at the bottom

View file

@ -4,10 +4,10 @@ import (
"unicode/utf8" "unicode/utf8"
runewidth "github.com/mattn/go-runewidth" runewidth "github.com/mattn/go-runewidth"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
) )
type TabWindow struct { type TabWindow struct {

View file

@ -3,10 +3,10 @@ package display
import ( import (
"unicode/utf8" "unicode/utf8"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
"github.com/zyedidia/terminal" "github.com/zyedidia/terminal"
) )

View file

@ -1,10 +1,10 @@
package display package display
import ( import (
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/internal/views" "github.com/zyedidia/micro/v2/internal/views"
) )
type UIWindow struct { type UIWindow struct {

View file

@ -1,7 +1,7 @@
package display package display
import ( import (
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
) )
type View struct { type View struct {

View file

@ -5,7 +5,7 @@ import (
"os" "os"
"path/filepath" "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 // LoadHistory attempts to load user history from configDir/buffers/history

View file

@ -3,7 +3,7 @@ package info
import ( import (
"fmt" "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. // The InfoBuf displays messages and other info at the bottom of the screen.

View file

@ -5,8 +5,8 @@ import (
"os" "os"
"sync" "sync"
"github.com/zyedidia/micro/internal/config" "github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )

View file

@ -11,7 +11,7 @@ import (
"strings" "strings"
shellquote "github.com/kballard/go-shellquote" 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 // ExecCommand executes a command using exec

View file

@ -5,8 +5,8 @@ import (
"os/exec" "os/exec"
"strconv" "strconv"
"github.com/zyedidia/micro/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/terminal" "github.com/zyedidia/terminal"
) )