Change project layout and use go.mod

.gitmodules

@@ -1,72 +0,0 @@
-[submodule "cmd/micro/vendor/github.com/blang/semver"]
-	path = cmd/micro/vendor/github.com/blang/semver
-	url = https://github.com/blang/semver
-[submodule "cmd/micro/vendor/github.com/dustin/go-humanize"]
-	path = cmd/micro/vendor/github.com/dustin/go-humanize
-	url = https://github.com/dustin/go-humanize
-[submodule "cmd/micro/vendor/github.com/go-errors/errors"]
-	path = cmd/micro/vendor/github.com/go-errors/errors
-	url = https://github.com/go-errors/errors
-[submodule "cmd/micro/vendor/github.com/mattn/go-isatty"]
-	path = cmd/micro/vendor/github.com/mattn/go-isatty
-	url = https://github.com/mattn/go-isatty
-[submodule "cmd/micro/vendor/github.com/mattn/go-runewidth"]
-	path = cmd/micro/vendor/github.com/mattn/go-runewidth
-	url = https://github.com/mattn/go-runewidth
-[submodule "cmd/micro/vendor/github.com/mitchellh/go-homedir"]
-	path = cmd/micro/vendor/github.com/mitchellh/go-homedir
-	url = https://github.com/mitchellh/go-homedir
-[submodule "cmd/micro/vendor/github.com/sergi/go-diff"]
-	path = cmd/micro/vendor/github.com/sergi/go-diff
-	url = https://github.com/sergi/go-diff
-[submodule "cmd/micro/vendor/github.com/yuin/gopher-lua"]
-	path = cmd/micro/vendor/github.com/yuin/gopher-lua
-	url = https://github.com/yuin/gopher-lua
-[submodule "cmd/micro/vendor/golang.org/x/net"]
-	path = cmd/micro/vendor/golang.org/x/net
-	url = https://go.googlesource.com/net
-[submodule "cmd/micro/vendor/github.com/zyedidia/clipboard"]
-	path = cmd/micro/vendor/github.com/zyedidia/clipboard
-	url = https://github.com/zyedidia/clipboard
-[submodule "cmd/micro/vendor/github.com/zyedidia/glob"]
-	path = cmd/micro/vendor/github.com/zyedidia/glob
-	url = https://github.com/zyedidia/glob
-[submodule "cmd/micro/vendor/github.com/zyedidia/tcell"]
-	path = cmd/micro/vendor/github.com/zyedidia/tcell
-	url = https://github.com/zyedidia/tcell
-[submodule "cmd/micro/vendor/github.com/gdamore/encoding"]
-	path = cmd/micro/vendor/github.com/gdamore/encoding
-	url = https://github.com/gdamore/encoding
-[submodule "cmd/micro/vendor/golang.org/x/text"]
-	path = cmd/micro/vendor/golang.org/x/text
-	url = https://go.googlesource.com/text
-[submodule "cmd/micro/vendor/github.com/lucasb-eyer/go-colorful"]
-	path = cmd/micro/vendor/github.com/lucasb-eyer/go-colorful
-	url = https://github.com/lucasb-eyer/go-colorful
-[submodule "cmd/micro/vendor/layeh.com/gopher-luar"]
-	path = cmd/micro/vendor/layeh.com/gopher-luar
-	url = https://github.com/layeh/gopher-luar
-[submodule "cmd/micro/vendor/gopkg.in/yaml.v2"]
-	path = cmd/micro/vendor/gopkg.in/yaml.v2
-	url = https://gopkg.in/yaml.v2
-[submodule "cmd/micro/vendor/github.com/zyedidia/poller"]
-	path = cmd/micro/vendor/github.com/zyedidia/poller
-	url = https://github.com/zyedidia/poller
-[submodule "cmd/micro/vendor/github.com/flynn/json5"]
-	path = cmd/micro/vendor/github.com/flynn/json5
-	url = https://github.com/flynn/json5
-[submodule "cmd/micro/vendor/github.com/zyedidia/terminal"]
-	path = cmd/micro/vendor/github.com/zyedidia/terminal
-	url = https://github.com/zyedidia/terminal
-[submodule "cmd/micro/vendor/github.com/zyedidia/pty"]
-	path = cmd/micro/vendor/github.com/zyedidia/pty
-	url = https://github.com/zyedidia/pty
-[submodule "cmd/micro/vendor/github.com/smartystreets/goconvey"]
-	path = cmd/micro/vendor/github.com/smartystreets/goconvey
-	url = https://github.com/smartystreets/goconvey
-[submodule "cmd/micro/vendor/github.com/jtolds/gls"]
-	path = cmd/micro/vendor/github.com/jtolds/gls
-	url = https://github.com/jtolds/gls
-[submodule "cmd/micro/vendor/github.com/smartystreets/assertions"]
-	path = cmd/micro/vendor/github.com/smartystreets/assertions
-	url = https://github.com/smartystreets/assertions

Makefile

@@ -35,17 +35,13 @@ install-quick:
 
 update:
 	git pull
-	git submodule update --init
 
 # Builds the runtime
 runtime:
 	go get -u github.com/jteeuwen/go-bindata/...
 	$(GOBIN)/go-bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
-	mv runtime.go cmd/micro/config
-	gofmt -w cmd/micro/config/runtime.go
-
-test:
-	go test ./cmd/micro
+	mv runtime.go internal/config
+	gofmt -w internal/config/runtime.go
 
 clean:
 	rm -f micro

cmd/micro/micro.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-errors/errors"
 	isatty "github.com/mattn/go-isatty"
-	"github.com/zyedidia/micro/cmd/micro/action"
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
+	"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/tcell"
 )
 

go.mod

@@ -0,0 +1,21 @@
+module github.com/zyedidia/micro
+
+require (
+	github.com/dustin/go-humanize v1.0.0
+	github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
+	github.com/gdamore/encoding v1.0.0 // indirect
+	github.com/go-errors/errors v1.0.1
+	github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 // indirect
+	github.com/mattn/go-isatty v0.0.4
+	github.com/mattn/go-runewidth v0.0.4
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/sergi/go-diff v1.0.0
+	github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d
+	github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
+	github.com/zyedidia/poller v2.0.0+incompatible // indirect
+	github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244
+	github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302
+	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
+	golang.org/x/text v0.3.0
+	gopkg.in/yaml.v2 v2.2.2
+)

go.sum

@@ -0,0 +1,39 @@
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633 h1:xJMmr4GMYIbALX5edyoDIOQpc2bOQTeJiWMeCl9lX/8=
+github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633/go.mod h1:NJDK3/o7abx6PP54EOe0G0n0RLmhCo9xv61gUYpI0EY=
+github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
+github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY=
+github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d h1:Lhqt2eo+rgM8aswvM7nTtAMVm8ARPWzkE9n6eZDOccY=
+github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d/go.mod h1:WDk3p8GiZV9+xFWlSo8qreeoLhW6Ik692rqXk+cNeRY=
+github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3 h1:oMHjjTLfGXVuyOQBYj5/td9WC0mw4g1xDBPovIqmHew=
+github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod h1:YKbIYP//Eln8eDgAJGI3IDvR3s4Tv9Z9TGIOumiyQ5c=
+github.com/zyedidia/poller v2.0.0+incompatible h1:DMOvB0EXz2JTokqOKfxPWN/8xXFJbO+m4vNhMkOY7Lo=
+github.com/zyedidia/poller v2.0.0+incompatible/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
+github.com/zyedidia/pty v1.1.1 h1:SGOF3egDZGCGbpB5DPlg+yabbAuVkUtXVeNTDFeEytM=
+github.com/zyedidia/pty v1.1.1/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
+github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244 h1:DZ7mZvUV5+oXeXV1E1t6ZIXRihHYyqYVIOSA+RGo88A=
+github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
+github.com/zyedidia/tcell v0.0.0-20171006165952-a221f2faf4f9 h1:RpdSFmZxJJy2rMbQi2LcejNPEquLmB4sCVIq7F4Ha+g=
+github.com/zyedidia/tcell v0.0.0-20171006165952-a221f2faf4f9/go.mod h1:yXgdp23+aW8OMENYVBvpKoeiBtjaVWJ9HhpPDu6LBfM=
+github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302 h1:ruNSURcO81y+J+XnqrLLt+zxcdFtq8QNoZfWXSsybYQ=
+github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302/go.mod h1:yXgdp23+aW8OMENYVBvpKoeiBtjaVWJ9HhpPDu6LBfM=
+github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc=
+github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod h1:8leT8G0Cm8NoJHdrrKHyR9MirWoF4YW7pZh06B6H+1E=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/action/actions.go

@@ -8,12 +8,12 @@ import (
 	"unicode/utf8"
 
 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/shell"
-	"github.com/zyedidia/micro/cmd/micro/shellwords"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"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/pkg/shellwords"
 	"github.com/zyedidia/tcell"
 )
 

internal/action/actions_posix.go

@@ -5,7 +5,7 @@ package action
 import (
 	"syscall"
 
-	"github.com/zyedidia/micro/cmd/micro/screen"
+	"github.com/zyedidia/micro/internal/screen"
 )
 
 // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs.

internal/action/bindings.go

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

internal/action/bufpane.go

@@ -4,9 +4,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/display"
-	"github.com/zyedidia/micro/cmd/micro/screen"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/screen"
 	"github.com/zyedidia/tcell"
 )
 

internal/action/command.go

@@ -10,12 +10,12 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/shell"
-	"github.com/zyedidia/micro/cmd/micro/shellwords"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"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/pkg/shellwords"
 )
 
 // A Command contains information about how to execute a command

internal/action/infocomplete.go

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

internal/action/infopane.go

@@ -3,9 +3,9 @@ package action
 import (
 	"bytes"
 
-	"github.com/zyedidia/micro/cmd/micro/display"
-	"github.com/zyedidia/micro/cmd/micro/info"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/info"
+	"github.com/zyedidia/micro/internal/util"
 	"github.com/zyedidia/tcell"
 )
 

internal/action/pane.go

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

internal/action/rawpane.go

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

internal/action/tab.go

@@ -1,11 +1,11 @@
 package action
 
 import (
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/display"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/views"
+	"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/tcell"
 )
 

internal/action/termpane.go

@@ -4,9 +4,9 @@ import (
 	"os"
 
 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/cmd/micro/display"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/shell"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/shell"
 	"github.com/zyedidia/tcell"
 	"github.com/zyedidia/terminal"
 )

internal/buffer/autocomplete.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/util"
 )
 
 // A Completer is a function that takes a buffer and returns info

internal/buffer/buffer.go

@@ -12,10 +12,10 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/highlight"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	. "github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/pkg/highlight"
+	"github.com/zyedidia/micro/internal/screen"
+	. "github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"

internal/buffer/cursor.go

@@ -4,7 +4,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/util"
 )
 
 // InBounds returns whether the given location is a valid character position in the given buffer

internal/buffer/line_array.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/highlight"
+	"github.com/zyedidia/micro/pkg/highlight"
 )
 
 // Finds the byte index of the nth rune in a byte slice

internal/buffer/loc.go

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

internal/buffer/message.go

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

internal/buffer/save.go

@@ -11,8 +11,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
-	. "github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/config"
+	. "github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/transform"

internal/buffer/search.go

@@ -4,7 +4,7 @@ import (
 	"regexp"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/util"
 )
 
 func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {

internal/buffer/serialize.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
-	. "github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/config"
+	. "github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding/unicode"
 )
 

internal/buffer/settings.go

@@ -1,8 +1,8 @@
 package buffer
 
 import (
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
 )
 
 // SetOption sets a given option to a value just for this buffer

internal/config/settings.go

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

internal/display/bufwindow.go

@@ -5,10 +5,10 @@ import (
 	"unicode/utf8"
 
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"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/tcell"
 )
 

internal/display/infowindow.go

@@ -4,11 +4,11 @@ import (
 	"unicode/utf8"
 
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/info"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"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/tcell"
 )
 

internal/display/statusline.go

@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
 )
 
 // StatusLine represents the information line at the bottom

internal/display/tabwindow.go

@@ -3,10 +3,10 @@ package display
 import (
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/util"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
 )
 
 type TabWindow struct {

internal/display/termwindow.go

@@ -3,10 +3,10 @@ package display
 import (
 	"unicode/utf8"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
-	"github.com/zyedidia/micro/cmd/micro/config"
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/shell"
+	"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/tcell"
 	"github.com/zyedidia/terminal"
 )

internal/display/uiwindow.go

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

internal/display/window.go

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

internal/info/history.go

@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"os"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
+	"github.com/zyedidia/micro/internal/config"
 )
 
 // LoadHistory attempts to load user history from configDir/buffers/history

internal/info/infobuffer.go

@@ -3,7 +3,7 @@ package info
 import (
 	"fmt"
 
-	"github.com/zyedidia/micro/cmd/micro/buffer"
+	"github.com/zyedidia/micro/internal/buffer"
 )
 
 // The InfoBuf displays messages and other info at the bottom of the screen.

internal/manager/fetch.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
+	"github.com/zyedidia/micro/internal/config"
 	git "gopkg.in/src-d/go-git.v4"
 )
 

internal/manager/manager_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/zyedidia/micro/cmd/micro/config"
+	"github.com/zyedidia/micro/internal/config"
 )
 
 func init() {

internal/manager/plugin.go

@@ -8,7 +8,7 @@ import (
 	"path"
 
 	"github.com/blang/semver"
-	"github.com/zyedidia/micro/cmd/micro/config"
+	"github.com/zyedidia/micro/internal/config"
 	git "gopkg.in/src-d/go-git.v4"
 )
 

internal/screen/screen.go

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

internal/shell/shell.go

@@ -9,8 +9,8 @@ import (
 	"os/signal"
 	"strings"
 
-	"github.com/zyedidia/micro/cmd/micro/screen"
-	"github.com/zyedidia/micro/cmd/micro/shellwords"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/pkg/shellwords"
 )
 
 // ExecCommand executes a command using exec

internal/shell/terminal.go

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