zyedidia/micro
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2025-06-18 14:55:38 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change project layout and use go.mod

Browse Source
This commit is contained in:
Zachary Yedidia 2019-02-03 23:17:24 -05:00
parent c7f2c9c704
commit 0612af1590
103 changed files with 154 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
.gitmodules vendored
View File

@ -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

8
Makefile
View File

@ -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

8
cmd/micro/micro.go
View File

@ -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"
)

1
cmd/micro/vendor/github.com/blang/semver generated vendored

@ -1 +0,0 @@
Subproject commit 4a1e882c79dcf4ec00d2e29fac74b9c8938d5052

1
cmd/micro/vendor/github.com/dustin/go-humanize generated vendored

@ -1 +0,0 @@
Subproject commit 259d2a102b871d17f30e3cd9881a642961a1e486

1
cmd/micro/vendor/github.com/flynn/json5 generated vendored

@ -1 +0,0 @@
Subproject commit 7620272ed63390e979cf5882d2fa0506fe2a8db5

1
cmd/micro/vendor/github.com/gdamore/encoding generated vendored

@ -1 +0,0 @@
Subproject commit b23993cbb6353f0e6aa98d0ee318a34728f628b9

1
cmd/micro/vendor/github.com/go-errors/errors generated vendored

@ -1 +0,0 @@
Subproject commit 8fa88b06e5974e97fbf9899a7f86a344bfd1f105

1
cmd/micro/vendor/github.com/jtolds/gls generated vendored

@ -1 +0,0 @@
Subproject commit 77f18212c9c7edc9bd6a33d383a7b545ce62f064

1
cmd/micro/vendor/github.com/lucasb-eyer/go-colorful generated vendored

@ -1 +0,0 @@
Subproject commit c900de9dbbc73129068f5af6a823068fc5f2308c

1
cmd/micro/vendor/github.com/mattn/go-isatty generated vendored

@ -1 +0,0 @@
Subproject commit fc9e8d8ef48496124e79ae0df75490096eccf6fe

1
cmd/micro/vendor/github.com/mattn/go-runewidth generated vendored

@ -1 +0,0 @@
Subproject commit 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d

1
cmd/micro/vendor/github.com/mitchellh/go-homedir generated vendored

@ -1 +0,0 @@
Subproject commit b8bc1bf767474819792c23f32d8286a45736f1c6

1
cmd/micro/vendor/github.com/sergi/go-diff generated vendored

@ -1 +0,0 @@
Subproject commit feef008d51ad2b3778f85d387ccf91735543008d

1
cmd/micro/vendor/github.com/smartystreets/assertions generated vendored

@ -1 +0,0 @@
Subproject commit 0b37b35ec7434b77e77a4bb29b79677cced992ea

1
cmd/micro/vendor/github.com/smartystreets/goconvey generated vendored

@ -1 +0,0 @@
Subproject commit e5b2b7c9111590d019a696c7800593f666e1a7f4

1
cmd/micro/vendor/github.com/yuin/gopher-lua generated vendored

@ -1 +0,0 @@
Subproject commit b402f3114ec730d8bddb074a6c137309f561aa78

1
cmd/micro/vendor/github.com/zyedidia/clipboard generated vendored

@ -1 +0,0 @@
Subproject commit 4611e809d8b1a3051c11d11f4b610c44df73fa38

1
cmd/micro/vendor/github.com/zyedidia/glob generated vendored

@ -1 +0,0 @@
Subproject commit dd4023a66dc351ae26e592d21cd133b5b143f3d8

1
cmd/micro/vendor/github.com/zyedidia/poller generated vendored

@ -1 +0,0 @@
Subproject commit ab09682913b79f402713d1df1977dedc19eb25ac

1
cmd/micro/vendor/github.com/zyedidia/pty generated vendored

@ -1 +0,0 @@
Subproject commit 30364665a2445782b12bcb2db75f16ce684da907

1
cmd/micro/vendor/github.com/zyedidia/tcell generated vendored

@ -1 +0,0 @@
Subproject commit 208b6e8f2f8d763a4accac33f3bdbd7dc9c71c01

1
cmd/micro/vendor/github.com/zyedidia/terminal generated vendored

@ -1 +0,0 @@
Subproject commit 1760577dbc0058809dd115a6bfe5999b6b24ab53

1
cmd/micro/vendor/golang.org/x/net generated vendored

@ -1 +0,0 @@
Subproject commit 1a68b1313cf4ad7778376e82641197b60c02f65c

1
cmd/micro/vendor/golang.org/x/text generated vendored

@ -1 +0,0 @@
Subproject commit 210eee5cf7323015d097341bcf7166130d001cd8

1
cmd/micro/vendor/gopkg.in/yaml.v2 generated vendored

@ -1 +0,0 @@
Subproject commit cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b

1
cmd/micro/vendor/layeh.com/gopher-luar generated vendored

@ -1 +0,0 @@
Subproject commit 16281577dff29557258daa8ca9bc9b2e05f451f2

21
go.mod Normal file
View File

@ -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
)

39
go.sum Normal file
View File

@ -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=

12
cmd/micro/action/actions.go → internal/action/actions.go
View File

@ -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"
)

0
cmd/micro/action/actions_other.go → internal/action/actions_other.go
View File

2
cmd/micro/action/actions_posix.go → internal/action/actions_posix.go
View File

@ -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.

4
cmd/micro/action/bindings.go → internal/action/bindings.go
View File

@ -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"
)

6
cmd/micro/action/bufpane.go → internal/action/bufpane.go
View File

@ -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"
)

12
cmd/micro/action/command.go → internal/action/command.go
View File

@ -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

0
cmd/micro/action/events.go → internal/action/events.go
View File

0
cmd/micro/action/globals.go → internal/action/globals.go
View File

6
cmd/micro/action/infocomplete.go → internal/action/infocomplete.go
View File

@ -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

6
cmd/micro/action/infopane.go → internal/action/infopane.go
View File

@ -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"
)

2
cmd/micro/action/pane.go → internal/action/pane.go
View File

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

4
cmd/micro/action/rawpane.go → internal/action/rawpane.go
View File

@ -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"
)

10
cmd/micro/action/tab.go → internal/action/tab.go
View File

@ -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"
)

6
cmd/micro/action/termpane.go → internal/action/termpane.go
View File

@ -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"
)

2
cmd/micro/buffer/autocomplete.go → internal/buffer/autocomplete.go
View File

@ -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

8
cmd/micro/buffer/buffer.go → internal/buffer/buffer.go
View File

@ -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"

2
cmd/micro/buffer/cursor.go → internal/buffer/cursor.go
View File

@ -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

0
cmd/micro/buffer/eventhandler.go → internal/buffer/eventhandler.go
View File

2
cmd/micro/buffer/line_array.go → internal/buffer/line_array.go
View File

@ -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

0
cmd/micro/buffer/line_array_test.go → internal/buffer/line_array_test.go
View File

2
cmd/micro/buffer/loc.go → internal/buffer/loc.go
View File

@ -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

2
cmd/micro/buffer/message.go → internal/buffer/message.go
View File

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

4
cmd/micro/buffer/save.go → internal/buffer/save.go
View File

@ -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"

2
cmd/micro/buffer/search.go → internal/buffer/search.go
View File

@ -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) {

4
cmd/micro/buffer/serialize.go → internal/buffer/serialize.go
View File

@ -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"
)

4
cmd/micro/buffer/settings.go → internal/buffer/settings.go
View File

@ -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

0
cmd/micro/buffer/stack.go → internal/buffer/stack.go
View File

0
cmd/micro/buffer/stack_test.go → internal/buffer/stack_test.go
View File

0
cmd/micro/config/colorscheme.go → internal/config/colorscheme.go
View File

0
cmd/micro/config/colorscheme_test.go → internal/config/colorscheme_test.go
View File

0
cmd/micro/config/config.go → internal/config/config.go
View File

0
cmd/micro/config/globals.go → internal/config/globals.go
View File

0
cmd/micro/config/rtfiles.go → internal/config/rtfiles.go
View File

0
cmd/micro/config/rtfiles_test.go → internal/config/rtfiles_test.go
View File

0
cmd/micro/config/runtime.go → internal/config/runtime.go
View File

2
cmd/micro/config/settings.go → internal/config/settings.go
View File

@ -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"
)

8
cmd/micro/display/bufwindow.go → internal/display/bufwindow.go
View File

@ -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"
)

10
cmd/micro/display/infowindow.go → internal/display/infowindow.go
View File

@ -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"
)

6
cmd/micro/display/statusline.go → internal/display/statusline.go
View File

@ -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

8
cmd/micro/display/tabwindow.go → internal/display/tabwindow.go
View File

@ -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 {

8
cmd/micro/display/termwindow.go → internal/display/termwindow.go
View File

@ -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"
)

8
cmd/micro/display/uiwindow.go → internal/display/uiwindow.go
View File

@ -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 {

2
cmd/micro/display/window.go → internal/display/window.go
View File

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

0
cmd/micro/info/gutter.go → internal/info/gutter.go
View File

2
cmd/micro/info/history.go → internal/info/history.go
View File

@ -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

2
cmd/micro/info/infobuffer.go → internal/info/infobuffer.go
View File

@ -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.

0
cmd/micro/lua/lua.go → internal/lua/lua.go
View File

0
cmd/micro/lua/plugin.go → internal/lua/plugin.go
View File

2
cmd/micro/manager/fetch.go → internal/manager/fetch.go
View File

@ -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"
)

2
cmd/micro/manager/manager_test.go → internal/manager/manager_test.go
View File

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

2
cmd/micro/manager/plugin.go → internal/manager/plugin.go
View File

@ -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"
)

0
cmd/micro/screen/message.go → internal/screen/message.go
View File

4
cmd/micro/screen/screen.go → internal/screen/screen.go
View File

@ -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"
)

4
cmd/micro/shell/shell.go → internal/shell/shell.go
View File

@ -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

4
cmd/micro/shell/terminal.go → internal/shell/terminal.go
View File

@ -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"
)

0
cmd/micro/util/profile.go → internal/util/profile.go
View File

0
cmd/micro/util/util.go → internal/util/util.go
View File

0
cmd/micro/util/util_test.go → internal/util/util_test.go
View File

0
cmd/micro/views/splits.go → internal/views/splits.go
View File

0
cmd/micro/views/splits_test.go → internal/views/splits_test.go
View File

0
cmd/micro/highlight/ftdetect.go → pkg/highlight/ftdetect.go
View File

0
cmd/micro/highlight/highlighter.go → pkg/highlight/highlighter.go
View File

0
cmd/micro/highlight/parser.go → pkg/highlight/parser.go
View File

0
cmd/micro/shellwords/LICENSE → pkg/shellwords/LICENSE
View File

0
cmd/micro/shellwords/README.md → pkg/shellwords/README.md
View File

0
cmd/micro/shellwords/shellwords.go → pkg/shellwords/shellwords.go
View File

0
cmd/micro/shellwords/shellwords_test.go → pkg/shellwords/shellwords_test.go
View File

0
cmd/micro/shellwords/util_posix.go → pkg/shellwords/util_posix.go
View File

0
cmd/micro/shellwords/util_windows.go → pkg/shellwords/util_windows.go
View File

0
cmd/micro/terminfo/LICENSE.md → pkg/terminfo/LICENSE.md
View File

0
cmd/micro/terminfo/README.md → pkg/terminfo/README.md
View File

Some files were not shown because too many files have changed in this diff Show More