diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 107a9482..00000000 --- a/.gitmodules +++ /dev/null @@ -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 diff --git a/Makefile b/Makefile index db9441a6..e4f274e4 100644 --- a/Makefile +++ b/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 diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index 4032178f..ef83f9ae 100644 --- a/cmd/micro/micro.go +++ b/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" ) diff --git a/cmd/micro/vendor/github.com/blang/semver b/cmd/micro/vendor/github.com/blang/semver deleted file mode 160000 index 4a1e882c..00000000 --- a/cmd/micro/vendor/github.com/blang/semver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a1e882c79dcf4ec00d2e29fac74b9c8938d5052 diff --git a/cmd/micro/vendor/github.com/dustin/go-humanize b/cmd/micro/vendor/github.com/dustin/go-humanize deleted file mode 160000 index 259d2a10..00000000 --- a/cmd/micro/vendor/github.com/dustin/go-humanize +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 259d2a102b871d17f30e3cd9881a642961a1e486 diff --git a/cmd/micro/vendor/github.com/flynn/json5 b/cmd/micro/vendor/github.com/flynn/json5 deleted file mode 160000 index 7620272e..00000000 --- a/cmd/micro/vendor/github.com/flynn/json5 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7620272ed63390e979cf5882d2fa0506fe2a8db5 diff --git a/cmd/micro/vendor/github.com/gdamore/encoding b/cmd/micro/vendor/github.com/gdamore/encoding deleted file mode 160000 index b23993cb..00000000 --- a/cmd/micro/vendor/github.com/gdamore/encoding +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b23993cbb6353f0e6aa98d0ee318a34728f628b9 diff --git a/cmd/micro/vendor/github.com/go-errors/errors b/cmd/micro/vendor/github.com/go-errors/errors deleted file mode 160000 index 8fa88b06..00000000 --- a/cmd/micro/vendor/github.com/go-errors/errors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8fa88b06e5974e97fbf9899a7f86a344bfd1f105 diff --git a/cmd/micro/vendor/github.com/jtolds/gls b/cmd/micro/vendor/github.com/jtolds/gls deleted file mode 160000 index 77f18212..00000000 --- a/cmd/micro/vendor/github.com/jtolds/gls +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 77f18212c9c7edc9bd6a33d383a7b545ce62f064 diff --git a/cmd/micro/vendor/github.com/lucasb-eyer/go-colorful b/cmd/micro/vendor/github.com/lucasb-eyer/go-colorful deleted file mode 160000 index c900de9d..00000000 --- a/cmd/micro/vendor/github.com/lucasb-eyer/go-colorful +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c900de9dbbc73129068f5af6a823068fc5f2308c diff --git a/cmd/micro/vendor/github.com/mattn/go-isatty b/cmd/micro/vendor/github.com/mattn/go-isatty deleted file mode 160000 index fc9e8d8e..00000000 --- a/cmd/micro/vendor/github.com/mattn/go-isatty +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fc9e8d8ef48496124e79ae0df75490096eccf6fe diff --git a/cmd/micro/vendor/github.com/mattn/go-runewidth b/cmd/micro/vendor/github.com/mattn/go-runewidth deleted file mode 160000 index 97311d9f..00000000 --- a/cmd/micro/vendor/github.com/mattn/go-runewidth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d diff --git a/cmd/micro/vendor/github.com/mitchellh/go-homedir b/cmd/micro/vendor/github.com/mitchellh/go-homedir deleted file mode 160000 index b8bc1bf7..00000000 --- a/cmd/micro/vendor/github.com/mitchellh/go-homedir +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b8bc1bf767474819792c23f32d8286a45736f1c6 diff --git a/cmd/micro/vendor/github.com/sergi/go-diff b/cmd/micro/vendor/github.com/sergi/go-diff deleted file mode 160000 index feef008d..00000000 --- a/cmd/micro/vendor/github.com/sergi/go-diff +++ /dev/null @@ -1 +0,0 @@ -Subproject commit feef008d51ad2b3778f85d387ccf91735543008d diff --git a/cmd/micro/vendor/github.com/smartystreets/assertions b/cmd/micro/vendor/github.com/smartystreets/assertions deleted file mode 160000 index 0b37b35e..00000000 --- a/cmd/micro/vendor/github.com/smartystreets/assertions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b37b35ec7434b77e77a4bb29b79677cced992ea diff --git a/cmd/micro/vendor/github.com/smartystreets/goconvey b/cmd/micro/vendor/github.com/smartystreets/goconvey deleted file mode 160000 index e5b2b7c9..00000000 --- a/cmd/micro/vendor/github.com/smartystreets/goconvey +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5b2b7c9111590d019a696c7800593f666e1a7f4 diff --git a/cmd/micro/vendor/github.com/yuin/gopher-lua b/cmd/micro/vendor/github.com/yuin/gopher-lua deleted file mode 160000 index b402f311..00000000 --- a/cmd/micro/vendor/github.com/yuin/gopher-lua +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b402f3114ec730d8bddb074a6c137309f561aa78 diff --git a/cmd/micro/vendor/github.com/zyedidia/clipboard b/cmd/micro/vendor/github.com/zyedidia/clipboard deleted file mode 160000 index 4611e809..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/clipboard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4611e809d8b1a3051c11d11f4b610c44df73fa38 diff --git a/cmd/micro/vendor/github.com/zyedidia/glob b/cmd/micro/vendor/github.com/zyedidia/glob deleted file mode 160000 index dd4023a6..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/glob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd4023a66dc351ae26e592d21cd133b5b143f3d8 diff --git a/cmd/micro/vendor/github.com/zyedidia/poller b/cmd/micro/vendor/github.com/zyedidia/poller deleted file mode 160000 index ab096829..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/poller +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab09682913b79f402713d1df1977dedc19eb25ac diff --git a/cmd/micro/vendor/github.com/zyedidia/pty b/cmd/micro/vendor/github.com/zyedidia/pty deleted file mode 160000 index 30364665..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/pty +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30364665a2445782b12bcb2db75f16ce684da907 diff --git a/cmd/micro/vendor/github.com/zyedidia/tcell b/cmd/micro/vendor/github.com/zyedidia/tcell deleted file mode 160000 index 208b6e8f..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/tcell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 208b6e8f2f8d763a4accac33f3bdbd7dc9c71c01 diff --git a/cmd/micro/vendor/github.com/zyedidia/terminal b/cmd/micro/vendor/github.com/zyedidia/terminal deleted file mode 160000 index 1760577d..00000000 --- a/cmd/micro/vendor/github.com/zyedidia/terminal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1760577dbc0058809dd115a6bfe5999b6b24ab53 diff --git a/cmd/micro/vendor/golang.org/x/net b/cmd/micro/vendor/golang.org/x/net deleted file mode 160000 index 1a68b131..00000000 --- a/cmd/micro/vendor/golang.org/x/net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a68b1313cf4ad7778376e82641197b60c02f65c diff --git a/cmd/micro/vendor/golang.org/x/text b/cmd/micro/vendor/golang.org/x/text deleted file mode 160000 index 210eee5c..00000000 --- a/cmd/micro/vendor/golang.org/x/text +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 210eee5cf7323015d097341bcf7166130d001cd8 diff --git a/cmd/micro/vendor/gopkg.in/yaml.v2 b/cmd/micro/vendor/gopkg.in/yaml.v2 deleted file mode 160000 index cd8b52f8..00000000 --- a/cmd/micro/vendor/gopkg.in/yaml.v2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b diff --git a/cmd/micro/vendor/layeh.com/gopher-luar b/cmd/micro/vendor/layeh.com/gopher-luar deleted file mode 160000 index 16281577..00000000 --- a/cmd/micro/vendor/layeh.com/gopher-luar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 16281577dff29557258daa8ca9bc9b2e05f451f2 diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..2ce1f48f --- /dev/null +++ b/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 +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..894c39cf --- /dev/null +++ b/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= diff --git a/cmd/micro/action/actions.go b/internal/action/actions.go similarity index 99% rename from cmd/micro/action/actions.go rename to internal/action/actions.go index f567cb24..3ecce1aa 100644 --- a/cmd/micro/action/actions.go +++ b/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" ) diff --git a/cmd/micro/action/actions_other.go b/internal/action/actions_other.go similarity index 100% rename from cmd/micro/action/actions_other.go rename to internal/action/actions_other.go diff --git a/cmd/micro/action/actions_posix.go b/internal/action/actions_posix.go similarity index 92% rename from cmd/micro/action/actions_posix.go rename to internal/action/actions_posix.go index 98609bbe..1b69d943 100644 --- a/cmd/micro/action/actions_posix.go +++ b/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. diff --git a/cmd/micro/action/bindings.go b/internal/action/bindings.go similarity index 99% rename from cmd/micro/action/bindings.go rename to internal/action/bindings.go index fb908cdb..a1b1e7d5 100644 --- a/cmd/micro/action/bindings.go +++ b/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" ) diff --git a/cmd/micro/action/bufpane.go b/internal/action/bufpane.go similarity index 99% rename from cmd/micro/action/bufpane.go rename to internal/action/bufpane.go index 9aac7b09..ac6c674f 100644 --- a/cmd/micro/action/bufpane.go +++ b/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" ) diff --git a/cmd/micro/action/command.go b/internal/action/command.go similarity index 98% rename from cmd/micro/action/command.go rename to internal/action/command.go index bcec0ee8..4db56207 100644 --- a/cmd/micro/action/command.go +++ b/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 diff --git a/cmd/micro/action/events.go b/internal/action/events.go similarity index 100% rename from cmd/micro/action/events.go rename to internal/action/events.go diff --git a/cmd/micro/action/globals.go b/internal/action/globals.go similarity index 100% rename from cmd/micro/action/globals.go rename to internal/action/globals.go diff --git a/cmd/micro/action/infocomplete.go b/internal/action/infocomplete.go similarity index 97% rename from cmd/micro/action/infocomplete.go rename to internal/action/infocomplete.go index 28d701e6..9179b63b 100644 --- a/cmd/micro/action/infocomplete.go +++ b/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 diff --git a/cmd/micro/action/infopane.go b/internal/action/infopane.go similarity index 96% rename from cmd/micro/action/infopane.go rename to internal/action/infopane.go index 975d9f6e..1ab7c281 100644 --- a/cmd/micro/action/infopane.go +++ b/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" ) diff --git a/cmd/micro/action/pane.go b/internal/action/pane.go similarity index 73% rename from cmd/micro/action/pane.go rename to internal/action/pane.go index 0a4f2f6e..f6f68d3e 100644 --- a/cmd/micro/action/pane.go +++ b/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 { diff --git a/cmd/micro/action/rawpane.go b/internal/action/rawpane.go similarity index 88% rename from cmd/micro/action/rawpane.go rename to internal/action/rawpane.go index 113c938c..cdeade47 100644 --- a/cmd/micro/action/rawpane.go +++ b/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" ) diff --git a/cmd/micro/action/tab.go b/internal/action/tab.go similarity index 96% rename from cmd/micro/action/tab.go rename to internal/action/tab.go index 2c6ce8ac..45a9f3db 100644 --- a/cmd/micro/action/tab.go +++ b/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" ) diff --git a/cmd/micro/action/termpane.go b/internal/action/termpane.go similarity index 94% rename from cmd/micro/action/termpane.go rename to internal/action/termpane.go index 2340b3ae..5a934567 100644 --- a/cmd/micro/action/termpane.go +++ b/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" ) diff --git a/cmd/micro/buffer/autocomplete.go b/internal/buffer/autocomplete.go similarity index 98% rename from cmd/micro/buffer/autocomplete.go rename to internal/buffer/autocomplete.go index 7ac0d983..c5577b6f 100644 --- a/cmd/micro/buffer/autocomplete.go +++ b/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 diff --git a/cmd/micro/buffer/buffer.go b/internal/buffer/buffer.go similarity index 98% rename from cmd/micro/buffer/buffer.go rename to internal/buffer/buffer.go index 9de2b967..7496db93 100644 --- a/cmd/micro/buffer/buffer.go +++ b/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" diff --git a/cmd/micro/buffer/cursor.go b/internal/buffer/cursor.go similarity index 99% rename from cmd/micro/buffer/cursor.go rename to internal/buffer/cursor.go index 3bb94c2c..f3d6d059 100644 --- a/cmd/micro/buffer/cursor.go +++ b/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 diff --git a/cmd/micro/buffer/eventhandler.go b/internal/buffer/eventhandler.go similarity index 100% rename from cmd/micro/buffer/eventhandler.go rename to internal/buffer/eventhandler.go diff --git a/cmd/micro/buffer/line_array.go b/internal/buffer/line_array.go similarity index 99% rename from cmd/micro/buffer/line_array.go rename to internal/buffer/line_array.go index 64352c11..dcbf2e43 100644 --- a/cmd/micro/buffer/line_array.go +++ b/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 diff --git a/cmd/micro/buffer/line_array_test.go b/internal/buffer/line_array_test.go similarity index 100% rename from cmd/micro/buffer/line_array_test.go rename to internal/buffer/line_array_test.go diff --git a/cmd/micro/buffer/loc.go b/internal/buffer/loc.go similarity index 98% rename from cmd/micro/buffer/loc.go rename to internal/buffer/loc.go index be99610d..0fa682b1 100644 --- a/cmd/micro/buffer/loc.go +++ b/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 diff --git a/cmd/micro/buffer/message.go b/internal/buffer/message.go similarity index 96% rename from cmd/micro/buffer/message.go rename to internal/buffer/message.go index 3b9e3ad4..8f072333 100644 --- a/cmd/micro/buffer/message.go +++ b/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" ) diff --git a/cmd/micro/buffer/save.go b/internal/buffer/save.go similarity index 98% rename from cmd/micro/buffer/save.go rename to internal/buffer/save.go index a6e34f6e..8597810d 100644 --- a/cmd/micro/buffer/save.go +++ b/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" diff --git a/cmd/micro/buffer/search.go b/internal/buffer/search.go similarity index 98% rename from cmd/micro/buffer/search.go rename to internal/buffer/search.go index 5157a0bc..587ca5e9 100644 --- a/cmd/micro/buffer/search.go +++ b/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) { diff --git a/cmd/micro/buffer/serialize.go b/internal/buffer/serialize.go similarity index 95% rename from cmd/micro/buffer/serialize.go rename to internal/buffer/serialize.go index 821f0c7a..b559e764 100644 --- a/cmd/micro/buffer/serialize.go +++ b/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" ) diff --git a/cmd/micro/buffer/settings.go b/internal/buffer/settings.go similarity index 91% rename from cmd/micro/buffer/settings.go rename to internal/buffer/settings.go index fb66d5d9..b56608be 100644 --- a/cmd/micro/buffer/settings.go +++ b/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 diff --git a/cmd/micro/buffer/stack.go b/internal/buffer/stack.go similarity index 100% rename from cmd/micro/buffer/stack.go rename to internal/buffer/stack.go diff --git a/cmd/micro/buffer/stack_test.go b/internal/buffer/stack_test.go similarity index 100% rename from cmd/micro/buffer/stack_test.go rename to internal/buffer/stack_test.go diff --git a/cmd/micro/config/colorscheme.go b/internal/config/colorscheme.go similarity index 100% rename from cmd/micro/config/colorscheme.go rename to internal/config/colorscheme.go diff --git a/cmd/micro/config/colorscheme_test.go b/internal/config/colorscheme_test.go similarity index 100% rename from cmd/micro/config/colorscheme_test.go rename to internal/config/colorscheme_test.go diff --git a/cmd/micro/config/config.go b/internal/config/config.go similarity index 100% rename from cmd/micro/config/config.go rename to internal/config/config.go diff --git a/cmd/micro/config/globals.go b/internal/config/globals.go similarity index 100% rename from cmd/micro/config/globals.go rename to internal/config/globals.go diff --git a/cmd/micro/config/rtfiles.go b/internal/config/rtfiles.go similarity index 100% rename from cmd/micro/config/rtfiles.go rename to internal/config/rtfiles.go diff --git a/cmd/micro/config/rtfiles_test.go b/internal/config/rtfiles_test.go similarity index 100% rename from cmd/micro/config/rtfiles_test.go rename to internal/config/rtfiles_test.go diff --git a/cmd/micro/config/runtime.go b/internal/config/runtime.go similarity index 100% rename from cmd/micro/config/runtime.go rename to internal/config/runtime.go diff --git a/cmd/micro/config/settings.go b/internal/config/settings.go similarity index 99% rename from cmd/micro/config/settings.go rename to internal/config/settings.go index 8bf7f3fe..2740d957 100644 --- a/cmd/micro/config/settings.go +++ b/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" ) diff --git a/cmd/micro/display/bufwindow.go b/internal/display/bufwindow.go similarity index 98% rename from cmd/micro/display/bufwindow.go rename to internal/display/bufwindow.go index 2675ba82..80e0f668 100644 --- a/cmd/micro/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/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" ) diff --git a/cmd/micro/display/infowindow.go b/internal/display/infowindow.go similarity index 95% rename from cmd/micro/display/infowindow.go rename to internal/display/infowindow.go index 5fa5c41b..40519433 100644 --- a/cmd/micro/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/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" ) diff --git a/cmd/micro/display/statusline.go b/internal/display/statusline.go similarity index 95% rename from cmd/micro/display/statusline.go rename to internal/display/statusline.go index f03345f0..ec7d382a 100644 --- a/cmd/micro/display/statusline.go +++ b/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 diff --git a/cmd/micro/display/tabwindow.go b/internal/display/tabwindow.go similarity index 91% rename from cmd/micro/display/tabwindow.go rename to internal/display/tabwindow.go index 48c4c8b0..698dbf84 100644 --- a/cmd/micro/display/tabwindow.go +++ b/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 { diff --git a/cmd/micro/display/termwindow.go b/internal/display/termwindow.go similarity index 93% rename from cmd/micro/display/termwindow.go rename to internal/display/termwindow.go index a8c6bf01..45150948 100644 --- a/cmd/micro/display/termwindow.go +++ b/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" ) diff --git a/cmd/micro/display/uiwindow.go b/internal/display/uiwindow.go similarity index 88% rename from cmd/micro/display/uiwindow.go rename to internal/display/uiwindow.go index 493bd5c9..bb273ecc 100644 --- a/cmd/micro/display/uiwindow.go +++ b/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 { diff --git a/cmd/micro/display/window.go b/internal/display/window.go similarity index 93% rename from cmd/micro/display/window.go rename to internal/display/window.go index 5983de70..d2d4742a 100644 --- a/cmd/micro/display/window.go +++ b/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 { diff --git a/cmd/micro/info/gutter.go b/internal/info/gutter.go similarity index 100% rename from cmd/micro/info/gutter.go rename to internal/info/gutter.go diff --git a/cmd/micro/info/history.go b/internal/info/history.go similarity index 97% rename from cmd/micro/info/history.go rename to internal/info/history.go index 18e6bbba..9b98357a 100644 --- a/cmd/micro/info/history.go +++ b/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 diff --git a/cmd/micro/info/infobuffer.go b/internal/info/infobuffer.go similarity index 98% rename from cmd/micro/info/infobuffer.go rename to internal/info/infobuffer.go index aebdd347..75ed43ec 100644 --- a/cmd/micro/info/infobuffer.go +++ b/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. diff --git a/cmd/micro/lua/lua.go b/internal/lua/lua.go similarity index 100% rename from cmd/micro/lua/lua.go rename to internal/lua/lua.go diff --git a/cmd/micro/lua/plugin.go b/internal/lua/plugin.go similarity index 100% rename from cmd/micro/lua/plugin.go rename to internal/lua/plugin.go diff --git a/cmd/micro/manager/fetch.go b/internal/manager/fetch.go similarity index 96% rename from cmd/micro/manager/fetch.go rename to internal/manager/fetch.go index 4e68b5a1..529c64dc 100644 --- a/cmd/micro/manager/fetch.go +++ b/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" ) diff --git a/cmd/micro/manager/manager_test.go b/internal/manager/manager_test.go similarity index 96% rename from cmd/micro/manager/manager_test.go rename to internal/manager/manager_test.go index d39e1f12..9db9817c 100644 --- a/cmd/micro/manager/manager_test.go +++ b/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() { diff --git a/cmd/micro/manager/plugin.go b/internal/manager/plugin.go similarity index 98% rename from cmd/micro/manager/plugin.go rename to internal/manager/plugin.go index 4b54f268..5913e378 100644 --- a/cmd/micro/manager/plugin.go +++ b/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" ) diff --git a/cmd/micro/screen/message.go b/internal/screen/message.go similarity index 100% rename from cmd/micro/screen/message.go rename to internal/screen/message.go diff --git a/cmd/micro/screen/screen.go b/internal/screen/screen.go similarity index 96% rename from cmd/micro/screen/screen.go rename to internal/screen/screen.go index 11c8177f..1e149be7 100644 --- a/cmd/micro/screen/screen.go +++ b/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" ) diff --git a/cmd/micro/shell/shell.go b/internal/shell/shell.go similarity index 96% rename from cmd/micro/shell/shell.go rename to internal/shell/shell.go index 7087cfe4..3a00a30f 100644 --- a/cmd/micro/shell/shell.go +++ b/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 diff --git a/cmd/micro/shell/terminal.go b/internal/shell/terminal.go similarity index 96% rename from cmd/micro/shell/terminal.go rename to internal/shell/terminal.go index bfb7fa87..9732e5cb 100644 --- a/cmd/micro/shell/terminal.go +++ b/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" ) diff --git a/cmd/micro/util/profile.go b/internal/util/profile.go similarity index 100% rename from cmd/micro/util/profile.go rename to internal/util/profile.go diff --git a/cmd/micro/util/util.go b/internal/util/util.go similarity index 100% rename from cmd/micro/util/util.go rename to internal/util/util.go diff --git a/cmd/micro/util/util_test.go b/internal/util/util_test.go similarity index 100% rename from cmd/micro/util/util_test.go rename to internal/util/util_test.go diff --git a/cmd/micro/views/splits.go b/internal/views/splits.go similarity index 100% rename from cmd/micro/views/splits.go rename to internal/views/splits.go diff --git a/cmd/micro/views/splits_test.go b/internal/views/splits_test.go similarity index 100% rename from cmd/micro/views/splits_test.go rename to internal/views/splits_test.go diff --git a/cmd/micro/highlight/ftdetect.go b/pkg/highlight/ftdetect.go similarity index 100% rename from cmd/micro/highlight/ftdetect.go rename to pkg/highlight/ftdetect.go diff --git a/cmd/micro/highlight/highlighter.go b/pkg/highlight/highlighter.go similarity index 100% rename from cmd/micro/highlight/highlighter.go rename to pkg/highlight/highlighter.go diff --git a/cmd/micro/highlight/parser.go b/pkg/highlight/parser.go similarity index 100% rename from cmd/micro/highlight/parser.go rename to pkg/highlight/parser.go diff --git a/cmd/micro/shellwords/LICENSE b/pkg/shellwords/LICENSE similarity index 100% rename from cmd/micro/shellwords/LICENSE rename to pkg/shellwords/LICENSE diff --git a/cmd/micro/shellwords/README.md b/pkg/shellwords/README.md similarity index 100% rename from cmd/micro/shellwords/README.md rename to pkg/shellwords/README.md diff --git a/cmd/micro/shellwords/shellwords.go b/pkg/shellwords/shellwords.go similarity index 100% rename from cmd/micro/shellwords/shellwords.go rename to pkg/shellwords/shellwords.go diff --git a/cmd/micro/shellwords/shellwords_test.go b/pkg/shellwords/shellwords_test.go similarity index 100% rename from cmd/micro/shellwords/shellwords_test.go rename to pkg/shellwords/shellwords_test.go diff --git a/cmd/micro/shellwords/util_posix.go b/pkg/shellwords/util_posix.go similarity index 100% rename from cmd/micro/shellwords/util_posix.go rename to pkg/shellwords/util_posix.go diff --git a/cmd/micro/shellwords/util_windows.go b/pkg/shellwords/util_windows.go similarity index 100% rename from cmd/micro/shellwords/util_windows.go rename to pkg/shellwords/util_windows.go diff --git a/cmd/micro/terminfo/LICENSE.md b/pkg/terminfo/LICENSE.md similarity index 100% rename from cmd/micro/terminfo/LICENSE.md rename to pkg/terminfo/LICENSE.md diff --git a/cmd/micro/terminfo/README.md b/pkg/terminfo/README.md similarity index 100% rename from cmd/micro/terminfo/README.md rename to pkg/terminfo/README.md diff --git a/cmd/micro/terminfo/mkinfo.go b/pkg/terminfo/mkinfo.go similarity index 100% rename from cmd/micro/terminfo/mkinfo.go rename to pkg/terminfo/mkinfo.go diff --git a/cmd/micro/terminfo/terminfo.go b/pkg/terminfo/terminfo.go similarity index 100% rename from cmd/micro/terminfo/terminfo.go rename to pkg/terminfo/terminfo.go diff --git a/cmd/micro/terminfo/terminfo_test.go b/pkg/terminfo/terminfo_test.go similarity index 100% rename from cmd/micro/terminfo/terminfo_test.go rename to pkg/terminfo/terminfo_test.go