Skip to content

Commit eadc402

Browse files
dmalukadmaluka
committed
Import paths: fix non-alphabetic order
Make gofmt happy about that.
1 parent 1bd86a8 commit eadc402

19 files changed

+21
-21
lines changed

‎cmd/micro/micro.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818

1919
"github.com/go-errors/errors"
2020
isatty "github.com/mattn/go-isatty"
21+
"github.com/micro-editor/tcell/v2"
2122
lua "github.com/yuin/gopher-lua"
2223
"github.com/zyedidia/micro/v2/internal/action"
2324
"github.com/zyedidia/micro/v2/internal/buffer"
@@ -26,7 +27,6 @@ import (
2627
"github.com/zyedidia/micro/v2/internal/screen"
2728
"github.com/zyedidia/micro/v2/internal/shell"
2829
"github.com/zyedidia/micro/v2/internal/util"
29-
"github.com/micro-editor/tcell/v2"
3030
)
3131

3232
var (

‎cmd/micro/micro_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"testing"
88

99
"github.com/go-errors/errors"
10+
"github.com/micro-editor/tcell/v2"
1011
"github.com/stretchr/testify/assert"
1112
"github.com/zyedidia/micro/v2/internal/action"
1213
"github.com/zyedidia/micro/v2/internal/buffer"
1314
"github.com/zyedidia/micro/v2/internal/config"
1415
"github.com/zyedidia/micro/v2/internal/screen"
15-
"github.com/micro-editor/tcell/v2"
1616
)
1717

1818
var tempDir string

‎internal/action/actions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"time"
1212

1313
shellquote "github.com/kballard/go-shellquote"
14+
"github.com/micro-editor/tcell/v2"
1415
"github.com/zyedidia/micro/v2/internal/buffer"
1516
"github.com/zyedidia/micro/v2/internal/clipboard"
1617
"github.com/zyedidia/micro/v2/internal/config"
1718
"github.com/zyedidia/micro/v2/internal/display"
1819
"github.com/zyedidia/micro/v2/internal/screen"
1920
"github.com/zyedidia/micro/v2/internal/shell"
2021
"github.com/zyedidia/micro/v2/internal/util"
21-
"github.com/micro-editor/tcell/v2"
2222
)
2323

2424
// ScrollUp is not an action

‎internal/action/bindings.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"unicode"
1313

1414
"github.com/micro-editor/json5"
15+
"github.com/micro-editor/tcell/v2"
1516
"github.com/zyedidia/micro/v2/internal/config"
1617
"github.com/zyedidia/micro/v2/internal/screen"
1718
"github.com/zyedidia/micro/v2/internal/util"
18-
"github.com/micro-editor/tcell/v2"
1919
)
2020

2121
var Binder = map[string]func(e Event, action string){

‎internal/action/bufpane.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66

77
luar "layeh.com/gopher-luar"
88

9+
"github.com/micro-editor/tcell/v2"
910
lua "github.com/yuin/gopher-lua"
1011
"github.com/zyedidia/micro/v2/internal/buffer"
1112
"github.com/zyedidia/micro/v2/internal/config"
1213
"github.com/zyedidia/micro/v2/internal/display"
1314
ulua "github.com/zyedidia/micro/v2/internal/lua"
1415
"github.com/zyedidia/micro/v2/internal/screen"
1516
"github.com/zyedidia/micro/v2/internal/util"
16-
"github.com/micro-editor/tcell/v2"
1717
)
1818

1919
type BufAction interface{}

‎internal/action/infopane.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package action
33
import (
44
"bytes"
55

6+
"github.com/micro-editor/tcell/v2"
67
"github.com/zyedidia/micro/v2/internal/buffer"
78
"github.com/zyedidia/micro/v2/internal/config"
89
"github.com/zyedidia/micro/v2/internal/display"
910
"github.com/zyedidia/micro/v2/internal/info"
1011
"github.com/zyedidia/micro/v2/internal/util"
11-
"github.com/micro-editor/tcell/v2"
1212
)
1313

1414
type InfoKeyAction func(*InfoPane)

‎internal/action/rawpane.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"reflect"
66

7+
"github.com/micro-editor/tcell/v2"
78
"github.com/zyedidia/micro/v2/internal/buffer"
89
"github.com/zyedidia/micro/v2/internal/display"
9-
"github.com/micro-editor/tcell/v2"
1010
)
1111

1212
type RawPane struct {

‎internal/action/tab.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package action
33
import (
44
luar "layeh.com/gopher-luar"
55

6+
"github.com/micro-editor/tcell/v2"
67
"github.com/zyedidia/micro/v2/internal/buffer"
78
"github.com/zyedidia/micro/v2/internal/config"
89
"github.com/zyedidia/micro/v2/internal/display"
910
ulua "github.com/zyedidia/micro/v2/internal/lua"
1011
"github.com/zyedidia/micro/v2/internal/screen"
1112
"github.com/zyedidia/micro/v2/internal/views"
12-
"github.com/micro-editor/tcell/v2"
1313
)
1414

1515
// The TabList is a list of tabs and a window to display the tab bar

‎internal/action/termpane.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"errors"
55
"runtime"
66

7+
"github.com/micro-editor/tcell/v2"
8+
"github.com/micro-editor/terminal"
79
"github.com/zyedidia/micro/v2/internal/clipboard"
810
"github.com/zyedidia/micro/v2/internal/config"
911
"github.com/zyedidia/micro/v2/internal/display"
1012
"github.com/zyedidia/micro/v2/internal/screen"
1113
"github.com/zyedidia/micro/v2/internal/shell"
12-
"github.com/micro-editor/tcell/v2"
13-
"github.com/micro-editor/terminal"
1414
)
1515

1616
type TermKeyAction func(*TermPane)

‎internal/buffer/message.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package buffer
22

33
import (
4-
"github.com/zyedidia/micro/v2/internal/config"
54
"github.com/micro-editor/tcell/v2"
5+
"github.com/zyedidia/micro/v2/internal/config"
66
)
77

88
type MsgType int

‎internal/clipboard/terminal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"errors"
55
"time"
66

7-
"github.com/zyedidia/micro/v2/internal/screen"
87
"github.com/micro-editor/tcell/v2"
8+
"github.com/zyedidia/micro/v2/internal/screen"
99
)
1010

1111
type terminalClipboard struct{}

‎internal/config/colorscheme_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package config
33
import (
44
"testing"
55

6-
"github.com/stretchr/testify/assert"
76
"github.com/micro-editor/tcell/v2"
7+
"github.com/stretchr/testify/assert"
88
)
99

1010
func TestSimpleStringToStyle(t *testing.T) {

‎internal/config/plugin_installer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"sync"
1414

1515
"github.com/blang/semver"
16-
lua "github.com/yuin/gopher-lua"
1716
"github.com/micro-editor/json5"
17+
lua "github.com/yuin/gopher-lua"
1818
ulua "github.com/zyedidia/micro/v2/internal/lua"
1919
"github.com/zyedidia/micro/v2/internal/util"
2020
)

‎internal/config/settings.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"strconv"
1212
"strings"
1313

14-
"github.com/zyedidia/glob"
1514
"github.com/micro-editor/json5"
15+
"github.com/zyedidia/glob"
1616
"github.com/zyedidia/micro/v2/internal/util"
1717
"golang.org/x/text/encoding/htmlindex"
1818
)

‎internal/display/bufwindow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"strconv"
55

66
runewidth "github.com/mattn/go-runewidth"
7+
"github.com/micro-editor/tcell/v2"
78
"github.com/zyedidia/micro/v2/internal/buffer"
89
"github.com/zyedidia/micro/v2/internal/config"
910
"github.com/zyedidia/micro/v2/internal/screen"
1011
"github.com/zyedidia/micro/v2/internal/util"
11-
"github.com/micro-editor/tcell/v2"
1212
)
1313

1414
// The BufWindow provides a way of displaying a certain section of a buffer.

‎internal/display/infowindow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package display
22

33
import (
44
runewidth "github.com/mattn/go-runewidth"
5+
"github.com/micro-editor/tcell/v2"
56
"github.com/zyedidia/micro/v2/internal/buffer"
67
"github.com/zyedidia/micro/v2/internal/config"
78
"github.com/zyedidia/micro/v2/internal/info"
89
"github.com/zyedidia/micro/v2/internal/screen"
910
"github.com/zyedidia/micro/v2/internal/util"
10-
"github.com/micro-editor/tcell/v2"
1111
)
1212

1313
type InfoWindow struct {

‎internal/display/termwindow.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package display
22

33
import (
4+
"github.com/micro-editor/tcell/v2"
5+
"github.com/micro-editor/terminal"
46
"github.com/zyedidia/micro/v2/internal/buffer"
57
"github.com/zyedidia/micro/v2/internal/config"
68
"github.com/zyedidia/micro/v2/internal/screen"
79
"github.com/zyedidia/micro/v2/internal/shell"
810
"github.com/zyedidia/micro/v2/internal/util"
9-
"github.com/micro-editor/tcell/v2"
10-
"github.com/micro-editor/terminal"
1111
)
1212

1313
type TermWindow struct {

‎internal/screen/screen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"os"
77
"sync"
88

9+
"github.com/micro-editor/tcell/v2"
910
"github.com/zyedidia/micro/v2/internal/config"
1011
"github.com/zyedidia/micro/v2/internal/util"
11-
"github.com/micro-editor/tcell/v2"
1212
)
1313

1414
// Screen is the tcell screen we use to draw to the terminal

‎internal/shell/terminal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os/exec"
66
"strconv"
77

8+
"github.com/micro-editor/terminal"
89
"github.com/zyedidia/micro/v2/internal/buffer"
910
"github.com/zyedidia/micro/v2/internal/screen"
10-
"github.com/micro-editor/terminal"
1111
)
1212

1313
type TermType int

0 commit comments

Comments
 (0)