Finish support for a fake cursor

Ref #1447

.gitignore

@@ -15,3 +15,4 @@ tools/build-version
 tools/build-date
 tools/info-plist
 tools/bindata
+*.hdr

Makefile

@@ -1,15 +1,14 @@
 .PHONY: runtime
 
-VERSION := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
+VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-version.go)
-HASH := $(shell git rev-parse --short HEAD)
-DATE := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
+HASH = $(shell git rev-parse --short HEAD)
+DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-date.go)
-ADDITIONAL_GO_LINKER_FLAGS := $(shell GOOS=$(shell go env GOHOSTOS) \
-	GOARCH=$(shell go env GOHOSTARCH) \
-	go run tools/info-plist.go "$(VERSION)")
+ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
+	GOARCH=$(shell go env GOHOSTARCH))
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS := -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
+GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
 
 # Builds micro after checking dependencies but without updating the runtime
 build:
@@ -39,6 +38,7 @@ install-quick:
 # Builds the runtime
 runtime:
 	git submodule update --init
+	go run runtime/syntax/make_headers.go runtime/syntax
 	go build -o tools/bindata ./tools/go-bindata
 	tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
 	mv runtime.go internal/config

README.md

@@ -134,19 +134,21 @@ pkg_add -v micro
 
 If your operating system does not have a binary release, but does run Go, you can build from source.
 
-Make sure that you have Go version 1.5 or greater (Go 1.4 will work if your version supports CGO) and that your `GOPATH` env variable is set (I recommend setting it to `~/go` if you don't have one).
+Make sure that you have Go version 1.11 or greater and Go modules are enabled.
 
 ```
-go get -d github.com/zyedidia/micro/cmd/micro
-cd $GOPATH/src/github.com/zyedidia/micro
-make install
+git clone https://github.com/zyedidia/micro
+cd micro
+make build
+sudo mv micro /usr/local/bin # optional
 ```
 
-The binary will then be installed to `$GOPATH/bin` (or your `$GOBIN`).
+The binary will be placed in the current directory and can be moved to
+anywhere you like (for example `/usr/local/bin`).
 
-Please make sure that when you are working with micro's code, you are working on your `GOPATH`.
+The command `make install` will install the binary to `$GOPATH/bin` or `$GOBIN`.
 
-You can install directly with `go get` (`go get -u github.com/zyedidia/micro/cmd/micro`) but this isn't recommended because it doesn't build micro with version information which is useful for the plugin manager.
+You can install directly with `go get` (`go get -u github.com/zyedidia/micro/cmd/micro`) but this isn't recommended because it doesn't build micro with version information.
 
 ### MacOS terminal
 

cmd/micro/initlua.go

@@ -72,6 +72,9 @@ func luaImportMicroConfig() *lua.LTable {
 	ulua.L.SetField(pkg, "RTPlugin", luar.New(ulua.L, config.RTPlugin))
 	ulua.L.SetField(pkg, "RegisterCommonOption", luar.New(ulua.L, config.RegisterCommonOption))
 	ulua.L.SetField(pkg, "RegisterGlobalOption", luar.New(ulua.L, config.RegisterGlobalOption))
+	ulua.L.SetField(pkg, "GetGlobalOption", luar.New(ulua.L, config.GetGlobalOption))
+	ulua.L.SetField(pkg, "SetGlobalOption", luar.New(ulua.L, action.SetGlobalOption))
+	ulua.L.SetField(pkg, "SetGlobalOptionNative", luar.New(ulua.L, action.SetGlobalOptionNative))
 
 	return pkg
 }

cmd/micro/micro.go

@@ -171,6 +171,8 @@ func main() {
 		}
 	}
 
+	screen.Init()
+
 	action.InitBindings()
 	action.InitCommands()
 
@@ -188,8 +190,6 @@ func main() {
 		screen.TermMessage(err)
 	}
 
-	screen.Init()
-
 	// If we have an error, we can exit cleanly and not completely
 	// mess up the terminal being worked in
 	// In other words we need to shut down tcell before the program crashes
@@ -211,9 +211,10 @@ func main() {
 	action.InitTabs(b)
 	action.InitGlobals()
 
+	events = make(chan tcell.Event)
+
 	// Here is the event loop which runs in a separate thread
 	go func() {
-		events = make(chan tcell.Event)
 		for {
 			screen.Lock()
 			e := screen.Screen.PollEvent()

go.mod

@@ -3,24 +3,23 @@ module github.com/zyedidia/micro
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	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 v1.0.3 // indirect
-	github.com/mattn/go-isatty v0.0.4
-	github.com/mattn/go-runewidth v0.0.4
+	github.com/mattn/go-isatty v0.0.11
+	github.com/mattn/go-runewidth v0.0.7
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/npat-efault/poller v2.0.0+incompatible // indirect
-	github.com/sergi/go-diff v1.0.0
-	github.com/stretchr/testify v1.3.0
-	github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9
-	github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d
+	github.com/sergi/go-diff v1.1.0
+	github.com/stretchr/testify v1.4.0
+	github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb
+	github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197
 	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 // indirect
-	github.com/zyedidia/tcell v0.0.0-20191219170756-59b50b23fa9b
+	github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5
+	github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d
+	github.com/zyedidia/pty v2.0.0+incompatible // indirect
+	github.com/zyedidia/tcell v1.4.0
 	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
-	golang.org/x/text v0.3.0
-	gopkg.in/yaml.v2 v2.2.2
-	layeh.com/gopher-luar v1.0.4
+	golang.org/x/text v0.3.2
+	gopkg.in/yaml.v2 v2.2.7
+	layeh.com/gopher-luar v1.0.7
 )
+
+go 1.11

go.sum

@@ -1,46 +1,71 @@
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-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/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 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/npat-efault/poller v2.0.0+incompatible/go.mod h1:lni01B89P8PtVpwlAhdhK1niN5rPkDGGpGGgBJzpSgo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9 h1:Wy3fAQLBPP0JSWdq3kBnmbFgXDHcyhtPpd+8kENV7mU=
-github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac=
-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/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
+github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
+github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
+github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197 h1:gYTNnAW6azuB3BbA6QYWO/H4F2ABSOjjw3Z03tlXd2c=
+github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197/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/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
-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-20191219170756-59b50b23fa9b h1:cryFENlMxJJrkimVx/CUMFDCxC4vpmey2x3A3tAgTNM=
-github.com/zyedidia/tcell v0.0.0-20191219170756-59b50b23fa9b/go.mod h1:yXgdp23+aW8OMENYVBvpKoeiBtjaVWJ9HhpPDu6LBfM=
+github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5 h1:Zs6mpwXvlqpF9zHl5XaN0p5V4J9XvP+WBuiuXyIgqvc=
+github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod h1:c1r+Ob9tUTPB0FKWO1+x+Hsc/zNa45WdGq7Y38Ybip0=
+github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8jFaI4GpI7llsPgzm38/jG0UgxjE=
+github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod h1:NDJSTTYWivnza6zkRapeX2/LwhKPEMQ7bJxqgDVT78I=
+github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s=
+github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
+github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpygApMFGweqw=
+github.com/zyedidia/pty v2.0.0+incompatible/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
+github.com/zyedidia/tcell v1.4.0 h1:uhAz+bdB3HHlVP2hff3WURkI+pERNwgVfy27oi1Gb2A=
+github.com/zyedidia/tcell v1.4.0/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
 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/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-layeh.com/gopher-luar v1.0.4 h1:BFgt94J/CXh4HkDcE2b7A7pBaVeQKEVfHEBRKL/K/Tc=
-layeh.com/gopher-luar v1.0.4/go.mod h1:N3rev/ttQd8yVluXaYsa0M/eknzRYWe+pxZ35ZFmaaI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+layeh.com/gopher-luar v1.0.7 h1:53iv6CCkRs5wyofZ+qVXcyAYQOIG52s6pt4xkqZdq7k=
+layeh.com/gopher-luar v1.0.7/go.mod h1:TPnIVCZ2RJBndm7ohXyaqfhzjlZ+OA2SZR/YwL8tECk=

internal/action/actions.go

@@ -23,6 +23,8 @@ func (h *BufPane) ScrollUp(n int) {
 	if v.StartLine >= n {
 		v.StartLine -= n
 		h.SetView(v)
+	} else {
+		v.StartLine = 0
 	}
 }
 
@@ -86,7 +88,6 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 			h.Cursor.AddWordToSelection()
 		} else {
 			h.Cursor.SetSelectionEnd(h.Cursor.Loc)
-			h.Cursor.CopySelection("primary")
 		}
 	}
 
@@ -613,8 +614,6 @@ func (h *BufPane) Autocomplete() bool {
 // InsertTab inserts a tab or spaces
 func (h *BufPane) InsertTab() bool {
 	b := h.Buf
-	l := b.LineBytes(h.Cursor.Y)
-	l = util.SliceStart(l, h.Cursor.X)
 	indent := b.IndentString(util.IntOpt(b.Settings["tabsize"]))
 	tabBytes := len(indent)
 	bytesUntilIndent := tabBytes - (h.Cursor.GetVisualX() % tabBytes)
@@ -637,10 +636,10 @@ func (h *BufPane) Save() bool {
 	if h.Buf.Path == "" {
 		h.SaveAs()
 	} else {
-		h.saveBufToFile(h.Buf.Path)
+		h.saveBufToFile(h.Buf.Path, "Save")
 	}
 
-	return true
+	return false
 }
 
 // SaveAs saves the buffer to disk with the given name
@@ -654,16 +653,15 @@ func (h *BufPane) SaveAs() bool {
 				InfoBar.Error("Error parsing arguments: ", err)
 				return
 			}
-			h.saveBufToFile(filename)
-
+			h.saveBufToFile(filename, "SaveAs")
 		}
 	})
-	return true
+	return false
 }
 
 // This function saves the buffer to `filename` and changes the buffer's path and name
 // to `filename` if the save is successful
-func (h *BufPane) saveBufToFile(filename string) {
+func (h *BufPane) saveBufToFile(filename string, action string) {
 	err := h.Buf.SaveAs(filename)
 	if err != nil {
 		if strings.HasSuffix(err.Error(), "permission denied") {
@@ -677,6 +675,7 @@ func (h *BufPane) saveBufToFile(filename string) {
 						h.Buf.SetName(filename)
 						InfoBar.Message("Saved " + filename)
 					}
+					h.completeAction(action)
 				}
 			})
 		} else {
@@ -686,6 +685,7 @@ func (h *BufPane) saveBufToFile(filename string) {
 		h.Buf.Path = filename
 		h.Buf.SetName(filename)
 		InfoBar.Message("Saved " + filename)
+		h.completeAction(action)
 	}
 }
 
@@ -808,7 +808,11 @@ func (h *BufPane) Copy() bool {
 	if h.Cursor.HasSelection() {
 		h.Cursor.CopySelection("clipboard")
 		h.freshClip = true
-		InfoBar.Message("Copied selection")
+		if clipboard.Unsupported {
+			InfoBar.Message("Copied selection (install xclip for external clipboard)")
+		} else {
+			InfoBar.Message("Copied selection")
+		}
 	}
 	h.Relocate()
 	return true
@@ -982,7 +986,11 @@ func (h *BufPane) paste(clip string) {
 	h.Buf.Insert(h.Cursor.Loc, clip)
 	// h.Cursor.Loc = h.Cursor.Loc.Move(Count(clip), h.Buf)
 	h.freshClip = false
-	InfoBar.Message("Pasted clipboard")
+	if clipboard.Unsupported {
+		InfoBar.Message("Pasted clipboard (install xclip for external clipboard)")
+	} else {
+		InfoBar.Message("Pasted clipboard")
+	}
 }
 
 // JumpToMatchingBrace moves the cursor to the matching brace if it is
@@ -1230,20 +1238,20 @@ func (h *BufPane) Quit() bool {
 		}
 	}
 	if h.Buf.Modified() {
-		if config.GlobalSettings["autosave"].(float64) > 0 {
-			// autosave on means we automatically save when quitting
-			h.Save()
-			quit()
-		} else {
-			InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
-				if !canceled && !yes {
-					quit()
-				} else if !canceled && yes {
-					h.Save()
-					quit()
-				}
-			})
-		}
+		// if config.GlobalSettings["autosave"].(float64) > 0 {
+		// autosave on means we automatically save when quitting
+		// h.Save()
+		// quit()
+		// } else {
+		InfoBar.YNPrompt("Save changes to "+h.Buf.GetName()+" before closing? (y,n,esc)", func(yes, canceled bool) {
+			if !canceled && !yes {
+				quit()
+			} else if !canceled && yes {
+				h.Save()
+				quit()
+			}
+		})
+		// }
 	} else {
 		quit()
 	}

internal/action/bindings.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/flynn/json5"
+	"github.com/zyedidia/json5"
 	"github.com/zyedidia/micro/internal/config"
 	"github.com/zyedidia/micro/internal/screen"
 	"github.com/zyedidia/tcell"
@@ -83,6 +83,7 @@ modSearch:
 			k = k[5:]
 			modifiers |= tcell.ModShift
 		case strings.HasPrefix(k, "\x1b"):
+			screen.Screen.RegisterRawSeq(k)
 			return RawEvent{
 				esc: k,
 			}, true
@@ -374,8 +375,6 @@ var keyEvents = map[string]tcell.Key{
 	"CtrlRightSq":    tcell.KeyCtrlRightSq,
 	"CtrlCarat":      tcell.KeyCtrlCarat,
 	"CtrlUnderscore": tcell.KeyCtrlUnderscore,
-	"CtrlPageUp":     tcell.KeyCtrlPgUp,
-	"CtrlPageDown":   tcell.KeyCtrlPgDn,
 	"Tab":            tcell.KeyTab,
 	"Esc":            tcell.KeyEsc,
 	"Escape":         tcell.KeyEscape,

internal/action/bufpane.go

@@ -62,6 +62,8 @@ func BufMapKey(k Event, action string) {
 			break
 		}
 
+		// TODO: fix problem when complex bindings have these
+		// characters (escape them?)
 		idx := strings.IndexAny(action, "&|,")
 		a := action
 		if idx >= 0 {
@@ -74,7 +76,7 @@ func BufMapKey(k Event, action string) {
 		}
 
 		var afn func(*BufPane) bool
-		if strings.HasPrefix(action, "command:") {
+		if strings.HasPrefix(a, "command:") {
 			a = strings.SplitN(a, ":", 2)[1]
 			afn = CommandAction(a)
 			names = append(names, "")
@@ -86,7 +88,7 @@ func BufMapKey(k Event, action string) {
 			a = strings.SplitN(a, ":", 2)[1]
 			afn = LuaAction(a)
 			if afn == nil {
-				screen.TermMessage("Lua Error:", action, "does not exist")
+				screen.TermMessage("Lua Error:", a, "does not exist")
 				continue
 			}
 			names = append(names, "")
@@ -94,7 +96,7 @@ func BufMapKey(k Event, action string) {
 			afn = f
 			names = append(names, a)
 		} else {
-			screen.TermMessage("Error:", action, "does not exist")
+			screen.TermMessage("Error:", a, "does not exist")
 			continue
 		}
 		actionfns = append(actionfns, afn)
@@ -223,8 +225,6 @@ func (h *BufPane) OpenBuffer(b *buffer.Buffer) {
 	h.BWindow.SetBuffer(b)
 	h.Cursor = b.GetActiveCursor()
 	h.Resize(h.GetView().Width, h.GetView().Height)
-	v := new(display.View)
-	h.SetView(v)
 	h.Relocate()
 	// Set mouseReleased to true because we assume the mouse is not being pressed when
 	// the editor is opened
@@ -249,12 +249,26 @@ func (h *BufPane) Name() string {
 
 // HandleEvent executes the tcell event properly
 func (h *BufPane) HandleEvent(event tcell.Event) {
+	if h.Buf.ExternallyModified() {
+		InfoBar.YNPrompt("The file on disk has changed. Reload file? (y,n)", func(yes, canceled bool) {
+			if !yes || canceled {
+				h.Buf.UpdateModTime()
+			} else {
+				h.Buf.ReOpen()
+			}
+		})
+
+	}
+
 	switch e := event.(type) {
 	case *tcell.EventRaw:
 		re := RawEvent{
 			esc: e.EscSeq(),
 		}
 		h.DoKeyEvent(re)
+	case *tcell.EventPaste:
+		h.paste(e.Text())
+		h.Relocate()
 	case *tcell.EventKey:
 		ke := KeyEvent{
 			code: e.Key(),
@@ -267,14 +281,27 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 			h.DoRuneInsert(e.Rune())
 		}
 	case *tcell.EventMouse:
+		cancel := false
 		switch e.Buttons() {
+		case tcell.Button1:
+			_, my := e.Position()
+			if h.Buf.Settings["statusline"].(bool) && my >= h.GetView().Y+h.GetView().Height-1 {
+				cancel = true
+			}
 		case tcell.ButtonNone:
 			// Mouse event with no click
 			if !h.mouseReleased {
 				// Mouse was just released
 
-				mx, my := e.Position()
-				mouseLoc := h.LocFromVisual(buffer.Loc{X: mx, Y: my})
+				// mx, my := e.Position()
+				// mouseLoc := h.LocFromVisual(buffer.Loc{X: mx, Y: my})
+
+				// we could finish the selection based on the release location as described
+				// below but when the mouse click is within the scroll margin this will
+				// cause a scroll and selection even for a simple mouse click which is
+				// not good
+				// for terminals that don't support mouse motion events, selection via
+				// the mouse won't work but this is ok
 
 				// Relocating here isn't really necessary because the cursor will
 				// be in the right place from the last mouse event
@@ -282,20 +309,22 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 				// events, this still allows the user to make selections, except only after they
 				// release the mouse
 
-				if !h.doubleClick && !h.tripleClick {
-					h.Cursor.Loc = mouseLoc
-					h.Cursor.SetSelectionEnd(h.Cursor.Loc)
-					h.Cursor.CopySelection("primary")
-				}
+				// if !h.doubleClick && !h.tripleClick {
+				// 	h.Cursor.Loc = mouseLoc
+				// 	h.Cursor.SetSelectionEnd(h.Cursor.Loc)
+				// 	h.Cursor.CopySelection("primary")
+				// }
 				h.mouseReleased = true
 			}
 		}
 
-		me := MouseEvent{
-			btn: e.Buttons(),
-			mod: e.Modifiers(),
+		if !cancel {
+			me := MouseEvent{
+				btn: e.Buttons(),
+				mod: e.Modifiers(),
+			}
+			h.DoMouseEvent(me, e)
 		}
-		h.DoMouseEvent(me, e)
 	}
 	h.Buf.MergeCursors()
 
@@ -333,8 +362,8 @@ func (h *BufPane) execAction(action func(*BufPane) bool, name string, cursor int
 	_, isMulti := MultiActions[name]
 	if (!isMulti && cursor == 0) || isMulti {
 		if h.PluginCB("pre" + name) {
-			asuccess := action(h)
-			psuccess := h.PluginCB("on" + name)
+			success := action(h)
+			success = success && h.PluginCB("on"+name)
 
 			if isMulti {
 				if recording_macro {
@@ -344,13 +373,17 @@ func (h *BufPane) execAction(action func(*BufPane) bool, name string, cursor int
 				}
 			}
 
-			return asuccess && psuccess
+			return success
 		}
 	}
 
 	return false
 }
 
+func (h *BufPane) completeAction(action string) {
+	h.PluginCB("on" + action)
+}
+
 func (h *BufPane) HasKeyEvent(e Event) bool {
 	_, ok := BufKeyBindings[e]
 	return ok

internal/action/command.go

@@ -35,37 +35,37 @@ var commands map[string]Command
 
 func InitCommands() {
 	commands = map[string]Command{
-		"set":        Command{(*BufPane).SetCmd, OptionValueComplete},
-		"reset":      Command{(*BufPane).ResetCmd, OptionValueComplete},
-		"setlocal":   Command{(*BufPane).SetLocalCmd, OptionValueComplete},
-		"show":       Command{(*BufPane).ShowCmd, OptionComplete},
-		"showkey":    Command{(*BufPane).ShowKeyCmd, nil},
-		"run":        Command{(*BufPane).RunCmd, nil},
-		"bind":       Command{(*BufPane).BindCmd, nil},
-		"unbind":     Command{(*BufPane).UnbindCmd, nil},
-		"quit":       Command{(*BufPane).QuitCmd, nil},
-		"goto":       Command{(*BufPane).GotoCmd, nil},
-		"save":       Command{(*BufPane).SaveCmd, nil},
-		"replace":    Command{(*BufPane).ReplaceCmd, nil},
-		"replaceall": Command{(*BufPane).ReplaceAllCmd, nil},
-		"vsplit":     Command{(*BufPane).VSplitCmd, buffer.FileComplete},
-		"hsplit":     Command{(*BufPane).HSplitCmd, buffer.FileComplete},
-		"tab":        Command{(*BufPane).NewTabCmd, buffer.FileComplete},
-		"help":       Command{(*BufPane).HelpCmd, HelpComplete},
-		"eval":       Command{(*BufPane).EvalCmd, nil},
-		"log":        Command{(*BufPane).ToggleLogCmd, nil},
-		"plugin":     Command{(*BufPane).PluginCmd, PluginComplete},
-		"reload":     Command{(*BufPane).ReloadCmd, nil},
-		"reopen":     Command{(*BufPane).ReopenCmd, nil},
-		"cd":         Command{(*BufPane).CdCmd, buffer.FileComplete},
-		"pwd":        Command{(*BufPane).PwdCmd, nil},
-		"open":       Command{(*BufPane).OpenCmd, buffer.FileComplete},
-		"tabswitch":  Command{(*BufPane).TabSwitchCmd, nil},
-		"term":       Command{(*BufPane).TermCmd, nil},
-		"memusage":   Command{(*BufPane).MemUsageCmd, nil},
-		"retab":      Command{(*BufPane).RetabCmd, nil},
-		"raw":        Command{(*BufPane).RawCmd, nil},
-		"textfilter": Command{(*BufPane).TextFilterCmd, nil},
+		"set":        {(*BufPane).SetCmd, OptionValueComplete},
+		"reset":      {(*BufPane).ResetCmd, OptionValueComplete},
+		"setlocal":   {(*BufPane).SetLocalCmd, OptionValueComplete},
+		"show":       {(*BufPane).ShowCmd, OptionComplete},
+		"showkey":    {(*BufPane).ShowKeyCmd, nil},
+		"run":        {(*BufPane).RunCmd, nil},
+		"bind":       {(*BufPane).BindCmd, nil},
+		"unbind":     {(*BufPane).UnbindCmd, nil},
+		"quit":       {(*BufPane).QuitCmd, nil},
+		"goto":       {(*BufPane).GotoCmd, nil},
+		"save":       {(*BufPane).SaveCmd, nil},
+		"replace":    {(*BufPane).ReplaceCmd, nil},
+		"replaceall": {(*BufPane).ReplaceAllCmd, nil},
+		"vsplit":     {(*BufPane).VSplitCmd, buffer.FileComplete},
+		"hsplit":     {(*BufPane).HSplitCmd, buffer.FileComplete},
+		"tab":        {(*BufPane).NewTabCmd, buffer.FileComplete},
+		"help":       {(*BufPane).HelpCmd, HelpComplete},
+		"eval":       {(*BufPane).EvalCmd, nil},
+		"log":        {(*BufPane).ToggleLogCmd, nil},
+		"plugin":     {(*BufPane).PluginCmd, PluginComplete},
+		"reload":     {(*BufPane).ReloadCmd, nil},
+		"reopen":     {(*BufPane).ReopenCmd, nil},
+		"cd":         {(*BufPane).CdCmd, buffer.FileComplete},
+		"pwd":        {(*BufPane).PwdCmd, nil},
+		"open":       {(*BufPane).OpenCmd, buffer.FileComplete},
+		"tabswitch":  {(*BufPane).TabSwitchCmd, nil},
+		"term":       {(*BufPane).TermCmd, nil},
+		"memusage":   {(*BufPane).MemUsageCmd, nil},
+		"retab":      {(*BufPane).RetabCmd, nil},
+		"raw":        {(*BufPane).RawCmd, nil},
+		"textfilter": {(*BufPane).TextFilterCmd, nil},
 	}
 }
 
@@ -240,7 +240,7 @@ func (h *BufPane) RawCmd(args []string) {
 
 // TextFilterCmd filters the selection through the command.
 // Selection goes to the command input.
-// On successfull run command output replaces the current selection.
+// On successful run command output replaces the current selection.
 func (h *BufPane) TextFilterCmd(args []string) {
 	if len(args) == 0 {
 		InfoBar.Error("usage: textfilter arguments")
@@ -539,13 +539,13 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 		} else {
 			screen.Screen.EnableMouse()
 		}
-	} else if option == "autosave" {
-		if nativeValue.(float64) > 0 {
-			config.SetAutoTime(int(nativeValue.(float64)))
-			config.StartAutoSave()
-		} else {
-			config.SetAutoTime(0)
-		}
+		// } else if option == "autosave" {
+		// 	if nativeValue.(float64) > 0 {
+		// 		config.SetAutoTime(int(nativeValue.(float64)))
+		// 		config.StartAutoSave()
+		// 	} else {
+		// 		config.SetAutoTime(0)
+		// 	}
 	} else {
 		for _, pl := range config.Plugins {
 			if option == pl.Name {
@@ -691,7 +691,7 @@ func (h *BufPane) BindCmd(args []string) {
 // UnbindCmd binds a key to its default action
 func (h *BufPane) UnbindCmd(args []string) {
 	if len(args) < 1 {
-		InfoBar.Error("Not enough arguements")
+		InfoBar.Error("Not enough arguments")
 		return
 	}
 
@@ -820,23 +820,23 @@ func (h *BufPane) ReplaceCmd(args []string) {
 
 	nreplaced := 0
 	start := h.Buf.Start()
-	end := h.Buf.End()
-	if h.Cursor.HasSelection() {
-		start = h.Cursor.CurSelection[0]
-		end = h.Cursor.CurSelection[1]
-	}
+	// end := h.Buf.End()
+	// if h.Cursor.HasSelection() {
+	// 	start = h.Cursor.CurSelection[0]
+	// 	end = h.Cursor.CurSelection[1]
+	// }
 	if all {
-		nreplaced = h.Buf.ReplaceRegex(start, end, regex, replace)
+		nreplaced = h.Buf.ReplaceRegex(start, h.Buf.End(), regex, replace)
 	} else {
 		inRange := func(l buffer.Loc) bool {
-			return l.GreaterEqual(start) && l.LessThan(end)
+			return l.GreaterEqual(start) && l.LessEqual(h.Buf.End())
 		}
 
 		searchLoc := start
 		searching := true
 		var doReplacement func()
 		doReplacement = func() {
-			locs, found, err := h.Buf.FindNext(search, start, end, searchLoc, true, !noRegex)
+			locs, found, err := h.Buf.FindNext(search, start, h.Buf.End(), searchLoc, true, !noRegex)
 			if err != nil {
 				InfoBar.Error(err)
 				return
@@ -853,6 +853,7 @@ func (h *BufPane) ReplaceCmd(args []string) {
 			InfoBar.YNPrompt("Perform replacement (y,n,esc)", func(yes, canceled bool) {
 				if !canceled && yes {
 					h.Buf.Replace(locs[0], locs[1], replaceStr)
+
 					searchLoc = locs[0]
 					searchLoc.X += utf8.RuneCount(replace)
 					h.Cursor.Loc = searchLoc

internal/action/infopane.go

@@ -147,7 +147,7 @@ var InfoNones = []string{
 	"SkipMultiCursor",
 }
 
-// InfoOverrides is the list of actions which have been overriden
+// InfoOverrides is the list of actions which have been overridden
 // by the infohandler
 var InfoOverrides = map[string]InfoKeyAction{
 	"CursorUp":      (*InfoPane).CursorUp,

internal/action/tab.go

@@ -103,9 +103,15 @@ func (t *TabList) HandleEvent(event tcell.Event) {
 		mx, my := e.Position()
 		switch e.Buttons() {
 		case tcell.Button1:
-			ind := t.LocFromVisual(buffer.Loc{mx, my})
-			if ind != -1 {
-				t.SetActive(ind)
+			if len(t.List) > 1 {
+				ind := t.LocFromVisual(buffer.Loc{mx, my})
+				if ind != -1 {
+					t.SetActive(ind)
+					return
+				}
+				if my == 0 {
+					return
+				}
 			}
 		case tcell.WheelUp:
 			if my == t.Y {

internal/action/terminal_supported.go

@@ -18,9 +18,8 @@ func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callba
 	t := new(shell.Terminal)
 	t.Start(args, getOutput, wait, callback, userargs)
 
-	id := h.ID()
 	h.AddTab()
-	id = MainTab().Panes[0].ID()
+	id := MainTab().Panes[0].ID()
 
 	v := h.GetView()
 	MainTab().Panes[0] = NewTermPane(v.X, v.Y, v.Width, v.Height, t, id)

internal/buffer/backup.go

@@ -3,7 +3,6 @@ package buffer
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"time"
 
@@ -17,7 +16,9 @@ const backupMsg = `A backup was detected for this file. This likely means that m
 crashed while editing this file, or another instance of micro is currently
 editing this file.
 
-The backup was created on %s.
+The backup was created on %s, and the file is
+
+%s
 
 * 'recover' will apply the backup as unsaved changes to the current buffer.
   When the buffer is closed, the backup will be removed.
@@ -34,8 +35,7 @@ func (b *Buffer) Backup(checkTime bool) error {
 
 	if checkTime {
 		sub := time.Now().Sub(b.lastbackup)
-		if sub < time.Duration(backup_time)*time.Millisecond {
-			log.Println("Backup event but not enough time has passed", sub)
+		if sub < time.Duration(backupTime)*time.Millisecond {
 			return nil
 		}
 	}
@@ -45,13 +45,10 @@ func (b *Buffer) Backup(checkTime bool) error {
 	backupdir := config.ConfigDir + "/backups/"
 	if _, err := os.Stat(backupdir); os.IsNotExist(err) {
 		os.Mkdir(backupdir, os.ModePerm)
-		log.Println("Creating backup dir")
 	}
 
 	name := backupdir + util.EscapePath(b.AbsPath)
 
-	log.Println("Backing up to", name)
-
 	err := overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
 		if len(b.lines) == 0 {
 			return
@@ -98,7 +95,7 @@ func (b *Buffer) ApplyBackup(fsize int64) bool {
 			if err == nil {
 				defer backup.Close()
 				t := info.ModTime()
-				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"))
+				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), util.EscapePath(b.AbsPath))
 				choice := screen.TermPrompt(msg, []string{"r", "i", "recover", "ignore"}, true)
 
 				if choice%2 == 0 {

internal/buffer/buffer.go

@@ -18,14 +18,14 @@ import (
 	"github.com/zyedidia/micro/internal/config"
 	ulua "github.com/zyedidia/micro/internal/lua"
 	"github.com/zyedidia/micro/internal/screen"
-	. "github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 	"github.com/zyedidia/micro/pkg/highlight"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
 )
 
-const backup_time = 8000
+const backupTime = 8000
 
 var (
 	OpenBuffers []*Buffer
@@ -113,7 +113,7 @@ type Buffer struct {
 	Messages []*Message
 
 	// counts the number of edits
-	// resets every backup_time edits
+	// resets every backupTime edits
 	lastbackup time.Time
 }
 
@@ -123,8 +123,8 @@ type Buffer struct {
 // and an error if the file is a directory
 func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
 	var err error
-	filename, cursorPos := GetPathAndCursorPosition(path)
-	filename, err = ReplaceHome(filename)
+	filename, cursorPos := util.GetPathAndCursorPosition(path)
+	filename, err = util.ReplaceHome(filename)
 	if err != nil {
 		return nil, err
 	}
@@ -148,7 +148,7 @@ func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
 		// File does not exist -- create an empty buffer with that name
 		buf = NewBufferFromString("", filename, btype)
 	} else {
-		buf = NewBuffer(file, FSize(file), filename, cursorLoc, btype)
+		buf = NewBuffer(file, util.FSize(file), filename, cursorLoc, btype)
 	}
 
 	return buf, nil
@@ -216,7 +216,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 	}
 
 	// The last time this file was modified
-	b.ModTime, _ = GetModTime(b.Path)
+	b.UpdateModTime()
 
 	switch b.Endings {
 	case FFUnix:
@@ -329,6 +329,22 @@ func (b *Buffer) FileType() string {
 	return b.Settings["filetype"].(string)
 }
 
+// ExternallyModified returns whether the file being edited has
+// been modified by some external process
+func (b *Buffer) ExternallyModified() bool {
+	modTime, err := util.GetModTime(b.Path)
+	if err == nil {
+		return modTime != b.ModTime
+	}
+	return false
+}
+
+// UpdateModTime updates the modtime of this file
+func (b *Buffer) UpdateModTime() (err error) {
+	b.ModTime, err = util.GetModTime(b.Path)
+	return
+}
+
 // ReOpen reloads the current buffer from disk
 func (b *Buffer) ReOpen() error {
 	file, err := os.Open(b.Path)
@@ -350,7 +366,7 @@ func (b *Buffer) ReOpen() error {
 	}
 	b.EventHandler.ApplyDiff(txt)
 
-	b.ModTime, err = GetModTime(b.Path)
+	err = b.UpdateModTime()
 	b.isModified = false
 	b.RelocateCursors()
 	return err
@@ -437,59 +453,121 @@ func (b *Buffer) UpdateRules() {
 	if !b.Type.Syntax {
 		return
 	}
-	rehighlight := false
-	var files []*highlight.File
-	for _, f := range config.ListRuntimeFiles(config.RTSyntax) {
+	syntaxFile := ""
+	ft := b.Settings["filetype"].(string)
+	var header *highlight.Header
+	for _, f := range config.ListRuntimeFiles(config.RTSyntaxHeader) {
 		data, err := f.Data()
 		if err != nil {
-			screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
-		} else {
-			file, err := highlight.ParseFile(data)
-			if err != nil {
-				screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
-				continue
-			}
-			ftdetect, err := highlight.ParseFtDetect(file)
-			if err != nil {
-				screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
-				continue
-			}
+			screen.TermMessage("Error loading syntax header file " + f.Name() + ": " + err.Error())
+			continue
+		}
 
-			ft := b.Settings["filetype"].(string)
-			if (ft == "unknown" || ft == "") && !rehighlight {
-				if highlight.MatchFiletype(ftdetect, b.Path, b.lines[0].data) {
-					header := new(highlight.Header)
-					header.FileType = file.FileType
-					header.FtDetect = ftdetect
-					b.SyntaxDef, err = highlight.ParseDef(file, header)
-					if err != nil {
-						screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
-						continue
-					}
-					rehighlight = true
-				}
-			} else {
-				if file.FileType == ft && !rehighlight {
-					header := new(highlight.Header)
-					header.FileType = file.FileType
-					header.FtDetect = ftdetect
-					b.SyntaxDef, err = highlight.ParseDef(file, header)
-					if err != nil {
-						screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
-						continue
-					}
-					rehighlight = true
-				}
+		header, err = highlight.MakeHeader(data)
+		if err != nil {
+			screen.TermMessage("Error reading syntax header file", f.Name(), err)
+			continue
+		}
+
+		if ft == "unknown" || ft == "" {
+			if highlight.MatchFiletype(header.FtDetect, b.Path, b.lines[0].data) {
+				syntaxFile = f.Name()
+				break
 			}
-			files = append(files, file)
+		} else if header.FileType == ft {
+			syntaxFile = f.Name()
+			break
 		}
 	}
 
-	if b.SyntaxDef != nil {
+	if syntaxFile == "" {
+		// search for the syntax file in the user's custom syntax files
+		for _, f := range config.ListRealRuntimeFiles(config.RTSyntax) {
+			data, err := f.Data()
+			if err != nil {
+				screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
+				continue
+			}
+
+			header, err = highlight.MakeHeaderYaml(data)
+			file, err := highlight.ParseFile(data)
+			if err != nil {
+				screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+				continue
+			}
+
+			if (ft == "unknown" || ft == "" && highlight.MatchFiletype(header.FtDetect, b.Path, b.lines[0].data)) || header.FileType == ft {
+				syndef, err := highlight.ParseDef(file, header)
+				if err != nil {
+					screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+					continue
+				}
+				b.SyntaxDef = syndef
+				break
+			}
+		}
+	} else {
+		for _, f := range config.ListRuntimeFiles(config.RTSyntax) {
+			if f.Name() == syntaxFile {
+				data, err := f.Data()
+				if err != nil {
+					screen.TermMessage("Error loading syntax file " + f.Name() + ": " + err.Error())
+					continue
+				}
+
+				file, err := highlight.ParseFile(data)
+				if err != nil {
+					screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+					continue
+				}
+
+				syndef, err := highlight.ParseDef(file, header)
+				if err != nil {
+					screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+					continue
+				}
+				b.SyntaxDef = syndef
+				break
+			}
+		}
+	}
+
+	if b.SyntaxDef != nil && highlight.HasIncludes(b.SyntaxDef) {
+		includes := highlight.GetIncludes(b.SyntaxDef)
+
+		var files []*highlight.File
+		for _, f := range config.ListRuntimeFiles(config.RTSyntax) {
+			data, err := f.Data()
+			if err != nil {
+				screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+				continue
+			}
+			header, err := highlight.MakeHeaderYaml(data)
+			if err != nil {
+				screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+				continue
+			}
+
+			for _, i := range includes {
+				if header.FileType == i {
+					file, err := highlight.ParseFile(data)
+					if err != nil {
+						screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
+						continue
+					}
+					files = append(files, file)
+					break
+				}
+			}
+			if len(files) >= len(includes) {
+				break
+			}
+		}
+
 		highlight.ResolveIncludes(b.SyntaxDef, files)
 	}
 
-	if b.Highlighter == nil || rehighlight {
+	if b.Highlighter == nil || syntaxFile != "" {
 		if b.SyntaxDef != nil {
 			b.Settings["filetype"] = b.SyntaxDef.FileType
 			b.Highlighter = highlight.NewHighlighter(b.SyntaxDef)
@@ -512,7 +590,7 @@ func (b *Buffer) ClearMatches() {
 // depending on the settings)
 func (b *Buffer) IndentString(tabsize int) string {
 	if b.Settings["tabstospaces"].(bool) {
-		return Spaces(tabsize)
+		return util.Spaces(tabsize)
 	}
 	return "\t"
 }
@@ -600,7 +678,7 @@ func (b *Buffer) RemoveCursor(i int) {
 	copy(b.cursors[i:], b.cursors[i+1:])
 	b.cursors[len(b.cursors)-1] = nil
 	b.cursors = b.cursors[:len(b.cursors)-1]
-	b.curCursor = Clamp(b.curCursor, 0, len(b.cursors)-1)
+	b.curCursor = util.Clamp(b.curCursor, 0, len(b.cursors)-1)
 	b.UpdateCursors()
 }
 
@@ -741,13 +819,13 @@ func (b *Buffer) FindMatchingBrace(braceType [2]rune, start Loc) (Loc, bool) {
 // Retab changes all tabs to spaces or vice versa
 func (b *Buffer) Retab() {
 	toSpaces := b.Settings["tabstospaces"].(bool)
-	tabsize := IntOpt(b.Settings["tabsize"])
+	tabsize := util.IntOpt(b.Settings["tabsize"])
 	dirty := false
 
 	for i := 0; i < b.LinesNum(); i++ {
 		l := b.LineBytes(i)
 
-		ws := GetLeadingWhitespace(l)
+		ws := util.GetLeadingWhitespace(l)
 		if len(ws) != 0 {
 			if toSpaces {
 				ws = bytes.Replace(ws, []byte{'\t'}, bytes.Repeat([]byte{' '}, tabsize), -1)
@@ -789,10 +867,12 @@ func ParseCursorLocation(cursorPositions []string) (Loc, error) {
 	return startpos, err
 }
 
+// Line returns the string representation of the given line number
 func (b *Buffer) Line(i int) string {
 	return string(b.LineBytes(i))
 }
 
+// WriteLog writes a string to the log buffer
 func WriteLog(s string) {
 	LogBuf.EventHandler.Insert(LogBuf.End(), s)
 }

internal/buffer/save.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/zyedidia/micro/internal/config"
 	"github.com/zyedidia/micro/internal/screen"
-	. "github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/transform"
@@ -140,12 +140,12 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 
 	// Update the last time this file was updated after saving
 	defer func() {
-		b.ModTime, _ = GetModTime(filename)
+		b.ModTime, _ = util.GetModTime(filename)
 		err = b.Serialize()
 	}()
 
 	// Removes any tilde and replaces with the absolute path to home
-	absFilename, _ := ReplaceHome(filename)
+	absFilename, _ := util.ReplaceHome(filename)
 
 	// Get the leading path to the file | "." is returned if there's no leading path provided
 	if dirname := filepath.Dir(absFilename); dirname != "." {

internal/buffer/search.go

@@ -115,7 +115,7 @@ func (b *Buffer) FindNext(s string, start, end, from Loc, down bool, useRegex bo
 		return [2]Loc{}, false, err
 	}
 
-	found := false
+	var found bool
 	var l [2]Loc
 	if down {
 		l, found = b.findDown(r, from, end)

internal/buffer/serialize.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/text/encoding"
 
 	"github.com/zyedidia/micro/internal/config"
-	. "github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 )
 
 // The SerializedBuffer holds the types that get serialized when a buffer is saved
@@ -30,7 +30,7 @@ func (b *Buffer) Serialize() error {
 		return nil
 	}
 
-	name := config.ConfigDir + "/buffers/" + EscapePath(b.AbsPath)
+	name := config.ConfigDir + "/buffers/" + util.EscapePath(b.AbsPath)
 
 	return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
 		err := gob.NewEncoder(file).Encode(SerializedBuffer{
@@ -48,7 +48,7 @@ func (b *Buffer) Unserialize() error {
 	if b.Path == "" {
 		return nil
 	}
-	file, err := os.Open(config.ConfigDir + "/buffers/" + EscapePath(b.AbsPath))
+	file, err := os.Open(config.ConfigDir + "/buffers/" + util.EscapePath(b.AbsPath))
 	defer file.Close()
 	if err == nil {
 		var buffer SerializedBuffer

internal/config/config.go

@@ -14,16 +14,22 @@ var ConfigDir string
 func InitConfigDir(flagConfigDir string) error {
 	var e error
 
-	xdgHome := os.Getenv("XDG_CONFIG_HOME")
-	if xdgHome == "" {
-		// The user has not set $XDG_CONFIG_HOME so we should act like it was set to ~/.config
-		home, err := homedir.Dir()
-		if err != nil {
-			return errors.New("Error finding your home directory\nCan't load config files")
+	microHome := os.Getenv("MICRO_CONFIG_HOME")
+	if microHome == "" {
+		// The user has not set $MICRO_CONFIG_HOME so we'll try $XDG_CONFIG_HOME
+		xdgHome := os.Getenv("XDG_CONFIG_HOME")
+		if xdgHome == "" {
+			// The user has not set $XDG_CONFIG_HOME so we should act like it was set to ~/.config
+			home, err := homedir.Dir()
+			if err != nil {
+				return errors.New("Error finding your home directory\nCan't load config files: " + err.Error())
+			}
+			xdgHome = home + "/.config"
 		}
-		xdgHome = home + "/.config"
+
+		microHome = xdgHome + "/micro"
 	}
-	ConfigDir = xdgHome + "/micro"
+	ConfigDir = microHome
 
 	if len(flagConfigDir) > 0 {
 		if _, err := os.Stat(flagConfigDir); os.IsNotExist(err) {
@@ -34,20 +40,11 @@ func InitConfigDir(flagConfigDir string) error {
 		}
 	}
 
-	if _, err := os.Stat(xdgHome); os.IsNotExist(err) {
-		// If the xdgHome doesn't exist we should create it
-		err = os.Mkdir(xdgHome, os.ModePerm)
-		if err != nil {
-			return errors.New("Error creating XDG_CONFIG_HOME directory: " + err.Error())
-		}
-	}
-
-	if _, err := os.Stat(ConfigDir); os.IsNotExist(err) {
-		// If the micro specific config directory doesn't exist we should create that too
-		err = os.Mkdir(ConfigDir, os.ModePerm)
-		if err != nil {
-			return errors.New("Error creating configuration directory: " + err.Error())
-		}
+	// Create micro config home directory if it does not exist
+	// This creates parent directories and does nothing if it already exists
+	err := os.MkdirAll(ConfigDir, os.ModePerm)
+	if err != nil {
+		return errors.New("Error creating configuration directory: " + err.Error())
 	}
 
 	return e

internal/config/plugin.go

@@ -65,6 +65,7 @@ func RunPluginFnBool(fn string, args ...lua.LValue) (bool, error) {
 }
 
 type Plugin struct {
+	DirName string        // name of plugin folder
 	Name    string        // name of plugin
 	Info    *PluginInfo   // json file containing info
 	Srcs    []RuntimeFile // lua files

internal/config/rtfiles.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"io/ioutil"
 	"log"
 	"os"
@@ -11,11 +12,12 @@ import (
 )
 
 const (
-	RTColorscheme = 0
-	RTSyntax      = 1
-	RTHelp        = 2
-	RTPlugin      = 3
-	NumTypes      = 4 // How many filetypes are there
+	RTColorscheme  = 0
+	RTSyntax       = 1
+	RTHelp         = 2
+	RTPlugin       = 3
+	RTSyntaxHeader = 4
+	NumTypes       = 5 // How many filetypes are there
 )
 
 type RTFiletype byte
@@ -30,6 +32,7 @@ type RuntimeFile interface {
 
 // allFiles contains all available files, mapped by filetype
 var allFiles [NumTypes][]RuntimeFile
+var realFiles [NumTypes][]RuntimeFile
 
 // some file on filesystem
 type realFile string
@@ -83,6 +86,12 @@ func AddRuntimeFile(fileType RTFiletype, file RuntimeFile) {
 	allFiles[fileType] = append(allFiles[fileType], file)
 }
 
+// AddRealRuntimeFile registers a file for the given filetype
+func AddRealRuntimeFile(fileType RTFiletype, file RuntimeFile) {
+	allFiles[fileType] = append(allFiles[fileType], file)
+	realFiles[fileType] = append(realFiles[fileType], file)
+}
+
 // AddRuntimeFilesFromDirectory registers each file from the given directory for
 // the filetype which matches the file-pattern
 func AddRuntimeFilesFromDirectory(fileType RTFiletype, directory, pattern string) {
@@ -90,7 +99,7 @@ func AddRuntimeFilesFromDirectory(fileType RTFiletype, directory, pattern string
 	for _, f := range files {
 		if ok, _ := filepath.Match(pattern, f.Name()); !f.IsDir() && ok {
 			fullPath := filepath.Join(directory, f.Name())
-			AddRuntimeFile(fileType, realFile(fullPath))
+			AddRealRuntimeFile(fileType, realFile(fullPath))
 		}
 	}
 }
@@ -125,6 +134,12 @@ func ListRuntimeFiles(fileType RTFiletype) []RuntimeFile {
 	return allFiles[fileType]
 }
 
+// ListRealRuntimeFiles lists all real runtime files (on disk) for a filetype
+// these runtime files will be ones defined by the user and loaded from the config directory
+func ListRealRuntimeFiles(fileType RTFiletype) []RuntimeFile {
+	return realFiles[fileType]
+}
+
 // InitRuntimeFiles initializes all assets file and the config directory
 func InitRuntimeFiles() {
 	add := func(fileType RTFiletype, dir, pattern string) {
@@ -134,12 +149,14 @@ func InitRuntimeFiles() {
 
 	add(RTColorscheme, "colorschemes", "*.micro")
 	add(RTSyntax, "syntax", "*.yaml")
+	add(RTSyntaxHeader, "syntax", "*.hdr")
 	add(RTHelp, "help", "*.md")
 
 	initlua := filepath.Join(ConfigDir, "init.lua")
 	if _, err := os.Stat(initlua); !os.IsNotExist(err) {
 		p := new(Plugin)
 		p.Name = "initlua"
+		p.DirName = "initlua"
 		p.Srcs = append(p.Srcs, realFile(initlua))
 		Plugins = append(Plugins, p)
 	}
@@ -155,6 +172,7 @@ func InitRuntimeFiles() {
 			srcs, _ := ioutil.ReadDir(filepath.Join(plugdir, d.Name()))
 			p := new(Plugin)
 			p.Name = d.Name()
+			p.DirName = d.Name()
 			for _, f := range srcs {
 				if strings.HasSuffix(f.Name(), ".lua") {
 					p.Srcs = append(p.Srcs, realFile(filepath.Join(plugdir, d.Name(), f.Name())))
@@ -182,6 +200,7 @@ func InitRuntimeFiles() {
 			if srcs, err := AssetDir(filepath.Join(plugdir, d)); err == nil {
 				p := new(Plugin)
 				p.Name = d
+				p.DirName = d
 				p.Default = true
 				for _, f := range srcs {
 					if strings.HasSuffix(f, ".lua") {
@@ -226,28 +245,40 @@ func PluginListRuntimeFiles(fileType RTFiletype) []string {
 }
 
 // PluginAddRuntimeFile adds a file to the runtime files for a plugin
-func PluginAddRuntimeFile(plugin string, filetype RTFiletype, filePath string) {
-	fullpath := filepath.Join(ConfigDir, "plug", plugin, filePath)
+func PluginAddRuntimeFile(plugin string, filetype RTFiletype, filePath string) error {
+	pl := FindPlugin(plugin)
+	if pl == nil {
+		return errors.New("Plugin " + plugin + " does not exist")
+	}
+	pldir := pl.DirName
+	fullpath := filepath.Join(ConfigDir, "plug", pldir, filePath)
 	if _, err := os.Stat(fullpath); err == nil {
 		AddRuntimeFile(filetype, realFile(fullpath))
 	} else {
-		fullpath = path.Join("runtime", "plugins", plugin, filePath)
+		fullpath = path.Join("runtime", "plugins", pldir, filePath)
 		AddRuntimeFile(filetype, assetFile(fullpath))
 	}
+	return nil
 }
 
 // PluginAddRuntimeFilesFromDirectory adds files from a directory to the runtime files for a plugin
-func PluginAddRuntimeFilesFromDirectory(plugin string, filetype RTFiletype, directory, pattern string) {
-	fullpath := filepath.Join(ConfigDir, "plug", plugin, directory)
+func PluginAddRuntimeFilesFromDirectory(plugin string, filetype RTFiletype, directory, pattern string) error {
+	pl := FindPlugin(plugin)
+	if pl == nil {
+		return errors.New("Plugin " + plugin + " does not exist")
+	}
+	pldir := pl.DirName
+	fullpath := filepath.Join(ConfigDir, "plug", pldir, directory)
 	if _, err := os.Stat(fullpath); err == nil {
 		AddRuntimeFilesFromDirectory(filetype, fullpath, pattern)
 	} else {
-		fullpath = path.Join("runtime", "plugins", plugin, directory)
+		fullpath = path.Join("runtime", "plugins", pldir, directory)
 		AddRuntimeFilesFromAssets(filetype, fullpath, pattern)
 	}
+	return nil
 }
 
 // PluginAddRuntimeFileFromMemory adds a file to the runtime files for a plugin from a given string
-func PluginAddRuntimeFileFromMemory(plugin string, filetype RTFiletype, filename, data string) {
+func PluginAddRuntimeFileFromMemory(filetype RTFiletype, filename, data string) {
 	AddRuntimeFile(filetype, memoryFile{filename, []byte(data)})
 }

internal/config/settings.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/flynn/json5"
 	"github.com/zyedidia/glob"
+	"github.com/zyedidia/json5"
 	"github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 )
@@ -34,7 +34,7 @@ func init() {
 
 // Options with validators
 var optionValidators = map[string]optionValidator{
-	"autosave":     validateNonNegativeValue,
+	// "autosave":     validateNonNegativeValue,
 	"tabsize":      validatePositiveValue,
 	"scrollmargin": validateNonNegativeValue,
 	"scrollspeed":  validateNonNegativeValue,
@@ -182,7 +182,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"splitbottom":    true,
 	"splitright":     true,
 	"statusformatl":  "$(filename) $(modified)($(line),$(col)) | ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)",
-	"statusformatr":  "$(bind:ToggleKeyMenu): show bindings, $(bind:ToggleHelp): toggle help",
+	"statusformatr":  "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help",
 	"statusline":     true,
 	"syntax":         true,
 	"tabmovement":    false,
@@ -213,7 +213,7 @@ func DefaultCommonSettings() map[string]interface{} {
 }
 
 var defaultGlobalSettings = map[string]interface{}{
-	"autosave":    float64(0),
+	// "autosave":    float64(0),
 	"colorscheme": "default",
 	"infobar":     true,
 	"keymenu":     false,

internal/display/bufwindow.go

@@ -1,7 +1,6 @@
 package display
 
 import (
-	"log"
 	"strconv"
 	"unicode/utf8"
 
@@ -45,12 +44,12 @@ func (w *BufWindow) SetBuffer(b *buffer.Buffer) {
 	w.Buf = b
 }
 
-func (v *View) GetView() *View {
-	return v
+func (w *BufWindow) GetView() *View {
+	return w.View
 }
 
-func (v *View) SetView(view *View) {
-	v = view
+func (w *BufWindow) SetView(view *View) {
+	w.View = view
 }
 
 func (w *BufWindow) Resize(width, height int) {
@@ -103,7 +102,7 @@ func (w *BufWindow) getStartInfo(n, lineN int) ([]byte, int, int, *tcell.Style)
 func (w *BufWindow) Clear() {
 	for y := 0; y < w.Height; y++ {
 		for x := 0; x < w.Width; x++ {
-			screen.Screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
+			screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
 		}
 	}
 }
@@ -121,9 +120,8 @@ func (w *BufWindow) Bottomline() int {
 		return h
 	}
 
-	l := w.LocFromVisual(buffer.Loc{0, w.Height})
+	l := w.LocFromVisual(buffer.Loc{0, w.Y + w.Height})
 
-	log.Println("Bottom line:", l.Y)
 	return l.Y
 }
 
@@ -134,7 +132,6 @@ func (w *BufWindow) Relocate() bool {
 	b := w.Buf
 	// how many buffer lines are in the view
 	height := w.Bottomline() + 1 - w.StartLine
-	log.Printf("Height: %d, w.Height: %d\n", height, w.Height)
 	h := w.Height
 	if w.drawStatus {
 		h--
@@ -301,9 +298,9 @@ func (w *BufWindow) drawGutter(vloc *buffer.Loc, bloc *buffer.Loc) {
 			break
 		}
 	}
-	screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, char, nil, s)
+	screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, char, nil, s)
 	vloc.X++
-	screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, char, nil, s)
+	screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, char, nil, s)
 	vloc.X++
 }
 
@@ -312,21 +309,21 @@ func (w *BufWindow) drawLineNum(lineNumStyle tcell.Style, softwrapped bool, maxL
 
 	// Write the spaces before the line number if necessary
 	for i := 0; i < maxLineNumLength-len(lineNum); i++ {
-		screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
+		screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
 		vloc.X++
 	}
 	// Write the actual line number
 	for _, ch := range lineNum {
 		if softwrapped {
-			screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
+			screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
 		} else {
-			screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ch, nil, lineNumStyle)
+			screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ch, nil, lineNumStyle)
 		}
 		vloc.X++
 	}
 
 	// Write the extra space
-	screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
+	screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, ' ', nil, lineNumStyle)
 	vloc.X++
 }
 
@@ -343,10 +340,9 @@ func (w *BufWindow) getStyle(style tcell.Style, bloc buffer.Loc, r rune) (tcell.
 func (w *BufWindow) showCursor(x, y int, main bool) {
 	if w.active {
 		if main {
-			screen.Screen.ShowCursor(x, y)
+			screen.ShowCursor(x, y)
 		} else {
-			r, _, _, _ := screen.Screen.GetContent(x, y)
-			screen.Screen.SetContent(x, y, r, nil, config.DefStyle.Reverse(true))
+			screen.ShowFakeCursorMulti(x, y)
 		}
 	}
 }
@@ -517,7 +513,7 @@ func (w *BufWindow) displayBuffer() {
 					}
 				}
 
-				screen.Screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, nil, style)
+				screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, nil, style)
 
 				if showcursor {
 					for _, c := range cursors {
@@ -595,16 +591,10 @@ func (w *BufWindow) displayBuffer() {
 					curStyle = style.Background(fg)
 				}
 			}
-			screen.Screen.SetContent(i+w.X, vloc.Y+w.Y, ' ', nil, curStyle)
+			screen.SetContent(i+w.X, vloc.Y+w.Y, ' ', nil, curStyle)
 		}
 
-		for _, c := range cursors {
-			if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
-				w.showCursor(w.X+vloc.X, w.Y+vloc.Y, c.Num == 0)
-			}
-		}
-
-		draw(' ', curStyle, false)
+		draw(' ', curStyle, true)
 
 		bloc.X = w.StartCol
 		bloc.Y++
@@ -627,7 +617,7 @@ func (w *BufWindow) displayStatusLine() {
 	} else if w.Y+w.Height != infoY {
 		w.drawStatus = true
 		for x := w.X; x < w.X+w.Width; x++ {
-			screen.Screen.SetContent(x, w.Y+w.Height-1, '-', nil, config.DefStyle.Reverse(true))
+			screen.SetContent(x, w.Y+w.Height-1, '-', nil, config.DefStyle.Reverse(true))
 		}
 	} else {
 		w.drawStatus = false
@@ -647,7 +637,7 @@ func (w *BufWindow) displayScrollBar() {
 		}
 		barstart := w.Y + int(float64(w.StartLine)/float64(w.Buf.LinesNum())*float64(w.Height))
 		for y := barstart; y < util.Min(barstart+barsize, w.Y+bufHeight); y++ {
-			screen.Screen.SetContent(scrollX, y, '|', nil, config.DefStyle.Reverse(true))
+			screen.SetContent(scrollX, y, '|', nil, config.DefStyle.Reverse(true))
 		}
 	}
 }

internal/display/infowindow.go

@@ -74,7 +74,7 @@ func (i *InfoWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 
 func (i *InfoWindow) Clear() {
 	for x := 0; x < i.Width; x++ {
-		screen.Screen.SetContent(x, i.Y, ' ', nil, i.defStyle())
+		screen.SetContent(x, i.Y, ' ', nil, i.defStyle())
 	}
 }
 
@@ -111,7 +111,7 @@ func (i *InfoWindow) displayBuffer() {
 				if j > 0 {
 					c = ' '
 				}
-				screen.Screen.SetContent(vlocX, i.Y, c, nil, style)
+				screen.SetContent(vlocX, i.Y, c, nil, style)
 			}
 			vlocX++
 		}
@@ -121,7 +121,7 @@ func (i *InfoWindow) displayBuffer() {
 	totalwidth := blocX - nColsBeforeStart
 	for len(line) > 0 {
 		if activeC.X == blocX {
-			screen.Screen.ShowCursor(vlocX, i.Y)
+			screen.ShowCursor(vlocX, i.Y)
 		}
 
 		r, size := utf8.DecodeRune(line)
@@ -155,7 +155,7 @@ func (i *InfoWindow) displayBuffer() {
 		}
 	}
 	if activeC.X == blocX {
-		screen.Screen.ShowCursor(vlocX, i.Y)
+		screen.ShowCursor(vlocX, i.Y)
 	}
 }
 
@@ -167,9 +167,9 @@ func (i *InfoWindow) displayKeyMenu() {
 	for y := 0; y < len(keydisplay); y++ {
 		for x := 0; x < i.Width; x++ {
 			if x < len(keydisplay[y]) {
-				screen.Screen.SetContent(x, i.Y-len(keydisplay)+y, rune(keydisplay[y][x]), nil, i.defStyle())
+				screen.SetContent(x, i.Y-len(keydisplay)+y, rune(keydisplay[y][x]), nil, i.defStyle())
 			} else {
-				screen.Screen.SetContent(x, i.Y-len(keydisplay)+y, ' ', nil, i.defStyle())
+				screen.SetContent(x, i.Y-len(keydisplay)+y, ' ', nil, i.defStyle())
 			}
 		}
 	}
@@ -194,7 +194,7 @@ func (i *InfoWindow) Display() {
 
 		display := i.Msg
 		for _, c := range display {
-			screen.Screen.SetContent(x, i.Y, c, nil, style)
+			screen.SetContent(x, i.Y, c, nil, style)
 			x += runewidth.RuneWidth(c)
 		}
 
@@ -219,13 +219,13 @@ func (i *InfoWindow) Display() {
 				style = style.Reverse(true)
 			}
 			for _, r := range s {
-				screen.Screen.SetContent(x, i.Y-keymenuOffset-1, r, nil, style)
+				screen.SetContent(x, i.Y-keymenuOffset-1, r, nil, style)
 				x++
 				if x >= i.Width {
 					return
 				}
 			}
-			screen.Screen.SetContent(x, i.Y-keymenuOffset-1, ' ', nil, statusLineStyle)
+			screen.SetContent(x, i.Y-keymenuOffset-1, ' ', nil, statusLineStyle)
 			x++
 			if x >= i.Width {
 				return
@@ -233,7 +233,7 @@ func (i *InfoWindow) Display() {
 		}
 
 		for x < i.Width {
-			screen.Screen.SetContent(x, i.Y-keymenuOffset-1, ' ', nil, statusLineStyle)
+			screen.SetContent(x, i.Y-keymenuOffset-1, ' ', nil, statusLineStyle)
 			x++
 		}
 	}

internal/display/statusline.go

@@ -51,7 +51,7 @@ var statusInfo = map[string]func(*buffer.Buffer) string{
 	},
 }
 
-func SetStatusInfoFnLua(s string, fn string) {
+func SetStatusInfoFnLua(fn string) {
 	luaFn := strings.Split(fn, ".")
 	if len(luaFn) <= 1 {
 		return
@@ -61,7 +61,7 @@ func SetStatusInfoFnLua(s string, fn string) {
 	if pl == nil {
 		return
 	}
-	statusInfo[s] = func(b *buffer.Buffer) string {
+	statusInfo[fn] = func(b *buffer.Buffer) string {
 		if pl == nil || !pl.IsEnabled() {
 			return ""
 		}
@@ -118,13 +118,13 @@ func (s *StatusLine) Display() {
 				style = style.Reverse(true)
 			}
 			for _, r := range sug {
-				screen.Screen.SetContent(x, y-keymenuOffset, r, nil, style)
+				screen.SetContent(x, y-keymenuOffset, r, nil, style)
 				x++
 				if x >= s.win.Width {
 					return
 				}
 			}
-			screen.Screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
+			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
 			x++
 			if x >= s.win.Width {
 				return
@@ -132,7 +132,7 @@ func (s *StatusLine) Display() {
 		}
 
 		for x < s.win.Width {
-			screen.Screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
+			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
 			x++
 		}
 		return
@@ -184,7 +184,7 @@ func (s *StatusLine) Display() {
 					c = ' '
 					x++
 				}
-				screen.Screen.SetContent(winX+x, y, c, nil, statusLineStyle)
+				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
 			}
 		} else if x >= s.win.Width-rightLen && x < rightLen+s.win.Width-rightLen {
 			r, size := utf8.DecodeRune(rightText)
@@ -196,10 +196,10 @@ func (s *StatusLine) Display() {
 					c = ' '
 					x++
 				}
-				screen.Screen.SetContent(winX+x, y, c, nil, statusLineStyle)
+				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
 			}
 		} else {
-			screen.Screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
+			screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
 		}
 	}
 }

internal/display/tabwindow.go

@@ -91,13 +91,13 @@ func (w *TabWindow) Display() {
 					c = ' '
 				}
 				if x == w.width-1 && !done {
-					screen.Screen.SetContent(w.width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
+					screen.SetContent(w.width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
 					x++
 					break
 				} else if x == 0 && w.hscroll > 0 {
-					screen.Screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
+					screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
 				} else if x >= 0 && x < w.width {
-					screen.Screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true))
+					screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true))
 				}
 				x++
 			}

internal/display/termwindow.go

@@ -51,7 +51,7 @@ func (w *TermWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 func (w *TermWindow) Clear() {
 	for y := 0; y < w.Height; y++ {
 		for x := 0; x < w.Width; x++ {
-			screen.Screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
+			screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
 		}
 	}
 }
@@ -88,7 +88,7 @@ func (w *TermWindow) Display() {
 				st = st.Reverse(true)
 			}
 
-			screen.Screen.SetContent(w.X+x, w.Y+y, c, nil, st)
+			screen.SetContent(w.X+x, w.Y+y, c, nil, st)
 		}
 	}
 	if config.GetGlobalOption("statusline").(bool) {
@@ -103,14 +103,14 @@ func (w *TermWindow) Display() {
 			if x < textLen {
 				r, size := utf8.DecodeRune(text)
 				text = text[size:]
-				screen.Screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
+				screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
 			} else {
-				screen.Screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
+				screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
 			}
 		}
 	}
 	if w.State.CursorVisible() && w.active {
 		curx, cury := w.State.Cursor()
-		screen.Screen.ShowCursor(curx+w.X, cury+w.Y)
+		screen.ShowCursor(curx+w.X, cury+w.Y)
 	}
 }

internal/display/uiwindow.go

@@ -28,7 +28,7 @@ func (w *UIWindow) drawNode(n *views.Node) {
 		if c.IsLeaf() && c.Kind == views.STVert {
 			if i != len(cs)-1 {
 				for h := 0; h < c.H; h++ {
-					screen.Screen.SetContent(c.X+c.W, c.Y+h, '|', nil, dividerStyle.Reverse(true))
+					screen.SetContent(c.X+c.W, c.Y+h, '|', nil, dividerStyle.Reverse(true))
 				}
 			}
 		} else {

internal/screen/screen.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/pkg/terminfo"
+	"github.com/zyedidia/micro/internal/util"
 	"github.com/zyedidia/tcell"
 )
 
@@ -17,21 +17,85 @@ import (
 // screen. TODO: maybe we should worry about polling and drawing at the
 // same time too.
 var Screen tcell.Screen
+
+// The lock is necessary since the screen is polled on a separate thread
 var lock sync.Mutex
+
+// DrawChan is a channel that will cause the screen to redraw when
+// written to even if no event user event has occurred
 var DrawChan chan bool
 
+// Lock locks the screen lock
 func Lock() {
 	lock.Lock()
 }
 
+// Unlock unlocks the screen lock
 func Unlock() {
 	lock.Unlock()
 }
 
+// Redraw schedules a redraw with the draw channel
 func Redraw() {
 	DrawChan <- true
 }
 
+type screenCell struct {
+	x, y  int
+	r     rune
+	combc []rune
+	style tcell.Style
+}
+
+var lastCursor screenCell
+
+// ShowFakeCursor displays a cursor at the given position by modifying the
+// style of the given column instead of actually using the terminal cursor
+// This can be useful in certain terminals such as the windows console where
+// modifying the cursor location is slow and frequent modifications cause flashing
+// This keeps track of the most recent fake cursor location and resets it when
+// a new fake cursor location is specified
+func ShowFakeCursor(x, y int) {
+	r, combc, style, _ := Screen.GetContent(x, y)
+	Screen.SetContent(lastCursor.x, lastCursor.y, lastCursor.r, lastCursor.combc, lastCursor.style)
+	Screen.SetContent(x, y, r, combc, config.DefStyle.Reverse(true))
+
+	lastCursor.x, lastCursor.y = x, y
+	lastCursor.r = r
+	lastCursor.combc = combc
+	lastCursor.style = style
+}
+
+// ShowFakeCursorMulti is the same as ShowFakeCursor except it does not
+// reset previous locations of the cursor
+// Fake cursors are also necessary to display multiple cursors
+func ShowFakeCursorMulti(x, y int) {
+	r, _, _, _ := Screen.GetContent(x, y)
+	Screen.SetContent(x, y, r, nil, config.DefStyle.Reverse(true))
+}
+
+// ShowCursor puts the cursor at the given location using a fake cursor
+// if enabled or using the terminal cursor otherwise
+// By default only the windows console will use a fake cursor
+func ShowCursor(x, y int) {
+	if util.FakeCursor {
+		ShowFakeCursor(x, y)
+	} else {
+		Screen.ShowCursor(x, y)
+	}
+}
+
+// SetContent sets a cell at a point on the screen and makes sure that it is
+// synced with the last cursor location
+func SetContent(x, y int, mainc rune, combc []rune, style tcell.Style) {
+	Screen.SetContent(x, y, mainc, combc, style)
+	if util.FakeCursor && lastCursor.x == x && lastCursor.y == y {
+		lastCursor.r = mainc
+		lastCursor.style = style
+		lastCursor.combc = combc
+	}
+}
+
 // TempFini shuts the screen down temporarily
 func TempFini() bool {
 	screenWasNil := Screen == nil
@@ -59,52 +123,24 @@ func Init() {
 	// Should we enable true color?
 	truecolor := os.Getenv("MICRO_TRUECOLOR") == "1"
 
-	tcelldb := os.Getenv("TCELLDB")
-	os.Setenv("TCELLDB", config.ConfigDir+"/.tcelldb")
-
-	// In order to enable true color, we have to set the TERM to `xterm-truecolor` when
-	// initializing tcell, but after that, we can set the TERM back to whatever it was
-	oldTerm := os.Getenv("TERM")
-	if truecolor {
-		os.Setenv("TERM", "xterm-truecolor")
+	if !truecolor {
+		os.Setenv("TCELL_TRUECOLOR", "disable")
 	}
 
 	// Initilize tcell
 	var err error
 	Screen, err = tcell.NewScreen()
 	if err != nil {
-		if err == tcell.ErrTermNotFound {
-			err = terminfo.WriteDB(config.ConfigDir + "/.tcelldb")
-			if err != nil {
-				fmt.Println(err)
-				fmt.Println("Fatal: Micro could not create terminal database file", config.ConfigDir+"/.tcelldb")
-				os.Exit(1)
-			}
-			Screen, err = tcell.NewScreen()
-			if err != nil {
-				fmt.Println(err)
-				fmt.Println("Fatal: Micro could not initialize a Screen.")
-				os.Exit(1)
-			}
-		} else {
-			fmt.Println(err)
-			fmt.Println("Fatal: Micro could not initialize a Screen.")
-			os.Exit(1)
-		}
+		fmt.Println(err)
+		fmt.Println("Fatal: Micro could not initialize a Screen.")
+		os.Exit(1)
 	}
 	if err = Screen.Init(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
-	// Now we can put the TERM back to what it was before
-	if truecolor {
-		os.Setenv("TERM", oldTerm)
-	}
-
 	if config.GetGlobalOption("mouse").(bool) {
 		Screen.EnableMouse()
 	}
-
-	os.Setenv("TCELLDB", tcelldb)
 }

internal/util/profile.go

@@ -16,14 +16,12 @@ func GetMemStats() string {
 	return fmt.Sprintf("Alloc: %s, Sys: %s, GC: %d, PauseTotalNs: %dns", humanize.Bytes(memstats.Alloc), humanize.Bytes(memstats.Sys), memstats.NumGC, memstats.PauseTotalNs)
 }
 
-var start time.Time
-
-func Tic(s string) {
+func Tic(s string) time.Time {
 	log.Println("START:", s)
-	start = time.Now()
+	return time.Now()
 }
 
-func Toc() {
+func Toc(start time.Time) {
 	end := time.Now()
 	log.Println("END: ElapsedTime in seconds:", end.Sub(start))
 }

internal/util/util.go

@@ -7,6 +7,7 @@ import (
 	"os/user"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -30,6 +31,9 @@ var (
 	CompileDate = "Unknown"
 	// Debug logging
 	Debug = "ON"
+	// FakeCursor is used to disable the terminal cursor and have micro
+	// draw its own (enabled for windows consoles where the cursor is slow)
+	FakeCursor = false
 )
 
 func init() {
@@ -38,6 +42,10 @@ func init() {
 	if err != nil {
 		fmt.Println("Invalid version: ", Version, err)
 	}
+
+	if runtime.GOOS == "windows" {
+		FakeCursor = true
+	}
 }
 
 // SliceEnd returns a byte slice where the index is a rune index

pkg/highlight/ftdetect.go

@@ -6,7 +6,7 @@ import "regexp"
 // to determine the filetype of the file
 // It will return the corresponding syntax definition for the filetype
 func MatchFiletype(ftdetect [2]*regexp.Regexp, filename string, firstLine []byte) bool {
-	if ftdetect[0].MatchString(filename) {
+	if ftdetect[0] != nil && ftdetect[0].MatchString(filename) {
 		return true
 	}
 

pkg/highlight/parser.go

@@ -1,6 +1,7 @@
 package highlight
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"regexp"
@@ -41,6 +42,14 @@ type Header struct {
 	FtDetect [2]*regexp.Regexp
 }
 
+type HeaderYaml struct {
+	FileType string `yaml:"filetype"`
+	Detect   struct {
+		FNameRgx  string `yaml:"filename"`
+		HeaderRgx string `yaml:"header"`
+	} `yaml:"detect"`
+}
+
 type File struct {
 	FileType string
 
@@ -82,52 +91,59 @@ func init() {
 	Groups = make(map[string]Group)
 }
 
-func ParseFtDetect(file *File) (r [2]*regexp.Regexp, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			var ok bool
-			err, ok = r.(error)
-			if !ok {
-				err = fmt.Errorf("pkg: %v", r)
-			}
-		}
-	}()
+// MakeHeader takes a header (.hdr file) file and parses the header
+// Header files make parsing more efficient when you only want to compute
+// on the headers of syntax files
+// A yaml file might take ~400us to parse while a header file only takes ~20us
+func MakeHeader(data []byte) (*Header, error) {
+	lines := bytes.Split(data, []byte{'\n'})
+	if len(lines) < 3 {
+		return nil, errors.New("Header file has incorrect format")
+	}
+	header := new(Header)
+	var err error
+	header.FileType = string(lines[0])
+	fnameRgx := string(lines[1])
+	headerRgx := string(lines[2])
 
-	rules := file.yamlSrc
-
-	loaded := 0
-	for k, v := range rules {
-		if k == "detect" {
-			ftdetect := v.(map[interface{}]interface{})
-			if len(ftdetect) >= 1 {
-				syntax, err := regexp.Compile(ftdetect["filename"].(string))
-				if err != nil {
-					return r, err
-				}
-
-				r[0] = syntax
-			}
-			if len(ftdetect) >= 2 {
-				header, err := regexp.Compile(ftdetect["header"].(string))
-				if err != nil {
-					return r, err
-				}
-
-				r[1] = header
-			}
-			loaded++
-		}
-
-		if loaded >= 2 {
-			break
-		}
+	if fnameRgx != "" {
+		header.FtDetect[0], err = regexp.Compile(fnameRgx)
+	}
+	if headerRgx != "" {
+		header.FtDetect[1], err = regexp.Compile(headerRgx)
 	}
 
-	if loaded == 0 {
-		return r, errors.New("No detect regexes found")
+	if err != nil {
+		return nil, err
 	}
 
-	return r, err
+	return header, nil
+}
+
+// MakeHeaderYaml takes a yaml spec for a syntax file and parses the
+// header
+func MakeHeaderYaml(data []byte) (*Header, error) {
+	var hdrYaml HeaderYaml
+	err := yaml.Unmarshal(data, &hdrYaml)
+	if err != nil {
+		return nil, err
+	}
+
+	header := new(Header)
+	header.FileType = hdrYaml.FileType
+
+	if hdrYaml.Detect.FNameRgx != "" {
+		header.FtDetect[0], err = regexp.Compile(hdrYaml.Detect.FNameRgx)
+	}
+	if hdrYaml.Detect.HeaderRgx != "" {
+		header.FtDetect[1], err = regexp.Compile(hdrYaml.Detect.HeaderRgx)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return header, nil
 }
 
 func ParseFile(input []byte) (f *File, err error) {
@@ -196,6 +212,40 @@ func ParseDef(f *File, header *Header) (s *Def, err error) {
 	return s, err
 }
 
+// HasIncludes returns whether this syntax def has any include statements
+func HasIncludes(d *Def) bool {
+	hasIncludes := len(d.rules.includes) > 0
+	for _, r := range d.rules.regions {
+		hasIncludes = hasIncludes || hasIncludesInRegion(r)
+	}
+	return hasIncludes
+}
+
+func hasIncludesInRegion(region *region) bool {
+	hasIncludes := len(region.rules.includes) > 0
+	for _, r := range region.rules.regions {
+		hasIncludes = hasIncludes || hasIncludesInRegion(r)
+	}
+	return hasIncludes
+}
+
+// GetIncludes returns a list of filetypes that are included by this syntax def
+func GetIncludes(d *Def) []string {
+	includes := d.rules.includes
+	for _, r := range d.rules.regions {
+		includes = append(includes, getIncludesInRegion(r)...)
+	}
+	return includes
+}
+
+func getIncludesInRegion(region *region) []string {
+	includes := region.rules.includes
+	for _, r := range region.rules.regions {
+		includes = append(includes, getIncludesInRegion(r)...)
+	}
+	return includes
+}
+
 // ResolveIncludes will sort out the rules for including other filetypes
 // You should call this after parsing all the Defs
 func ResolveIncludes(def *Def, files []*File) {

pkg/terminfo/LICENSE.md

@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

pkg/terminfo/README.md

@@ -1,6 +0,0 @@
-# Terminfo parser
-
-This terminfo parser was written by the authors of [tcell](https://github.com/gdamore/tcell). We are using it here
-to compile the terminal database if the terminal entry is not found in set of precompiled terminals.
-
-The source for `mkinfo.go` is adapted from tcell's `mkinfo` tool to be more of a library.

pkg/terminfo/mkinfo.go

@@ -1,518 +0,0 @@
-// Copyright 2017 The TCell Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This command is used to generate suitable configuration files in either
-// go syntax or in JSON.  It defaults to JSON output on stdout.  If no
-// term values are specified on the command line, then $TERM is used.
-//
-// Usage is like this:
-//
-// mkinfo [-init] [-go file.go] [-json file.json] [-quiet] [-nofatal] [<term>...]
-//
-// -gzip     specifies output should be compressed (json only)
-// -go       specifies Go output into the named file.  Use - for stdout.
-// -json     specifies JSON output in the named file.  Use - for stdout
-// -nofatal  indicates that errors loading definitions should not be fatal
-//
-
-package terminfo
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-type termcap struct {
-	name    string
-	desc    string
-	aliases []string
-	bools   map[string]bool
-	nums    map[string]int
-	strs    map[string]string
-}
-
-func (tc *termcap) getnum(s string) int {
-	return (tc.nums[s])
-}
-
-func (tc *termcap) getflag(s string) bool {
-	return (tc.bools[s])
-}
-
-func (tc *termcap) getstr(s string) string {
-	return (tc.strs[s])
-}
-
-const (
-	NONE = iota
-	CTRL
-	ESC
-)
-
-func unescape(s string) string {
-	// Various escapes are in \x format.  Control codes are
-	// encoded as ^M (carat followed by ASCII equivalent).
-	// Escapes are: \e, \E - escape
-	//  \0 NULL, \n \l \r \t \b \f \s for equivalent C escape.
-	buf := &bytes.Buffer{}
-	esc := NONE
-
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		switch esc {
-		case NONE:
-			switch c {
-			case '\\':
-				esc = ESC
-			case '^':
-				esc = CTRL
-			default:
-				buf.WriteByte(c)
-			}
-		case CTRL:
-			buf.WriteByte(c - 0x40)
-			esc = NONE
-		case ESC:
-			switch c {
-			case 'E', 'e':
-				buf.WriteByte(0x1b)
-			case '0', '1', '2', '3', '4', '5', '6', '7':
-				if i+2 < len(s) && s[i+1] >= '0' && s[i+1] <= '7' && s[i+2] >= '0' && s[i+2] <= '7' {
-					buf.WriteByte(((c - '0') * 64) + ((s[i+1] - '0') * 8) + (s[i+2] - '0'))
-					i = i + 2
-				} else if c == '0' {
-					buf.WriteByte(0)
-				}
-			case 'n':
-				buf.WriteByte('\n')
-			case 'r':
-				buf.WriteByte('\r')
-			case 't':
-				buf.WriteByte('\t')
-			case 'b':
-				buf.WriteByte('\b')
-			case 'f':
-				buf.WriteByte('\f')
-			case 's':
-				buf.WriteByte(' ')
-			case 'l':
-				panic("WTF: weird format: " + s)
-			default:
-				buf.WriteByte(c)
-			}
-			esc = NONE
-		}
-	}
-	return (buf.String())
-}
-
-func (tc *termcap) setupterm(name string) error {
-	cmd := exec.Command("infocmp", "-1", name)
-	output := &bytes.Buffer{}
-	cmd.Stdout = output
-
-	tc.strs = make(map[string]string)
-	tc.bools = make(map[string]bool)
-	tc.nums = make(map[string]int)
-
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-
-	// Now parse the output.
-	// We get comment lines (starting with "#"), followed by
-	// a header line that looks like "<name>|<alias>|...|<desc>"
-	// then capabilities, one per line, starting with a tab and ending
-	// with a comma and newline.
-	lines := strings.Split(output.String(), "\n")
-	for len(lines) > 0 && strings.HasPrefix(lines[0], "#") {
-		lines = lines[1:]
-	}
-
-	// Ditch trailing empty last line
-	if lines[len(lines)-1] == "" {
-		lines = lines[:len(lines)-1]
-	}
-	header := lines[0]
-	if strings.HasSuffix(header, ",") {
-		header = header[:len(header)-1]
-	}
-	names := strings.Split(header, "|")
-	tc.name = names[0]
-	names = names[1:]
-	if len(names) > 0 {
-		tc.desc = names[len(names)-1]
-		names = names[:len(names)-1]
-	}
-	tc.aliases = names
-	for _, val := range lines[1:] {
-		if (!strings.HasPrefix(val, "\t")) ||
-			(!strings.HasSuffix(val, ",")) {
-			return (errors.New("malformed infocmp: " + val))
-		}
-
-		val = val[1:]
-		val = val[:len(val)-1]
-
-		if k := strings.SplitN(val, "=", 2); len(k) == 2 {
-			tc.strs[k[0]] = unescape(k[1])
-		} else if k := strings.SplitN(val, "#", 2); len(k) == 2 {
-			if strings.HasPrefix(k[1], "0x") {
-				if u, err := strconv.ParseUint(k[1][2:], 16, 0); err != nil {
-					return (err)
-				} else {
-					tc.nums[k[0]] = int(u)
-				}
-			} else if u, err := strconv.ParseUint(k[1], 10, 0); err != nil {
-				return (err)
-			} else {
-				tc.nums[k[0]] = int(u)
-			}
-		} else {
-			tc.bools[val] = true
-		}
-	}
-	return nil
-}
-
-// This program is used to collect data from the system's terminfo library,
-// and write it into Go source code.  That is, we maintain our terminfo
-// capabilities encoded in the program.  It should never need to be run by
-// an end user, but developers can use this to add codes for additional
-// terminal types.
-//
-// If a terminal name ending with -truecolor is given, and we cannot find
-// one, we will try to fabricate one from either the -256color (if present)
-// or the unadorned base name, adding the XTerm specific 24-bit color
-// escapes.  We believe that all 24-bit capable terminals use the same
-// escape sequences, and terminfo has yet to evolve to support this.
-func getinfo(name string) (*Terminfo, string, error) {
-	var tc termcap
-	addTrueColor := false
-	if err := tc.setupterm(name); err != nil {
-		if strings.HasSuffix(name, "-truecolor") {
-			base := name[:len(name)-len("-truecolor")]
-			// Probably -256color is closest to what we want
-			if err = tc.setupterm(base + "-256color"); err != nil {
-				err = tc.setupterm(base)
-			}
-			if err == nil {
-				addTrueColor = true
-			}
-			tc.name = name
-		}
-		if err != nil {
-			return nil, "", err
-		}
-	}
-	t := &Terminfo{}
-	// If this is an alias record, then just emit the alias
-	t.Name = tc.name
-	if t.Name != name {
-		return t, "", nil
-	}
-	t.Aliases = tc.aliases
-	t.Colors = tc.getnum("colors")
-	t.Columns = tc.getnum("cols")
-	t.Lines = tc.getnum("lines")
-	t.Bell = tc.getstr("bel")
-	t.Clear = tc.getstr("clear")
-	t.EnterCA = tc.getstr("smcup")
-	t.ExitCA = tc.getstr("rmcup")
-	t.ShowCursor = tc.getstr("cnorm")
-	t.HideCursor = tc.getstr("civis")
-	t.AttrOff = tc.getstr("sgr0")
-	t.Underline = tc.getstr("smul")
-	t.Bold = tc.getstr("bold")
-	t.Blink = tc.getstr("blink")
-	t.Dim = tc.getstr("dim")
-	t.Reverse = tc.getstr("rev")
-	t.EnterKeypad = tc.getstr("smkx")
-	t.ExitKeypad = tc.getstr("rmkx")
-	t.SetFg = tc.getstr("setaf")
-	t.SetBg = tc.getstr("setab")
-	t.SetCursor = tc.getstr("cup")
-	t.CursorBack1 = tc.getstr("cub1")
-	t.CursorUp1 = tc.getstr("cuu1")
-	t.KeyF1 = tc.getstr("kf1")
-	t.KeyF2 = tc.getstr("kf2")
-	t.KeyF3 = tc.getstr("kf3")
-	t.KeyF4 = tc.getstr("kf4")
-	t.KeyF5 = tc.getstr("kf5")
-	t.KeyF6 = tc.getstr("kf6")
-	t.KeyF7 = tc.getstr("kf7")
-	t.KeyF8 = tc.getstr("kf8")
-	t.KeyF9 = tc.getstr("kf9")
-	t.KeyF10 = tc.getstr("kf10")
-	t.KeyF11 = tc.getstr("kf11")
-	t.KeyF12 = tc.getstr("kf12")
-	t.KeyF13 = tc.getstr("kf13")
-	t.KeyF14 = tc.getstr("kf14")
-	t.KeyF15 = tc.getstr("kf15")
-	t.KeyF16 = tc.getstr("kf16")
-	t.KeyF17 = tc.getstr("kf17")
-	t.KeyF18 = tc.getstr("kf18")
-	t.KeyF19 = tc.getstr("kf19")
-	t.KeyF20 = tc.getstr("kf20")
-	t.KeyF21 = tc.getstr("kf21")
-	t.KeyF22 = tc.getstr("kf22")
-	t.KeyF23 = tc.getstr("kf23")
-	t.KeyF24 = tc.getstr("kf24")
-	t.KeyF25 = tc.getstr("kf25")
-	t.KeyF26 = tc.getstr("kf26")
-	t.KeyF27 = tc.getstr("kf27")
-	t.KeyF28 = tc.getstr("kf28")
-	t.KeyF29 = tc.getstr("kf29")
-	t.KeyF30 = tc.getstr("kf30")
-	t.KeyF31 = tc.getstr("kf31")
-	t.KeyF32 = tc.getstr("kf32")
-	t.KeyF33 = tc.getstr("kf33")
-	t.KeyF34 = tc.getstr("kf34")
-	t.KeyF35 = tc.getstr("kf35")
-	t.KeyF36 = tc.getstr("kf36")
-	t.KeyF37 = tc.getstr("kf37")
-	t.KeyF38 = tc.getstr("kf38")
-	t.KeyF39 = tc.getstr("kf39")
-	t.KeyF40 = tc.getstr("kf40")
-	t.KeyF41 = tc.getstr("kf41")
-	t.KeyF42 = tc.getstr("kf42")
-	t.KeyF43 = tc.getstr("kf43")
-	t.KeyF44 = tc.getstr("kf44")
-	t.KeyF45 = tc.getstr("kf45")
-	t.KeyF46 = tc.getstr("kf46")
-	t.KeyF47 = tc.getstr("kf47")
-	t.KeyF48 = tc.getstr("kf48")
-	t.KeyF49 = tc.getstr("kf49")
-	t.KeyF50 = tc.getstr("kf50")
-	t.KeyF51 = tc.getstr("kf51")
-	t.KeyF52 = tc.getstr("kf52")
-	t.KeyF53 = tc.getstr("kf53")
-	t.KeyF54 = tc.getstr("kf54")
-	t.KeyF55 = tc.getstr("kf55")
-	t.KeyF56 = tc.getstr("kf56")
-	t.KeyF57 = tc.getstr("kf57")
-	t.KeyF58 = tc.getstr("kf58")
-	t.KeyF59 = tc.getstr("kf59")
-	t.KeyF60 = tc.getstr("kf60")
-	t.KeyF61 = tc.getstr("kf61")
-	t.KeyF62 = tc.getstr("kf62")
-	t.KeyF63 = tc.getstr("kf63")
-	t.KeyF64 = tc.getstr("kf64")
-	t.KeyInsert = tc.getstr("kich1")
-	t.KeyDelete = tc.getstr("kdch1")
-	t.KeyBackspace = tc.getstr("kbs")
-	t.KeyHome = tc.getstr("khome")
-	t.KeyEnd = tc.getstr("kend")
-	t.KeyUp = tc.getstr("kcuu1")
-	t.KeyDown = tc.getstr("kcud1")
-	t.KeyRight = tc.getstr("kcuf1")
-	t.KeyLeft = tc.getstr("kcub1")
-	t.KeyPgDn = tc.getstr("knp")
-	t.KeyPgUp = tc.getstr("kpp")
-	t.KeyBacktab = tc.getstr("kcbt")
-	t.KeyExit = tc.getstr("kext")
-	t.KeyCancel = tc.getstr("kcan")
-	t.KeyPrint = tc.getstr("kprt")
-	t.KeyHelp = tc.getstr("khlp")
-	t.KeyClear = tc.getstr("kclr")
-	t.AltChars = tc.getstr("acsc")
-	t.EnterAcs = tc.getstr("smacs")
-	t.ExitAcs = tc.getstr("rmacs")
-	t.EnableAcs = tc.getstr("enacs")
-	t.Mouse = tc.getstr("kmous")
-	t.KeyShfRight = tc.getstr("kRIT")
-	t.KeyShfLeft = tc.getstr("kLFT")
-	t.KeyShfHome = tc.getstr("kHOM")
-	t.KeyShfEnd = tc.getstr("kEND")
-
-	// Terminfo lacks descriptions for a bunch of modified keys,
-	// but modern XTerm and emulators often have them.  Let's add them,
-	// if the shifted right and left arrows are defined.
-	if t.KeyShfRight == "\x1b[1;2C" && t.KeyShfLeft == "\x1b[1;2D" {
-		t.KeyShfUp = "\x1b[1;2A"
-		t.KeyShfDown = "\x1b[1;2B"
-		t.KeyMetaUp = "\x1b[1;9A"
-		t.KeyMetaDown = "\x1b[1;9B"
-		t.KeyMetaRight = "\x1b[1;9C"
-		t.KeyMetaLeft = "\x1b[1;9D"
-		t.KeyAltUp = "\x1b[1;3A"
-		t.KeyAltDown = "\x1b[1;3B"
-		t.KeyAltRight = "\x1b[1;3C"
-		t.KeyAltLeft = "\x1b[1;3D"
-		t.KeyCtrlUp = "\x1b[1;5A"
-		t.KeyCtrlDown = "\x1b[1;5B"
-		t.KeyCtrlRight = "\x1b[1;5C"
-		t.KeyCtrlLeft = "\x1b[1;5D"
-		t.KeyAltShfUp = "\x1b[1;4A"
-		t.KeyAltShfDown = "\x1b[1;4B"
-		t.KeyAltShfRight = "\x1b[1;4C"
-		t.KeyAltShfLeft = "\x1b[1;4D"
-
-		t.KeyMetaShfUp = "\x1b[1;10A"
-		t.KeyMetaShfDown = "\x1b[1;10B"
-		t.KeyMetaShfRight = "\x1b[1;10C"
-		t.KeyMetaShfLeft = "\x1b[1;10D"
-
-		t.KeyCtrlShfUp = "\x1b[1;6A"
-		t.KeyCtrlShfDown = "\x1b[1;6B"
-		t.KeyCtrlShfRight = "\x1b[1;6C"
-		t.KeyCtrlShfLeft = "\x1b[1;6D"
-	}
-	// And also for Home and End
-	if t.KeyShfHome == "\x1b[1;2H" && t.KeyShfEnd == "\x1b[1;2F" {
-		t.KeyCtrlHome = "\x1b[1;5H"
-		t.KeyCtrlEnd = "\x1b[1;5F"
-		t.KeyAltHome = "\x1b[1;9H"
-		t.KeyAltEnd = "\x1b[1;9F"
-		t.KeyCtrlShfHome = "\x1b[1;6H"
-		t.KeyCtrlShfEnd = "\x1b[1;6F"
-		t.KeyAltShfHome = "\x1b[1;4H"
-		t.KeyAltShfEnd = "\x1b[1;4F"
-		t.KeyMetaShfHome = "\x1b[1;10H"
-		t.KeyMetaShfEnd = "\x1b[1;10F"
-	}
-
-	// And the same thing for rxvt and workalikes (Eterm, aterm, etc.)
-	// It seems that urxvt at least send ESC as ALT prefix for these,
-	// although some places seem to indicate a separate ALT key sesquence.
-	if t.KeyShfRight == "\x1b[c" && t.KeyShfLeft == "\x1b[d" {
-		t.KeyShfUp = "\x1b[a"
-		t.KeyShfDown = "\x1b[b"
-		t.KeyCtrlUp = "\x1b[Oa"
-		t.KeyCtrlDown = "\x1b[Ob"
-		t.KeyCtrlRight = "\x1b[Oc"
-		t.KeyCtrlLeft = "\x1b[Od"
-	}
-	if t.KeyShfHome == "\x1b[7$" && t.KeyShfEnd == "\x1b[8$" {
-		t.KeyCtrlHome = "\x1b[7^"
-		t.KeyCtrlEnd = "\x1b[8^"
-	}
-
-	// If the kmous entry is present, then we need to record the
-	// the codes to enter and exit mouse mode.  Sadly, this is not
-	// part of the terminfo databases anywhere that I've found, but
-	// is an extension.  The escape codes are documented in the XTerm
-	// manual, and all terminals that have kmous are expected to
-	// use these same codes, unless explicitly configured otherwise
-	// vi XM.  Note that in any event, we only known how to parse either
-	// x11 or SGR mouse events -- if your terminal doesn't support one
-	// of these two forms, you maybe out of luck.
-	t.MouseMode = tc.getstr("XM")
-	if t.Mouse != "" && t.MouseMode == "" {
-		// we anticipate that all xterm mouse tracking compatible
-		// terminals understand mouse tracking (1000), but we hope
-		// that those that don't understand any-event tracking (1003)
-		// will at least ignore it.  Likewise we hope that terminals
-		// that don't understand SGR reporting (1006) just ignore it.
-		t.MouseMode = "%?%p1%{1}%=%t%'h'%Pa%e%'l'%Pa%;" +
-			"\x1b[?1000%ga%c\x1b[?1002%ga%c\x1b[?1003%ga%c\x1b[?1006%ga%c"
-	}
-
-	// We only support colors in ANSI 8 or 256 color mode.
-	if t.Colors < 8 || t.SetFg == "" {
-		t.Colors = 0
-	}
-	if t.SetCursor == "" {
-		return nil, "", errors.New("terminal not cursor addressable")
-	}
-
-	// For padding, we lookup the pad char.  If that isn't present,
-	// and npc is *not* set, then we assume a null byte.
-	t.PadChar = tc.getstr("pad")
-	if t.PadChar == "" {
-		if !tc.getflag("npc") {
-			t.PadChar = "\u0000"
-		}
-	}
-
-	// For some terminals we fabricate a -truecolor entry, that may
-	// not exist in terminfo.
-	if addTrueColor {
-		t.SetFgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%dm"
-		t.SetBgRGB = "\x1b[48;2;%p1%d;%p2%d;%p3%dm"
-		t.SetFgBgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%d;" +
-			"48;2;%p4%d;%p5%d;%p6%dm"
-	}
-
-	// For terminals that use "standard" SGR sequences, lets combine the
-	// foreground and background together.
-	if strings.HasPrefix(t.SetFg, "\x1b[") &&
-		strings.HasPrefix(t.SetBg, "\x1b[") &&
-		strings.HasSuffix(t.SetFg, "m") &&
-		strings.HasSuffix(t.SetBg, "m") {
-		fg := t.SetFg[:len(t.SetFg)-1]
-		r := regexp.MustCompile("%p1")
-		bg := r.ReplaceAllString(t.SetBg[2:], "%p2")
-		t.SetFgBg = fg + ";" + bg
-	}
-
-	return t, tc.desc, nil
-}
-
-func WriteDB(filename string) error {
-	var e error
-	js := []byte{}
-	args := []string{os.Getenv("TERM")}
-
-	tdata := make(map[string]*Terminfo)
-	descs := make(map[string]string)
-
-	for _, term := range args {
-		if t, desc, e := getinfo(term); e != nil {
-			return e
-		} else {
-			tdata[term] = t
-			descs[term] = desc
-		}
-	}
-
-	if len(tdata) == 0 {
-		// No data.
-		return errors.New("No data")
-	}
-	o := os.Stdout
-	if o, e = os.Create(filename); e != nil {
-		return e
-	}
-	var w io.WriteCloser
-	w = o
-	for _, term := range args {
-		if t := tdata[term]; t != nil {
-			js, e = json.Marshal(t)
-			fmt.Fprintln(w, string(js))
-		}
-		// arguably if there is more than one term, this
-		// should be a javascript array, but that's not how
-		// we load it.  We marshal objects one at a time from
-		// the file.
-	}
-	if e != nil {
-		return e
-	}
-	w.Close()
-	if w != o {
-		o.Close()
-	}
-
-	return nil
-}

pkg/terminfo/terminfo.go

@@ -1,838 +0,0 @@
-// Copyright 2017 The TCell Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package terminfo
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-var (
-	// ErrTermNotFound indicates that a suitable terminal entry could
-	// not be found.  This can result from either not having TERM set,
-	// or from the TERM failing to support certain minimal functionality,
-	// in particular absolute cursor addressability (the cup capability)
-	// is required.  For example, legacy "adm3" lacks this capability,
-	// whereas the slightly newer "adm3a" supports it.  This failure
-	// occurs most often with "dumb".
-	ErrTermNotFound = errors.New("terminal entry not found")
-)
-
-// Terminfo represents a terminfo entry.  Note that we use friendly names
-// in Go, but when we write out JSON, we use the same names as terminfo.
-// The name, aliases and smous, rmous fields do not come from terminfo directly.
-type Terminfo struct {
-	Name         string   `json:"name"`
-	Aliases      []string `json:"aliases,omitempty"`
-	Columns      int      `json:"cols,omitempty"`   // cols
-	Lines        int      `json:"lines,omitempty"`  // lines
-	Colors       int      `json:"colors,omitempty"` // colors
-	Bell         string   `json:"bell,omitempty"`   // bell
-	Clear        string   `json:"clear,omitempty"`  // clear
-	EnterCA      string   `json:"smcup,omitempty"`  // smcup
-	ExitCA       string   `json:"rmcup,omitempty"`  // rmcup
-	ShowCursor   string   `json:"cnorm,omitempty"`  // cnorm
-	HideCursor   string   `json:"civis,omitempty"`  // civis
-	AttrOff      string   `json:"sgr0,omitempty"`   // sgr0
-	Underline    string   `json:"smul,omitempty"`   // smul
-	Bold         string   `json:"bold,omitempty"`   // bold
-	Blink        string   `json:"blink,omitempty"`  // blink
-	Reverse      string   `json:"rev,omitempty"`    // rev
-	Dim          string   `json:"dim,omitempty"`    // dim
-	EnterKeypad  string   `json:"smkx,omitempty"`   // smkx
-	ExitKeypad   string   `json:"rmkx,omitempty"`   // rmkx
-	SetFg        string   `json:"setaf,omitempty"`  // setaf
-	SetBg        string   `json:"setbg,omitempty"`  // setab
-	SetCursor    string   `json:"cup,omitempty"`    // cup
-	CursorBack1  string   `json:"cub1,omitempty"`   // cub1
-	CursorUp1    string   `json:"cuu1,omitempty"`   // cuu1
-	PadChar      string   `json:"pad,omitempty"`    // pad
-	KeyBackspace string   `json:"kbs,omitempty"`    // kbs
-	KeyF1        string   `json:"kf1,omitempty"`    // kf1
-	KeyF2        string   `json:"kf2,omitempty"`    // kf2
-	KeyF3        string   `json:"kf3,omitempty"`    // kf3
-	KeyF4        string   `json:"kf4,omitempty"`    // kf4
-	KeyF5        string   `json:"kf5,omitempty"`    // kf5
-	KeyF6        string   `json:"kf6,omitempty"`    // kf6
-	KeyF7        string   `json:"kf7,omitempty"`    // kf7
-	KeyF8        string   `json:"kf8,omitempty"`    // kf8
-	KeyF9        string   `json:"kf9,omitempty"`    // kf9
-	KeyF10       string   `json:"kf10,omitempty"`   // kf10
-	KeyF11       string   `json:"kf11,omitempty"`   // kf11
-	KeyF12       string   `json:"kf12,omitempty"`   // kf12
-	KeyF13       string   `json:"kf13,omitempty"`   // kf13
-	KeyF14       string   `json:"kf14,omitempty"`   // kf14
-	KeyF15       string   `json:"kf15,omitempty"`   // kf15
-	KeyF16       string   `json:"kf16,omitempty"`   // kf16
-	KeyF17       string   `json:"kf17,omitempty"`   // kf17
-	KeyF18       string   `json:"kf18,omitempty"`   // kf18
-	KeyF19       string   `json:"kf19,omitempty"`   // kf19
-	KeyF20       string   `json:"kf20,omitempty"`   // kf20
-	KeyF21       string   `json:"kf21,omitempty"`   // kf21
-	KeyF22       string   `json:"kf22,omitempty"`   // kf22
-	KeyF23       string   `json:"kf23,omitempty"`   // kf23
-	KeyF24       string   `json:"kf24,omitempty"`   // kf24
-	KeyF25       string   `json:"kf25,omitempty"`   // kf25
-	KeyF26       string   `json:"kf26,omitempty"`   // kf26
-	KeyF27       string   `json:"kf27,omitempty"`   // kf27
-	KeyF28       string   `json:"kf28,omitempty"`   // kf28
-	KeyF29       string   `json:"kf29,omitempty"`   // kf29
-	KeyF30       string   `json:"kf30,omitempty"`   // kf30
-	KeyF31       string   `json:"kf31,omitempty"`   // kf31
-	KeyF32       string   `json:"kf32,omitempty"`   // kf32
-	KeyF33       string   `json:"kf33,omitempty"`   // kf33
-	KeyF34       string   `json:"kf34,omitempty"`   // kf34
-	KeyF35       string   `json:"kf35,omitempty"`   // kf35
-	KeyF36       string   `json:"kf36,omitempty"`   // kf36
-	KeyF37       string   `json:"kf37,omitempty"`   // kf37
-	KeyF38       string   `json:"kf38,omitempty"`   // kf38
-	KeyF39       string   `json:"kf39,omitempty"`   // kf39
-	KeyF40       string   `json:"kf40,omitempty"`   // kf40
-	KeyF41       string   `json:"kf41,omitempty"`   // kf41
-	KeyF42       string   `json:"kf42,omitempty"`   // kf42
-	KeyF43       string   `json:"kf43,omitempty"`   // kf43
-	KeyF44       string   `json:"kf44,omitempty"`   // kf44
-	KeyF45       string   `json:"kf45,omitempty"`   // kf45
-	KeyF46       string   `json:"kf46,omitempty"`   // kf46
-	KeyF47       string   `json:"kf47,omitempty"`   // kf47
-	KeyF48       string   `json:"kf48,omitempty"`   // kf48
-	KeyF49       string   `json:"kf49,omitempty"`   // kf49
-	KeyF50       string   `json:"kf50,omitempty"`   // kf50
-	KeyF51       string   `json:"kf51,omitempty"`   // kf51
-	KeyF52       string   `json:"kf52,omitempty"`   // kf52
-	KeyF53       string   `json:"kf53,omitempty"`   // kf53
-	KeyF54       string   `json:"kf54,omitempty"`   // kf54
-	KeyF55       string   `json:"kf55,omitempty"`   // kf55
-	KeyF56       string   `json:"kf56,omitempty"`   // kf56
-	KeyF57       string   `json:"kf57,omitempty"`   // kf57
-	KeyF58       string   `json:"kf58,omitempty"`   // kf58
-	KeyF59       string   `json:"kf59,omitempty"`   // kf59
-	KeyF60       string   `json:"kf60,omitempty"`   // kf60
-	KeyF61       string   `json:"kf61,omitempty"`   // kf61
-	KeyF62       string   `json:"kf62,omitempty"`   // kf62
-	KeyF63       string   `json:"kf63,omitempty"`   // kf63
-	KeyF64       string   `json:"kf64,omitempty"`   // kf64
-	KeyInsert    string   `json:"kich,omitempty"`   // kich1
-	KeyDelete    string   `json:"kdch,omitempty"`   // kdch1
-	KeyHome      string   `json:"khome,omitempty"`  // khome
-	KeyEnd       string   `json:"kend,omitempty"`   // kend
-	KeyHelp      string   `json:"khlp,omitempty"`   // khlp
-	KeyPgUp      string   `json:"kpp,omitempty"`    // kpp
-	KeyPgDn      string   `json:"knp,omitempty"`    // knp
-	KeyUp        string   `json:"kcuu1,omitempty"`  // kcuu1
-	KeyDown      string   `json:"kcud1,omitempty"`  // kcud1
-	KeyLeft      string   `json:"kcub1,omitempty"`  // kcub1
-	KeyRight     string   `json:"kcuf1,omitempty"`  // kcuf1
-	KeyBacktab   string   `json:"kcbt,omitempty"`   // kcbt
-	KeyExit      string   `json:"kext,omitempty"`   // kext
-	KeyClear     string   `json:"kclr,omitempty"`   // kclr
-	KeyPrint     string   `json:"kprt,omitempty"`   // kprt
-	KeyCancel    string   `json:"kcan,omitempty"`   // kcan
-	Mouse        string   `json:"kmous,omitempty"`  // kmous
-	MouseMode    string   `json:"XM,omitempty"`     // XM
-	AltChars     string   `json:"acsc,omitempty"`   // acsc
-	EnterAcs     string   `json:"smacs,omitempty"`  // smacs
-	ExitAcs      string   `json:"rmacs,omitempty"`  // rmacs
-	EnableAcs    string   `json:"enacs,omitempty"`  // enacs
-	KeyShfRight  string   `json:"kRIT,omitempty"`   // kRIT
-	KeyShfLeft   string   `json:"kLFT,omitempty"`   // kLFT
-	KeyShfHome   string   `json:"kHOM,omitempty"`   // kHOM
-	KeyShfEnd    string   `json:"kEND,omitempty"`   // kEND
-
-	// These are non-standard extensions to terminfo.  This includes
-	// true color support, and some additional keys.  Its kind of bizarre
-	// that shifted variants of left and right exist, but not up and down.
-	// Terminal support for these are going to vary amongst XTerm
-	// emulations, so don't depend too much on them in your application.
-
-	SetFgBg         string `json:"_setfgbg,omitempty"`    // setfgbg
-	SetFgBgRGB      string `json:"_setfgbgrgb,omitempty"` // setfgbgrgb
-	SetFgRGB        string `json:"_setfrgb,omitempty"`    // setfrgb
-	SetBgRGB        string `json:"_setbrgb,omitempty"`    // setbrgb
-	KeyShfUp        string `json:"_kscu1,omitempty"`      // shift-up
-	KeyShfDown      string `json:"_kscud1,omitempty"`     // shift-down
-	KeyCtrlUp       string `json:"_kccu1,omitempty"`      // ctrl-up
-	KeyCtrlDown     string `json:"_kccud1,omitempty"`     // ctrl-left
-	KeyCtrlRight    string `json:"_kccuf1,omitempty"`     // ctrl-right
-	KeyCtrlLeft     string `json:"_kccub1,omitempty"`     // ctrl-left
-	KeyMetaUp       string `json:"_kmcu1,omitempty"`      // meta-up
-	KeyMetaDown     string `json:"_kmcud1,omitempty"`     // meta-left
-	KeyMetaRight    string `json:"_kmcuf1,omitempty"`     // meta-right
-	KeyMetaLeft     string `json:"_kmcub1,omitempty"`     // meta-left
-	KeyAltUp        string `json:"_kacu1,omitempty"`      // alt-up
-	KeyAltDown      string `json:"_kacud1,omitempty"`     // alt-left
-	KeyAltRight     string `json:"_kacuf1,omitempty"`     // alt-right
-	KeyAltLeft      string `json:"_kacub1,omitempty"`     // alt-left
-	KeyCtrlHome     string `json:"_kchome,omitempty"`
-	KeyCtrlEnd      string `json:"_kcend,omitempty"`
-	KeyMetaHome     string `json:"_kmhome,omitempty"`
-	KeyMetaEnd      string `json:"_kmend,omitempty"`
-	KeyAltHome      string `json:"_kahome,omitempty"`
-	KeyAltEnd       string `json:"_kaend,omitempty"`
-	KeyAltShfUp     string `json:"_kascu1,omitempty"`
-	KeyAltShfDown   string `json:"_kascud1,omitempty"`
-	KeyAltShfLeft   string `json:"_kascub1,omitempty"`
-	KeyAltShfRight  string `json:"_kascuf1,omitempty"`
-	KeyMetaShfUp    string `json:"_kmscu1,omitempty"`
-	KeyMetaShfDown  string `json:"_kmscud1,omitempty"`
-	KeyMetaShfLeft  string `json:"_kmscub1,omitempty"`
-	KeyMetaShfRight string `json:"_kmscuf1,omitempty"`
-	KeyCtrlShfUp    string `json:"_kcscu1,omitempty"`
-	KeyCtrlShfDown  string `json:"_kcscud1,omitempty"`
-	KeyCtrlShfLeft  string `json:"_kcscub1,omitempty"`
-	KeyCtrlShfRight string `json:"_kcscuf1,omitempty"`
-	KeyCtrlShfHome  string `json:"_kcHOME,omitempty"`
-	KeyCtrlShfEnd   string `json:"_kcEND,omitempty"`
-	KeyAltShfHome   string `json:"_kaHOME,omitempty"`
-	KeyAltShfEnd    string `json:"_kaEND,omitempty"`
-	KeyMetaShfHome  string `json:"_kmHOME,omitempty"`
-	KeyMetaShfEnd   string `json:"_kmEND,omitempty"`
-}
-
-type stackElem struct {
-	s     string
-	i     int
-	isStr bool
-	isInt bool
-}
-
-type stack []stackElem
-
-func (st stack) Push(v string) stack {
-	e := stackElem{
-		s:     v,
-		isStr: true,
-	}
-	return append(st, e)
-}
-
-func (st stack) Pop() (string, stack) {
-	v := ""
-	if len(st) > 0 {
-		e := st[len(st)-1]
-		st = st[:len(st)-1]
-		if e.isStr {
-			v = e.s
-		} else {
-			v = strconv.Itoa(e.i)
-		}
-	}
-	return v, st
-}
-
-func (st stack) PopInt() (int, stack) {
-	if len(st) > 0 {
-		e := st[len(st)-1]
-		st = st[:len(st)-1]
-		if e.isInt {
-			return e.i, st
-		} else if e.isStr {
-			i, _ := strconv.Atoi(e.s)
-			return i, st
-		}
-	}
-	return 0, st
-}
-
-func (st stack) PopBool() (bool, stack) {
-	if len(st) > 0 {
-		e := st[len(st)-1]
-		st = st[:len(st)-1]
-		if e.isStr {
-			if e.s == "1" {
-				return true, st
-			}
-			return false, st
-		} else if e.i == 1 {
-			return true, st
-		} else {
-			return false, st
-		}
-	}
-	return false, st
-}
-
-func (st stack) PushInt(i int) stack {
-	e := stackElem{
-		i:     i,
-		isInt: true,
-	}
-	return append(st, e)
-}
-
-func (st stack) PushBool(i bool) stack {
-	if i {
-		return st.PushInt(1)
-	}
-	return st.PushInt(0)
-}
-
-func nextch(s string, index int) (byte, int) {
-	if index < len(s) {
-		return s[index], index + 1
-	}
-	return 0, index
-}
-
-// static vars
-var svars [26]string
-
-// paramsBuffer handles some persistent state for TParam.  Technically we
-// could probably dispense with this, but caching buffer arrays gives us
-// a nice little performance boost.  Furthermore, we know that TParam is
-// rarely (never?) called re-entrantly, so we can just reuse the same
-// buffers, making it thread-safe by stashing a lock.
-type paramsBuffer struct {
-	out bytes.Buffer
-	buf bytes.Buffer
-	lk  sync.Mutex
-}
-
-// Start initializes the params buffer with the initial string data.
-// It also locks the paramsBuffer.  The caller must call End() when
-// finished.
-func (pb *paramsBuffer) Start(s string) {
-	pb.lk.Lock()
-	pb.out.Reset()
-	pb.buf.Reset()
-	pb.buf.WriteString(s)
-}
-
-// End returns the final output from TParam, but it also releases the lock.
-func (pb *paramsBuffer) End() string {
-	s := pb.out.String()
-	pb.lk.Unlock()
-	return s
-}
-
-// NextCh returns the next input character to the expander.
-func (pb *paramsBuffer) NextCh() (byte, error) {
-	return pb.buf.ReadByte()
-}
-
-// PutCh "emits" (rather schedules for output) a single byte character.
-func (pb *paramsBuffer) PutCh(ch byte) {
-	pb.out.WriteByte(ch)
-}
-
-// PutString schedules a string for output.
-func (pb *paramsBuffer) PutString(s string) {
-	pb.out.WriteString(s)
-}
-
-var pb = &paramsBuffer{}
-
-// TParm takes a terminfo parameterized string, such as setaf or cup, and
-// evaluates the string, and returns the result with the parameter
-// applied.
-func (t *Terminfo) TParm(s string, p ...int) string {
-	var stk stack
-	var a, b string
-	var ai, bi int
-	var ab bool
-	var dvars [26]string
-	var params [9]int
-
-	pb.Start(s)
-
-	// make sure we always have 9 parameters -- makes it easier
-	// later to skip checks
-	for i := 0; i < len(params) && i < len(p); i++ {
-		params[i] = p[i]
-	}
-
-	nest := 0
-
-	for {
-
-		ch, err := pb.NextCh()
-		if err != nil {
-			break
-		}
-
-		if ch != '%' {
-			pb.PutCh(ch)
-			continue
-		}
-
-		ch, err = pb.NextCh()
-		if err != nil {
-			// XXX Error
-			break
-		}
-
-		switch ch {
-		case '%': // quoted %
-			pb.PutCh(ch)
-
-		case 'i': // increment both parameters (ANSI cup support)
-			params[0]++
-			params[1]++
-
-		case 'c', 's':
-			// NB: these, and 'd' below are special cased for
-			// efficiency.  They could be handled by the richer
-			// format support below, less efficiently.
-			a, stk = stk.Pop()
-			pb.PutString(a)
-
-		case 'd':
-			ai, stk = stk.PopInt()
-			pb.PutString(strconv.Itoa(ai))
-
-		case '0', '1', '2', '3', '4', 'x', 'X', 'o', ':':
-			// This is pretty suboptimal, but this is rarely used.
-			// None of the mainstream terminals use any of this,
-			// and it would surprise me if this code is ever
-			// executed outside of test cases.
-			f := "%"
-			if ch == ':' {
-				ch, _ = pb.NextCh()
-			}
-			f += string(ch)
-			for ch == '+' || ch == '-' || ch == '#' || ch == ' ' {
-				ch, _ = pb.NextCh()
-				f += string(ch)
-			}
-			for (ch >= '0' && ch <= '9') || ch == '.' {
-				ch, _ = pb.NextCh()
-				f += string(ch)
-			}
-			switch ch {
-			case 'd', 'x', 'X', 'o':
-				ai, stk = stk.PopInt()
-				pb.PutString(fmt.Sprintf(f, ai))
-			case 'c', 's':
-				a, stk = stk.Pop()
-				pb.PutString(fmt.Sprintf(f, a))
-			}
-
-		case 'p': // push parameter
-			ch, _ = pb.NextCh()
-			ai = int(ch - '1')
-			if ai >= 0 && ai < len(params) {
-				stk = stk.PushInt(params[ai])
-			} else {
-				stk = stk.PushInt(0)
-			}
-
-		case 'P': // pop & store variable
-			ch, _ = pb.NextCh()
-			if ch >= 'A' && ch <= 'Z' {
-				svars[int(ch-'A')], stk = stk.Pop()
-			} else if ch >= 'a' && ch <= 'z' {
-				dvars[int(ch-'a')], stk = stk.Pop()
-			}
-
-		case 'g': // recall & push variable
-			ch, _ = pb.NextCh()
-			if ch >= 'A' && ch <= 'Z' {
-				stk = stk.Push(svars[int(ch-'A')])
-			} else if ch >= 'a' && ch <= 'z' {
-				stk = stk.Push(dvars[int(ch-'a')])
-			}
-
-		case '\'': // push(char)
-			ch, _ = pb.NextCh()
-			pb.NextCh() // must be ' but we don't check
-			stk = stk.Push(string(ch))
-
-		case '{': // push(int)
-			ai = 0
-			ch, _ = pb.NextCh()
-			for ch >= '0' && ch <= '9' {
-				ai *= 10
-				ai += int(ch - '0')
-				ch, _ = pb.NextCh()
-			}
-			// ch must be '}' but no verification
-			stk = stk.PushInt(ai)
-
-		case 'l': // push(strlen(pop))
-			a, stk = stk.Pop()
-			stk = stk.PushInt(len(a))
-
-		case '+':
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai + bi)
-
-		case '-':
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai - bi)
-
-		case '*':
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai * bi)
-
-		case '/':
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			if bi != 0 {
-				stk = stk.PushInt(ai / bi)
-			} else {
-				stk = stk.PushInt(0)
-			}
-
-		case 'm': // push(pop mod pop)
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			if bi != 0 {
-				stk = stk.PushInt(ai % bi)
-			} else {
-				stk = stk.PushInt(0)
-			}
-
-		case '&': // AND
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai & bi)
-
-		case '|': // OR
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai | bi)
-
-		case '^': // XOR
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai ^ bi)
-
-		case '~': // bit complement
-			ai, stk = stk.PopInt()
-			stk = stk.PushInt(ai ^ -1)
-
-		case '!': // logical NOT
-			ai, stk = stk.PopInt()
-			stk = stk.PushBool(ai != 0)
-
-		case '=': // numeric compare or string compare
-			b, stk = stk.Pop()
-			a, stk = stk.Pop()
-			stk = stk.PushBool(a == b)
-
-		case '>': // greater than, numeric
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushBool(ai > bi)
-
-		case '<': // less than, numeric
-			bi, stk = stk.PopInt()
-			ai, stk = stk.PopInt()
-			stk = stk.PushBool(ai < bi)
-
-		case '?': // start conditional
-
-		case 't':
-			ab, stk = stk.PopBool()
-			if ab {
-				// just keep going
-				break
-			}
-			nest = 0
-		ifloop:
-			// this loop consumes everything until we hit our else,
-			// or the end of the conditional
-			for {
-				ch, err = pb.NextCh()
-				if err != nil {
-					break
-				}
-				if ch != '%' {
-					continue
-				}
-				ch, _ = pb.NextCh()
-				switch ch {
-				case ';':
-					if nest == 0 {
-						break ifloop
-					}
-					nest--
-				case '?':
-					nest++
-				case 'e':
-					if nest == 0 {
-						break ifloop
-					}
-				}
-			}
-
-		case 'e':
-			// if we got here, it means we didn't use the else
-			// in the 't' case above, and we should skip until
-			// the end of the conditional
-			nest = 0
-		elloop:
-			for {
-				ch, err = pb.NextCh()
-				if err != nil {
-					break
-				}
-				if ch != '%' {
-					continue
-				}
-				ch, _ = pb.NextCh()
-				switch ch {
-				case ';':
-					if nest == 0 {
-						break elloop
-					}
-					nest--
-				case '?':
-					nest++
-				}
-			}
-
-		case ';': // endif
-
-		}
-	}
-
-	return pb.End()
-}
-
-// TPuts emits the string to the writer, but expands inline padding
-// indications (of the form $<[delay]> where [delay] is msec) to
-// a suitable number of padding characters (usually null bytes) based
-// upon the supplied baud.  At high baud rates, more padding characters
-// will be inserted.  All Terminfo based strings should be emitted using
-// this function.
-func (t *Terminfo) TPuts(w io.Writer, s string, baud int) {
-	for {
-		beg := strings.Index(s, "$<")
-		if beg < 0 {
-			// Most strings don't need padding, which is good news!
-			io.WriteString(w, s)
-			return
-		}
-		io.WriteString(w, s[:beg])
-		s = s[beg+2:]
-		end := strings.Index(s, ">")
-		if end < 0 {
-			// unterminated.. just emit bytes unadulterated
-			io.WriteString(w, "$<"+s)
-			return
-		}
-		val := s[:end]
-		s = s[end+1:]
-		padus := 0
-		unit := 1000
-		dot := false
-	loop:
-		for i := range val {
-			switch val[i] {
-			case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-				padus *= 10
-				padus += int(val[i] - '0')
-				if dot {
-					unit *= 10
-				}
-			case '.':
-				if !dot {
-					dot = true
-				} else {
-					break loop
-				}
-			default:
-				break loop
-			}
-		}
-		cnt := int(((baud / 8) * padus) / unit)
-		for cnt > 0 {
-			io.WriteString(w, t.PadChar)
-			cnt--
-		}
-	}
-}
-
-// TGoto returns a string suitable for addressing the cursor at the given
-// row and column.  The origin 0, 0 is in the upper left corner of the screen.
-func (t *Terminfo) TGoto(col, row int) string {
-	return t.TParm(t.SetCursor, row, col)
-}
-
-// TColor returns a string corresponding to the given foreground and background
-// colors.  Either fg or bg can be set to -1 to elide.
-func (t *Terminfo) TColor(fi, bi int) string {
-	rv := ""
-	// As a special case, we map bright colors to lower versions if the
-	// color table only holds 8.  For the remaining 240 colors, the user
-	// is out of luck.  Someday we could create a mapping table, but its
-	// not worth it.
-	if t.Colors == 8 {
-		if fi > 7 && fi < 16 {
-			fi -= 8
-		}
-		if bi > 7 && bi < 16 {
-			bi -= 8
-		}
-	}
-	if t.Colors > fi && fi >= 0 {
-		rv += t.TParm(t.SetFg, fi)
-	}
-	if t.Colors > bi && bi >= 0 {
-		rv += t.TParm(t.SetBg, bi)
-	}
-	return rv
-}
-
-var (
-	dblock    sync.Mutex
-	terminfos = make(map[string]*Terminfo)
-	aliases   = make(map[string]string)
-)
-
-// AddTerminfo can be called to register a new Terminfo entry.
-func AddTerminfo(t *Terminfo) {
-	dblock.Lock()
-	terminfos[t.Name] = t
-	for _, x := range t.Aliases {
-		terminfos[x] = t
-	}
-	dblock.Unlock()
-}
-
-func loadFromFile(fname string, term string) (*Terminfo, error) {
-	var e error
-	var f io.ReadCloser
-	if f, e = os.Open(fname); e != nil {
-		return nil, e
-	}
-	defer f.Close()
-	if strings.HasSuffix(fname, ".gz") {
-		if f, e = gzip.NewReader(f); e != nil {
-			return nil, e
-		}
-	}
-	d := json.NewDecoder(f)
-	for {
-		t := &Terminfo{}
-		if e := d.Decode(t); e != nil {
-			if e == io.EOF {
-				return nil, ErrTermNotFound
-			}
-			return nil, e
-		}
-		if t.SetCursor == "" {
-			// This must be an alias record, return it.
-			return t, nil
-		}
-		if t.Name == term {
-			return t, nil
-		}
-		for _, a := range t.Aliases {
-			if a == term {
-				return t, nil
-			}
-		}
-	}
-}
-
-// LookupTerminfo attempts to find a definition for the named $TERM.
-// It first looks in the builtin database, which should cover just about
-// everyone.  If it can't find one there, then it will attempt to read
-// one from the JSON file located in either $TCELLDB, $HOME/.tcelldb
-// or in this package's source directory as database.json).
-func LookupTerminfo(name string) (*Terminfo, error) {
-	if name == "" {
-		// else on windows: index out of bounds
-		// on the name[0] reference below
-		return nil, ErrTermNotFound
-	}
-
-	dblock.Lock()
-	t := terminfos[name]
-	dblock.Unlock()
-
-	if t == nil {
-
-		var files []string
-		letter := fmt.Sprintf("%02x", name[0])
-		gzfile := path.Join(letter, name+".gz")
-		jsfile := path.Join(letter, name)
-
-		// Build up the search path.  Old versions of tcell used a
-		// single database file, whereas the new ones locate them
-		// in JSON (optionally compressed) files.
-		//
-		// The search path looks like:
-		//
-		// $TCELLDB/x/xterm.gz
-		// $TCELLDB/x/xterm
-		// $TCELLDB
-		// $HOME/.tcelldb/x/xterm.gz
-		// $HOME/.tcelldb/x/xterm
-		// $HOME/.tcelldb
-		// $GOPATH/terminfo/database/x/xterm.gz
-		// $GOPATH/terminfo/database/x/xterm
-		//
-		if pth := os.Getenv("TCELLDB"); pth != "" {
-			files = append(files, path.Join(pth, gzfile))
-			files = append(files, path.Join(pth, jsfile))
-			files = append(files, pth)
-		}
-		if pth := os.Getenv("HOME"); pth != "" {
-			pth = path.Join(pth, ".tcelldb")
-			files = append(files, path.Join(pth, gzfile))
-			files = append(files, path.Join(pth, jsfile))
-			files = append(files, pth)
-		}
-
-		for _, pth := range strings.Split(os.Getenv("GOPATH"), string(os.PathListSeparator)) {
-			pth = path.Join(pth, "src", "github.com", "gdamore", "tcell", "terminfo", "database")
-			files = append(files, path.Join(pth, gzfile))
-			files = append(files, path.Join(pth, jsfile))
-		}
-
-		for _, fname := range files {
-			t, _ = loadFromFile(fname, name)
-			if t != nil {
-				break
-			}
-		}
-		if t != nil {
-			if t.Name != name {
-				// Check for a database loop (no infinite
-				// recursion).
-				dblock.Lock()
-				if aliases[name] != "" {
-					dblock.Unlock()
-					return nil, ErrTermNotFound
-				}
-				aliases[name] = t.Name
-				dblock.Unlock()
-				return LookupTerminfo(t.Name)
-			}
-			dblock.Lock()
-			terminfos[name] = t
-			dblock.Unlock()
-		}
-	}
-	if t == nil {
-		return nil, ErrTermNotFound
-	}
-	return t, nil
-}

runtime/help/colors.md

@@ -200,7 +200,7 @@ In the future, plugins may also be able to use color groups for styling.
 
 ## Syntax files
 
-The syntax files is written in yaml-format and specify how to highlight
+The syntax files are written in yaml-format and specify how to highlight
 languages.
 
 Micro's builtin syntax highlighting tries very hard to be sane, sensible and

runtime/help/commands.md

@@ -45,6 +45,11 @@ Here are the possible commands that you can use.
 
 * `tabswitch tab`: This command will switch to the specified tab. The `tab` can
    either be a tab number, or a name of a tab.
+
+* `textfilter sh-command`: filters the current selection through a shell command
+   as standard input and replaces the selection with the stdout of the shell command.
+   For example, to sort a list of numbers, first select them, and then execute
+   `> textfilter sort -n`.
 					 
 * `log`: opens a log of all messages and debug statements.
 

runtime/help/keybindings.md

@@ -47,6 +47,21 @@ save and quit you can bind it like so:
 }
 ```
 
+Each action will return a success flag. Actions can be chained such that
+the chain only continues when there are successes, or failures, or either.
+The `,` separator will always chain to the next action. The `|` separator
+will abort the chain if the action preceding it succeeds, and the `&` will
+abort the chain if the action preceding it fails. For example, in the default
+bindings, tab is bound as
+
+```
+"Tab": "Autocomplete|IndentSelection|InsertTab"
+```
+
+This means that if the `Autocomplete` action is successful, the chain will abort.
+Otherwise, it will try `IndentSelection`, and if that fails too, it will
+execute `InsertTab`.
+
 ## Binding commands
 
 You can also bind a key to execute a command in command mode (see 
@@ -221,6 +236,7 @@ RemoveAllMultiCursors
 SkipMultiCursor
 None
 JumpToMatchingBrace
+Autocomplete
 ```
 
 You can also bind some mouse actions (these must be bound to mouse buttons)
@@ -407,8 +423,8 @@ MouseWheelRight
     "Backspace":      "Backspace",
     "Alt-CtrlH":      "DeleteWordLeft",
     "Alt-Backspace":  "DeleteWordLeft",
-    "Tab":            "IndentSelection,InsertTab",
-    "Backtab":        "OutdentSelection,OutdentLine",
+    "Tab":            "Autocomplete|IndentSelection|InsertTab",
+    "Backtab":        "OutdentSelection|OutdentLine",
     "CtrlO":          "OpenFile",
     "CtrlS":          "Save",
     "CtrlF":          "Find",
@@ -431,9 +447,12 @@ MouseWheelRight
     "CtrlEnd":        "CursorEnd",
     "PageUp":         "CursorPageUp",
     "PageDown":       "CursorPageDown",
+    "CtrlPageUp":     "PreviousTab",
+    "CtrlPageDown":   "NextTab",
     "CtrlG":          "ToggleHelp",
+    "Alt-g":          "ToggleKeyMenu",
     "CtrlR":          "ToggleRuler",
-    "CtrlL":          "JumpLine",
+    "CtrlL":          "command-edit:goto ",
     "Delete":         "Delete",
     "CtrlB":          "ShellMode",
     "CtrlQ":          "Quit",
@@ -441,6 +460,7 @@ MouseWheelRight
     "CtrlW":          "NextSplit",
     "CtrlU":          "ToggleMacro",
     "CtrlJ":          "PlayMacro",
+    "Insert":         "ToggleOverwriteMode",
 
     // Emacs-style keybindings
     "Alt-f": "WordRight",
@@ -449,7 +469,6 @@ MouseWheelRight
     "Alt-e": "EndOfLine",
 
     // Integration with file managers
-    "F1":  "ToggleHelp",
     "F2":  "Save",
     "F3":  "Find",
     "F4":  "Quit",
@@ -464,12 +483,11 @@ MouseWheelRight
     "MouseMiddle":    "PastePrimary",
     "Ctrl-MouseLeft": "MouseMultiCursor",
 
-    // Multiple cursors bindings
     "Alt-n": "SpawnMultiCursor",
     "Alt-m": "SpawnMultiCursorSelect",
     "Alt-p": "RemoveMultiCursor",
     "Alt-c": "RemoveAllMultiCursors",
-    "Alt-x": "SkipMultiCursor",
+    "Alt-x": "SkipMultiCursor"
 }
 ```
 

runtime/help/options.md

@@ -13,15 +13,6 @@ Here are the options that you can set:
 
 	default value: `true`
 
-* `autosave`: micro will save the buffer every `n` seconds automatically
-   (where `n` is the value of the option). Micro also will automatically
-   save and quit when you exit without asking. Be careful when using this
-   feature, because you might accidentally save a file, overwriting what
-   was there before. If the value of the option is `0` then micro will
-   not autosave.
-
-	default value: `0`
-
 * `backup`: micro will automatically keep backups of all open buffers. Backups
    are stored in `~/.config/micro/backups` and are removed when the buffer is
    closed cleanly. In the case of a system crash or a micro crash, the contents

runtime/plugins/autoclose/autoclose.lua

@@ -36,7 +36,7 @@ function onRune(bp, r)
             end
         end
     end
-    return false
+    return true
 end
 
 function preInsertNewline(bp)

runtime/plugins/autoclose/info.json

@@ -2,7 +2,7 @@
     "name": "autoclose",
     "description": "Automatically places closing characters for quotes, parentheses, brackets, etc...",
     "website": "https://github.com/zyedidia/micro",
-	"install": "https://github.com/zyedidia/micro",
+    "install": "https://github.com/zyedidia/micro",
     "version": "1.0.0",
     "require": [
         "micro >= 2.0.0"

runtime/plugins/comment/info.json

@@ -2,7 +2,7 @@
     "name": "comment",
     "description": "Support for automatically commenting blocks of code. Extensible and multiple languages supported.",
     "website": "https://github.com/zyedidia/micro",
-	"install": "https://github.com/zyedidia/micro",
+    "install": "https://github.com/zyedidia/micro",
     "version": "1.0.0",
     "require": [
         "micro >= 2.0.0"

runtime/plugins/ftoptions/info.json

@@ -2,7 +2,7 @@
     "name": "ftoptions",
     "description": "Sets basic options based on the filetype (for example Makefiles require tabs).",
     "website": "https://github.com/zyedidia/micro",
-	"install": "https://github.com/zyedidia/micro",
+    "install": "https://github.com/zyedidia/micro",
     "version": "1.0.0",
     "require": [
         "micro >= 2.0.0"

runtime/plugins/linter/info.json

@@ -2,7 +2,7 @@
     "name": "linter",
     "description": "Automatic code linting for a variety of languages.",
     "website": "https://github.com/zyedidia/micro",
-	"install": "https://github.com/zyedidia/micro",
+    "install": "https://github.com/zyedidia/micro",
     "version": "1.0.0",
     "require": [
         "micro >= 2.0.0"

runtime/plugins/linter/linter.lua

@@ -125,7 +125,7 @@ end
 
 function onSave(bp)
     runLinter(bp.Buf)
-    return false
+    return true
 end
 
 function lint(buf, linter, cmd, args, errorformat, loff, coff)

runtime/plugins/literate/info.json

@@ -2,7 +2,7 @@
     "name": "literate",
     "description": "Highlighting and language support for the Literate programming tool.",
     "website": "https://github.com/zyedidia/Literate",
-	"install": "https://github.com/zyedidia/micro",
+    "install": "https://github.com/zyedidia/micro",
     "version": "1.0.0",
     "require": [
         "micro >= 2.0.0"

runtime/plugins/literate/literate.lua

@@ -48,7 +48,7 @@ function onBufferOpen(buf)
     syntaxFile = syntaxFile .. "                rules: []\n"
     syntaxFile = syntaxFile .. "            - include: " .. codetype .. "\n"
 
-    config.AddRuntimeFileFromMemory("literate", config.RTSyntax, "literate.yaml", syntaxFile)
+    config.AddRuntimeFileFromMemory(config.RTSyntax, "literate.yaml", syntaxFile)
     config.Reload()
     buf:UpdateRules()
 end

runtime/syntax/bat.yaml

@@ -0,0 +1,58 @@
+filetype: batch
+
+detect:
+  filename: "(\\.bat$)"
+  # header: ""
+
+rules:
+  # Numbers
+  - constant.number: "\\b[0-9]+\\b"
+  # Brackets and symbols
+  - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+  # Conditionals and control flow
+  # note (?i) means case insensitive match
+  - type: "\\b(?i)(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|then|until|while)\\b"
+  - type: "\\b(?i)(equ|neq|lss|leq|gtr|geq|on|off)\\b"
+  - type: "\\b(?i)(goto|for|in|do|call|exit|not|exist|errorlevel|defined)\\b"
+  - type: "\\b(?i)(prn|nul|lpt3|lpt2|lpt1|con|com4|com3|com2|com1|aux)\\b"
+  # keywords
+  - statement: "\\b(?i)(adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|break|brea)\\b"
+  - statement: "\\b(?i)(cacls|cd|certreq|certutil|chcp|change|choice|cipher|chdir|chkdsk|chkntfs|chglogon|chgport|chgusr|clip|cls|clscluadmin|cluster|cmd|cmdkey|cmstp|color)\\b"
+  - statement: "\\b(?i)(comp|compact|convert|copy|cprofile|cscript|csvde|date|dcdiag|dcgpofix|dcpromo|defra|del|dfscmd|dfsdiag|dfsrmig|diantz|dir|dirquota|diskcomp|diskcopy|diskpart|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm)\\b"
+  - statement: "\\b(?i)(echo|edit|endlocal|erase|esentutl|eventcreate|eventquery|eventtriggers|evntcmd|expand|extract)\\b"
+  - statement: "\\b(?i)(fc|filescrn|find|findstr|finger|flattemp|fonde|forfiles|format|freedisk|fs|fsutil|ftp|ftype|fveupdate|getmac|gettype|gpfixup|gpresult|gpupdate|graftabl)\\b"
+  - statement: "\\b(?i)(hashgen|hep|help|helpctr|hostname|icacls|iisreset|inuse|ipconfig|ipxroute|irftp|ismserv|jetpack|keyb|klist|ksetup|ktmutil|ktpass|label|ldifd|ldp|lodctr|logman|logoff|lpq|lpr|macfile)\\b"
+  - statement: "\\b(?i)(makecab|manage-bde|mapadmin|md|mkdir|mklink|mmc|mode|more|mount|mountvol|move|mqbup|mqsvc|mqtgsvc|msdt|msg|msiexec|msinfo32|mstsc|nbtstat|net computer|net group)\\b"
+  - statement: "\\b(?i)(net localgroup|net print|net session|net share|net start|net stop|net use|net user|net view|net|netcfg|netdiag|netdom|netsh|netstat|nfsadmin|nfsshare|nfsstat|nlb)\\b"
+  - statement: "\\b(?i)(nlbmgr|nltest|nslookup|ntackup|ntcmdprompt|ntdsutil|ntfrsutl|openfiles|pagefileconfig|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd)\\b"
+  - statement: "\\b(?i)(powercfg|powershell|powershell_ise|print|prncnfg|prndrvr|prnjobs|prnmngr|prnport|prnqctl|prompt|pubprn|pushd|pushprinterconnections|pwlauncher|qappsrv|qprocess)\\b"
+  - statement: "\\b(?i)(query|quser|qwinsta|rasdial|rcp|rd|rdpsign|regentc|recover|redircmp|redirusr|reg|regini|regsvr32|relog|ren|rename|rendom|repadmin|repair-bde|replace|reset|restore)\\b"
+  - statement: "\\b(?i)(rxec|risetup|rmdir|robocopy|route|rpcinfo|rpcping|rsh|runas|rundll32|rwinsta|scp|sc|setlocal|session|schtasks|scwcmd|secedit|serverceipoptin|servrmanagercmd|serverweroptin|set|setspn)\\b"
+  - statement: "\\b(?i)(setx|sfc|shadow|shift|showmount|shutdown|sort|ssh|start|storrept|subst|sxstrace|ysocmgr|systeminfo|takeown|tapicfg|taskkill|tasklist|tcmsetup|telnet|tftp|time)\\b"
+  - statement: "\\b(?i)(timeout|title|tlntadmn|tpmvscmgr|tpmvscmgr|tacerpt|tracert|tree|tscon|tsdiscon|tsecimp|tskill|tsprof|type|typeperf|tzutil|uddiconfig|umount|unlodctr|ver|verify)\\b"
+  - statement: "\\b(?i)(verifier|verif|vol|vssadmin|w32tm|waitfor|wbadmin|wdsutil|wecutil|wevtutil|where|whoami|winnt|winnt32|winpop|winrm|winrs|winsat|wlbs|mic|wscript|xcopy)\\b"
+  # / Flags
+  - constant: "(/\\w+)"
+  # Variables
+  - special: "(%%\\w+)"
+  - special: "(%\\w+%)"
+  # Conditional flags
+  - type: "--[a-z-]+"
+  - type: "\\ -[a-z]+"
+
+  - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+  - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+  # "" String
+  - constant.string:
+      start: \"
+      end: \"
+      skip: \.
+      rules:
+        - constant.specialChar: (\\0|\\\\|\\t|\\n|\\r|\\"|\\')
+        - constant.unicode: \\u\{[[:xdigit:]]+}
+  # '' string
+  - constant.string: "(\\'.+\\')"
+  # rem as comment
+  - comment.rem: "(?i)(rem\\s.*)"
+  # :: as comment
+  - comment.rem: "(?i)(\\:\\:\\s.*)"

runtime/syntax/crystal.yaml

@@ -36,7 +36,11 @@ rules:
         skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
-            - special: "#\\{[^}]*\\}"
+            - symbol.brackets:
+                start: "#\\{"
+                end: "\\}"
+                rules:
+                    - default: ".*"
 
     - constant.string:
         start: "'"

runtime/syntax/git-commit.yaml

@@ -23,3 +23,14 @@ rules:
         start: "^#"
         end: "$"
         rules: []
+
+    # Diffs (i.e. git commit --verbose)
+    - default:
+        start: "^diff"
+        # Diff output puts a space before file contents on each line so this
+        # should never match valid diff output and extend highlighting to the
+        # end of the file
+        end: "^ENDOFFILE"
+        limit-group: "magenta"
+        rules:
+            - include: "patch"

runtime/syntax/html.yaml

@@ -1,13 +1,13 @@
 filetype: html
 
-detect: 
+detect:
     filename: "\\.htm[l]?$"
 
 rules:
     - error: "<[^!].*?>"
     - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
     - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
-    - special: "&[^;[[:space:]]]*;"
+    - special: "&(#[[:digit:]]{1,4}|#x[[:xdigit:]]{1,4}|[^[[:space:]]]+);"
     - symbol: "[:=]"
     - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|target|type|value|width)="
     - constant.number: "(?i)#[0-9A-F]{6,6}"
@@ -18,9 +18,13 @@ rules:
 
     - symbol.tag: "<|>"
     - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
-    - comment: "<!--.+?-->"
     - preproc: "<!DOCTYPE.+?>"
 
+    - comment:
+        start: "<!--"
+        end: "-->"
+        rules: []
+
     - constant.string:
         start: "\""
         end: "\""
@@ -41,4 +45,3 @@ rules:
         limit-group: symbol.tag
         rules:
             - include: "css"
-

runtime/syntax/javascript.yaml

@@ -16,17 +16,20 @@ rules:
     - symbol.brackets: "(\\{|\\})"
     - symbol.brackets: "(\\(|\\))"
     - symbol.brackets: "(\\[|\\])"
-    - symbol.operator: "[-+/*=<>!~%?:&|]"
-    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default|delete|do|else|export|finally)\\b"
-    - statement: "\\b(for|function|class|extends|get|if|import|from|in|of|instanceof|let|new|return|set)\\b"
-    - statement: "\\b(super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
+    - symbol.operator: "([-+/*=<>!~%?:&|]|[.]{3})"
+    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default)\\b"
+    - statement: "\\b(delete|do|else|export|finally|for|function\\*?|class|extends)\\b"
+    - statement: "\\b(get|if|import|from|in|of|instanceof|let|new|reject|resolve|return)\\b"
+    - statement: "\\b(set|super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
     # reserved but unassigned
     - error: "\\b(enum|implements|interface|package|private|protected|public|TODO)"
     - constant: "\\b(globalThis|Infinity|null|undefined|NaN)\\b"
     - constant: "\\b(null|undefined|NaN)\\b"
     - constant: "\\b(true|false)\\b"
-    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Math|Map|Set|WeakMap|WeakSet)\\b"
-    - type: "\\b(Number|Object|RegExp|String)\\b"
+    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Generator|Map|Math)\\b"
+    - type: "\\b(Number|Object|Promise|Proxy|Reflect|RegExp|Set|String|Symbol|WeakMap|WeakSet)\\b"
+    - type: "\\b(BigInt64Array|BigUint64Array|Float32Array|Float64Array|Int16Array)\\b"
+
     # - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
     - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
     - comment: "^#!.*/(env +)?node( |$)"
@@ -55,6 +58,7 @@ rules:
         end: "`"
         rules:
             - constant.specialChar: "\\\\."
+            - identifier: "\\x24\\{.*?\\}"
 
     - comment:
         start: "//"

runtime/syntax/jinja2.yaml

@@ -1,8 +1,5 @@
 filetype: jinja2
 
-detect:
-    filename: "\\.html$"
-
 rules:
   - include: "html"
   - special: "({{|}}|{%-?|-?%})"

runtime/syntax/julia.yaml

@@ -13,11 +13,11 @@ rules:
       # definitions
     - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
       # keywords
-    - statement: "\\b(begin|break|catch|continue|function|elseif|struct|else|end|finally|for|global|local|const|if|include|import|using|require|macro|println|return|try|type|while|module)\\b"
+    - statement: "\\b(begin|break|catch|continue|function|elseif|struct|else|end|finally|for|global|local|let|const|if|import|using|macro|println|return|try|while|module)\\b"
       # decorators
     - identifier.macro: "@[A-Za-z0-9_]+"
       # operators
-    - symbol.operator: "[-+*/|=%<>&~^]|\\b(and|not|or|is|in)\\b"
+    - symbol.operator: "[-+*/|=%<>&~^]|\\b(isa|in)\\b"
       # parentheses
     - symbol.brackets: "([(){}]|\\[|\\])"
       # numbers

runtime/syntax/kotlin.yaml

@@ -1,7 +1,7 @@
 filetype: kotlin
 
 detect:
-    filename: "\\.kt$"
+    filename: "\\.kts?$"
 
 rules:
      
@@ -9,7 +9,7 @@ rules:
     - symbol.operator: ([.:;,+*|=!?\\%]|<|>|/|-|&)
        
     # Statements Keywords
-    - statement: \b(as|by|class|constructor|companion|fun|import|in|infix|interface|inline|is|out|operator|package|return|suspend|super|this|when|val|var)\b
+    - statement: \b(as|by|class|constructor|companion|const|fun|import|in|infix|interface|inline|is|out|operator|package|return|suspend|super|this|when|val|var)\b
     - statement.properties: \b(get|set)\b
     - statement.control: \b(break|continue|else|do|if|try|catch|finally|for|while)\b
     - statement.class: \b(abstract|annotation|data|enum|final|open|sealed)\b
@@ -18,7 +18,7 @@ rules:
     - statement.parameter: \b(crossinline|noinline|reified|vararg)\b
     
     # Expression and types
-    - type: \b(dynamic|object|throw|typealias|typeof)\b 
+    - type: \b(dynamic|object|throw|typealias)\b 
 
     # Meta
     - statement.meta: \@(\bfile|delegate|field|get|property|receiver|set|setparam|param|)\b
@@ -28,7 +28,7 @@ rules:
     - constant.number: ([0-9]+)
     
     # Storage Types
-    - type.storage: \b(Byte|Char|Double|Float|Int|Long|Short|Boolean|Unit|Nothing)\b
+    - type.storage: \b(Byte|UByte|Char|Double|Float|Int|UInt|Long|ULong|Short|UShort|Boolean|Unit|Nothing)\b
     
     # Collections
     - type.collections: \b(Array)\b
@@ -63,4 +63,4 @@ rules:
             - todo: "(TODO|XXX|FIXME):?"
 
     # Todo
-    - todo: "(TODO|XXX|FIXME):?"
+    - todo: "(TODO|XXX|FIXME):?"

runtime/syntax/make_headers.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+	"time"
+
+	yaml "gopkg.in/yaml.v2"
+)
+
+type HeaderYaml struct {
+	FileType string `yaml:"filetype"`
+	Detect   struct {
+		FNameRgx  string `yaml:"filename"`
+		HeaderRgx string `yaml:"header"`
+	} `yaml:"detect"`
+}
+
+type Header struct {
+	FileType  string
+	FNameRgx  string
+	HeaderRgx string
+}
+
+func main() {
+	if len(os.Args) > 1 {
+		os.Chdir(os.Args[1])
+	}
+	files, _ := ioutil.ReadDir(".")
+	for _, f := range files {
+		fname := f.Name()
+		if strings.HasSuffix(fname, ".yaml") {
+			convert(fname[:len(fname)-5])
+		}
+	}
+}
+
+func convert(name string) {
+	filename := name + ".yaml"
+	var hdr HeaderYaml
+	source, err := ioutil.ReadFile(filename)
+	if err != nil {
+		panic(err)
+	}
+	err = yaml.Unmarshal(source, &hdr)
+	if err != nil {
+		panic(err)
+	}
+	encode(name, hdr)
+}
+
+func encode(name string, c HeaderYaml) {
+	f, _ := os.Create(name + ".hdr")
+	f.WriteString(c.FileType + "\n")
+	f.WriteString(c.Detect.FNameRgx + "\n")
+	f.WriteString(c.Detect.HeaderRgx + "\n")
+	f.Close()
+}
+
+func decode(name string) Header {
+	start := time.Now()
+	data, _ := ioutil.ReadFile(name + ".hdr")
+	strs := bytes.Split(data, []byte{'\n'})
+	var hdr Header
+	hdr.FileType = string(strs[0])
+	hdr.FNameRgx = string(strs[1])
+	hdr.HeaderRgx = string(strs[2])
+	fmt.Printf("took %v\n", time.Since(start))
+
+	return hdr
+}

runtime/syntax/nim.yaml

@@ -1,7 +1,7 @@
 filetype: nim
 
 detect: 
-    filename: "\\.nim$|\\.nims$|nim.cfg"
+    filename: "\\.nims?$|nim.cfg"
 
 rules:
     - preproc: "[\\{\\|]\\b(atom|lit|sym|ident|call|lvalue|sideeffect|nosideeffect|param|genericparam|module|type|let|var|const|result|proc|method|iterator|converter|macro|template|field|enumfield|forvar|label|nk[a-zA-Z]+|alias|noalias)\\b[\\}\\|]"

runtime/syntax/ruby.yaml

@@ -1,26 +1,68 @@
 filetype: ruby
 
 detect: 
-    filename: "\\.rb$|\\.gemspec$|Gemfile|config.ru|Rakefile|Capfile|Vagrantfile"
+    filename: "\\.(rb|rake|gemspec)$|^(Gemfile|config.ru|Rakefile|Capfile|Vagrantfile|Guardfile)$"
     header: "^#!.*/(env +)?ruby( |$)"
 
 rules:
-    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\\b"
+    - comment.bright:
+        start: "##"
+        end: "$"
+        rules:
+            - todo: "(XXX|TODO|FIXME|BUG|\\?\\?\\?)"
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(XXX|TODO|FIXME|BUG|\\?\\?\\?)"
+
+    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|for|if|in|module|next|nil|not|or|private|protected|public|redo|rescue|retry|return|self|super|then|undef|unless|until|when|while|yield)\\b"
     - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
-    - constant.number: "\\b[0-9]+\\b"
+    - constant.number: "(?i)\\b0x[0-9a-f][0-9a-f_]*\\b"
+    - constant.number: "(?i)\\b0b[01][01_]*\\b"
+    - constant.number: "(?i)\\b[0-9][0-9_]*(['.'][0-9_]+)?(e[\\-]?[0-9_]+)?\\b"
+    # Ruby "Symbols"
     - constant: "(i?)([ 	]|^):[0-9A-Z_]+\\b"
     - constant: "\\b(__FILE__|__LINE__)\\b"
     - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
-    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
-    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
-    - special: "#\\{[^}]*\\}"
-    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
-    - comment: "#[^{].*$|#$"
-    - comment.bright: "##[^{].*$|##$"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules: []
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - symbol.brackets:
+                start: "#\\{"
+                end: "\\}"
+                rules:
+                    - default: ".*"
+
+    - constant.string.exec:
+        start: "`"
+        end: "`"
+        skip: "\\\\."
+        rules:
+            - symbol.brackets:
+                start: "#\\{"
+                end: "\\}"
+                rules:
+                    - default: ".*"
+
+    - constant.string: "%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - constant.string: "%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - constant.string.exec: "%[x]\\{[^}]*\\}|%[x]\\([^)]*\\)|%[x]<[^>]*>|%[x]\\[[^]]*\\]|%[x]\\$[^$]*\\$|%[x]\\^[^^]*\\^|%[x]![^!]*!"
+    - constant.bool: "\\b(true|false|nil|TRUE|FALSE|NIL)\\b"
+    - symbol.operator: "[-+/*=<>!~%&|^]|\\b:"
+    - symbol.brackets: "([(){}]|\\[|\\])"
     - constant.macro:
         start: "<<-?'?EOT'?"
         end: "^EOT"
         rules: []
 
-    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
     - preproc.shebang: "^#!.+?( |$)"

runtime/syntax/svelte.yaml

@@ -0,0 +1,27 @@
+filetype: svelte
+
+detect:
+    filename: "\\.svelte$"
+
+rules:
+    - default: 
+        start: "<script>"
+        end: "</script>"
+        rules:
+            - include: "javascript"
+
+    - default: 
+        start: "<script lang=\"ts\">"
+        end: "</script>"
+        rules:
+            - include: "typescript"
+    - default:
+        start: "<style.*?>"
+        end: "</style.*?>"
+        rules:
+            - include: "css"
+    - default:
+        start: "^"
+        end: "$"
+        rules:
+            - include: "html5"

runtime/syntax/syntax_checker.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/zyedidia/micro/cmd/micro/highlight"
+	"github.com/zyedidia/highlight"
 )
 
 func main() {

runtime/syntax/v.yaml

@@ -0,0 +1,85 @@
+filetype: v
+
+detect:
+    filename: "\\.v$"
+
+rules:
+    # Conditionals and control flow
+    - keywords: "\\b(import|go|defer)\\b"
+    - special: "\\b(or|break|continue|match|case|goto|return|none)\\b"
+    - function: "\\b(fn)\\b"
+    - main_function: "\\b(fn main\\(\\))"
+    - optionals: "\\b(none|error\\()"
+    - statement: "\\b(if|else|for|match)\\b"
+    - assert: "\\b(assert)\\b"
+    - symbol.operator: "\\b([-+/*=<>!~%&|^])\\b"
+    - symbol.operator: "\\b(:=)\\b"
+    - symbol.operator: "\\b(\\|\\|)\b"
+    - symbol.operator: "\\b(\\&\\&)\\b"
+
+    - compile_if: "\\b(\\$if|\\$else)\\b"
+    - oses: "\\b(mac|macos|linux|windows|freebsd|openbsd|netbsd|dragonfly|js|android|solaris|haiku)\\b"
+
+      # Types
+    - symbol: "(,|\\.)"
+    - btype: "\\b(bool)\\b"
+    - ztype: "\\b(char|byte)\\b"
+    - itype: "\\b(int|i(8|16|64)|u(8|16|32|64))\\b"
+    - ftype: "\\b(f(32|64))\\b"
+    - ptype: "\\b(uintptr|charptr|byteptr|voidptr)\\b"
+    - atype: "\\b(array)\\b"
+    - stype: "\\b(string|ustring)\\b"
+    - mtype: "\\b(map)\\b"
+    - type.keyword: "\\b(pub|mut|struct|enum|interface|module|type|const)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+
+      # Brackets
+    - symbol.brackets: "(\\{|\\})"
+    - symbol.brackets: "(\\(|\\))"
+    - symbol.brackets: "(\\[|\\])"
+
+      # Numbers and strings
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - error: "..+"
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - function.attribute:
+        start: "^\\["
+        end: "\\]$"
+        rules:
+            - known: "\\b(deprecated|inline|typedef|if)\\b"
+

runtime/syntax/verilog.yaml

@@ -0,0 +1,60 @@
+filetype: verilog
+
+detect:
+    filename: "\\.(vh|sv|svh)$"
+
+rules:
+    - preproc: "\\b(module|package|program|endmodule|endpackage|endprogram)\\b"
+    - type.keyword: "\\b(task|interface|class|endtask|endinterface|endclass)\\b"
+    # builtin functions like $display
+    - special: "\\$[0-9A-Za-z_]+"
+
+    # Verilog keywords
+    - statement: "\\b(always|and|assign|automatic|begin|buf|bufif0|bufif1|case|casex|casez|cell|cmos|config)\\b"
+    - statement: "\\b(deassign|default|defparam|design|disable|edge|else|end|endcase|endconfig|endfunction|endgenerate)\\b"
+    - statement: "\\b(endprimitive|endspecify|endtable|event|for|force|forever|fork|function|generate)\\b"
+    - statement: "\\b(genvar|highz0|highz1|if|iff|ifnone|incdir|include|initial|input|instance|join)\\b"
+    - statement: "\\b(large|liblist|library|localparam|macromodule|medium|nand|negedge|nmos|nor|noshowcancelled)\\b"
+    - statement: "\\b(not|notif0|notif1|null|or|output|parameter|pmos|posedge|primitive|pull0|pull1|pulldown|pullup)\\b"
+    - statement: "\\b(pulsestyle_onevent|pulsestyle_ondetect|rcmos|realtime|reg|release|repeat|rnmos|rpmos|rtran)\\b"
+    - statement: "\\b(rtranif0|rtranif1|scalared|showcancelled|small|specify|specparam|strong0|strong1|supply0)\\b"
+    - statement: "\\b(supply1|table|time|tran|tranif0|tranif1|tri0|tri1|triand|trior|trireg|use|uwire)\\b"
+    - statement: "\\b(vectored|wait|wand|weak0|weak1|while|wor|xnor|xor)\\b"
+
+    # SystemVerilog keywords
+    - statement: "\\b(alias|always_comb|always_ff|always_latch|assert|assume|before|bind|bins|binsof|break)\\b"
+    - statement: "\\b(chandle|clocking|const|constraint|context|continue|cover|covergroup|coverpoint|cross|dist|do)\\b"
+    - statement: "\\b(endclocking|endgroup|endproperty|endsequence|enum)\\b"
+    - statement: "\\b(expect|export|extends|extern|final|first_match|foreach|forkjoin|ignore_bins|illegal_bins|import)\\b"
+    - statement: "\\b(inside|intersect|join_any|join_none|local|longint|matches|modport|new)\\b"
+    - statement: "\\b(packed|priority|property|protected|pure|rand|randc|randcase|randsequence|ref|return)\\b"
+    - statement: "\\b(sequence|solve|static|struct|super|tagged|this|throughout|timeprecision)\\b"
+    - statement: "\\b(timeunit|type|typedef|union|unique|virtual|wait_order|wildcard|with|within)\\b"
+
+    # types
+    - type.keyword: "\\b(int|integer|logic|wire|tri|unsigned|signed|inout|var|shortint|shortreal|real|void|string|bit|byte)\\b"
+
+    # constants
+    - constant.number: "\\b[0-9]+\\b"
+    - constant.number: "\\b'[su]?[dboh][0-9xzXZa-fA-F]+\\b"
+    # .asdf(...) argument syntax
+    - special: "\\.((\\*)|([A-Za-z][A-Za-z0-9_]*))"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"

runtime/syntax/vi.yaml

@@ -24,7 +24,7 @@ rules:
         rules:
             - constant.specialChar: "\\\\."
 
-    - constant.comment:
+    - comment:
         start: "\""
         end: "$"
         rules: []

runtime/syntax/vue.yaml

@@ -11,14 +11,20 @@ rules:
             - include: "html5"
             
     - default: 
-        start: "<script.*?>"
-        end: "</script.*?>"
+        start: "<script>"
+        end: "</script>"
         rules:
             - include: "javascript"
+
+    - default: 
+        start: "<script[ ]+lang=(\"ts\"|'ts')>"
+        end: "</script>"
+        rules:
+            - include: "typescript"
     
     - default:
         start: "<style.*?>"
         end: "</style.*?>"
         rules:
             - include: "css"
-    
+    

runtime/syntax/xml.yaml

@@ -1,16 +1,32 @@
 filetype: xml
 
 detect:
-    filename: "\\.(xml|sgml?|rng|plist)$"
+    filename: "\\.(xml|sgml?|rng|svg|plist)$"
+    header: "<\\?xml.*\\?>"
 
 rules:
-    - identifier: "<.*?>"
-    - comment:
+    - preproc:
         start: "<!DOCTYPE"
         end: "[/]?>"
         rules: []
-    - comment: 
-        start: "<!--"
-        end: "-->"
-        rules: []
-    - special: "&[^;]*;"
+    - comment: "<!--.+?-->"
+    - symbol.tag:
+        start: "<\\??"
+        end: "\\??>"
+        rules:
+            - identifier:
+                start: " "
+                end: "="
+                rules: []
+            - constant.string:
+                start: "\""
+                end: "\""
+                skip: "\\\\."
+                rules:
+                    - constant.specialChar: "\\\\."
+            - constant.string:
+                start: "'"
+                end: "'"
+                skip: "\\\\."
+                rules:
+                    - constant.specialChar: "\\\\."

snapcraft.yaml

@@ -12,22 +12,14 @@ apps:
     command: bin/micro
 
 parts:
-  go:
-    source-tag: go1.10
   micro:
-    after: [go]
     source: .
     source-type: git
     plugin: nil
     build-packages: [make]
-    prepare: |
-      mkdir -p ../go/src/github.com/zyedidia/micro
-      cp -R . ../go/src/github.com/zyedidia/micro
-    build: |
-      export GOPATH=$(pwd)/../go
-      export GOBIN=$(pwd)/../go/bin
-      cd ../go/src/github.com/zyedidia/micro
-      make install
-    install: |
+    build-snaps: [go]
+    build-attributes: [no-patchelf]
+    override-build: |
+      make build
       mkdir $SNAPCRAFT_PART_INSTALL/bin
-      mv ../go/bin/micro $SNAPCRAFT_PART_INSTALL/bin/
+      mv ./micro $SNAPCRAFT_PART_INSTALL/bin/

tools/build-deb.sh

@@ -1,74 +0,0 @@
-# Builds three .deb packages, for x86 (i386) and x86_64 (amd64) and arm (arm)
-# These packages include a manpage, an icon, and a desktop file.
-
-function getControl() {
-echo Section: editors
-echo Package: micro
-echo Version: $2
-echo Priority: extra
-echo Maintainer: \"Zachary Yedidia\" \<zyedidia@gmail.com\>
-echo Standards-Version: 3.9.8
-echo Homepage: https://micro-editor.github.io/
-echo Architecture: $1
-echo "Description: A modern and intuitive terminal-based text editor"
-echo " This package contains a modern alternative to other terminal-based"
-echo " Editors. It is easy to Use, highly customizable via themes and plugins"
-echo " and it supports mouse input"
-}
-
-function installFiles() {
-  TO="$1/$2/usr/share/doc/micro/"
-  mkdir -p $TO
-  mkdir -p "$1/$2/usr/share/man/man1/"
-  mkdir -p "$1/$2/usr/share/applications/"
-  mkdir -p "$1/$2/usr/share/icons/"
-  cp ../LICENSE $TO
-  cp ../LICENSE-THIRD-PARTY $TO
-  cp ../README.md $TO
-  gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz
-  cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/
-  cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg
-}
-
-version=$1
-if [ "$1" == "" ]
-  then
-    version=$(go run build-version.go | tr "-" ".")
-fi
-echo "Building packages for Version '$version'"
-echo "Compiling."
-./compile-linux.sh $version
-       
-echo "Beginning package build process"
-        
-PKGPATH="../packages/deb"
-        
-rm -fr $PKGPATH
-mkdir -p $PKGPATH/amd64/DEBIAN/
-mkdir -p $PKGPATH/i386/DEBIAN/
-mkdir -p $PKGPATH/arm/DEBIAN/
-
-getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/amd64/usr/local/bin/
-mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/"
-        
-getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/i386/usr/local/bin/
-mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/"
-        
-getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/arm/usr/local/bin
-mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin"
-        
-rm -rf "micro-$version"
-        
-installFiles $PKGPATH "amd64"
-installFiles $PKGPATH "i386"
-installFiles $PKGPATH "arm"
-        
-dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb"
-dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb"
-dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb"

tools/build-packages.sh

@@ -1,129 +0,0 @@
-#Builds all packages we support
-
-version=$1
-if [ "$1" == "" ] 
-   then
-     version=$(go run build-version.go | tr "-" ".")
-fi
-echo "Building packages for Version '$version'"
-echo "Compiling."
-./compile-linux.sh $version
-
-#Build the debs
-function getControl() {
-echo Section: editors
-echo Package: micro
-echo Version: $2
-echo Priority: extra
-echo Maintainer: \"Zachary Yedidia\" \<zyedidia@gmail.com\>
-echo Standards-Version: 3.9.8
-echo Homepage: https://micro-editor.github.io/
-echo Architecture: $1
-echo "Description: A modern and intuitive terminal-based text editor"
-echo " This package contains a modern alternative to other terminal-based"
-echo " Editors. It is easy to Use, highly customizable via themes and plugins"
-echo " and it supports mouse input"
-}
-
-function installFiles() {
-  TO="$1/$2/usr/share/doc/micro/"
-  mkdir -p $TO
-  mkdir -p "$1/$2/usr/share/man/man1/"
-  mkdir -p "$1/$2/usr/share/applications/"
-  mkdir -p "$1/$2/usr/share/icons/"
-  cp ../LICENSE $TO
-  cp ../LICENSE-THIRD-PARTY $TO
-  cp ../README.md $TO
-  gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz
-  cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/
-  cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg
-}
-echo "Starting deb build process"
-PKGPATH="../packages/deb"
-rm -fr $PKGPATH
-mkdir -p $PKGPATH/amd64/DEBIAN/
-mkdir -p $PKGPATH/i386/DEBIAN/
-mkdir -p $PKGPATH/arm/DEBIAN/
-
-getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/amd64/usr/local/bin/
-mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/"
-  
-getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/i386/usr/local/bin/
-mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/"
-        
-getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control
-tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro"
-mkdir -p $PKGPATH/arm/usr/local/bin
-mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin"
-        
-rm -rf "micro-$version"
-        
-installFiles $PKGPATH "amd64"
-installFiles $PKGPATH "i386"
-installFiles $PKGPATH "arm"
-
-echo "Building debs"        
-dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb"
-dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb"
-dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb"
-
-#Build the RPMS
-echo "Starting RPM build process"
-PKGPATH="../packages/rpm"
-
-rm -rf $PKGPATH
-mkdir -p $PKGPATH
-
-versionsplit=$(echo $version | tr "." "\n")
-version=""
-i=0
-for string in $versionsplit
-do
-	if (("$i" < "2")) 
-	then
-		version=$(echo $version$string.)
-	fi
-	if (("$i" == "2")) 
-	then
-		version=$(echo $version$string)
-	fi
-	if (("$i" == "3")) 
-	then
-		dev=$(echo $dev$string.)
-	fi
-	if (("$i"=="4"))
-	then
-		dev=$(echo $dev$string)
-	fi
-	let "i+=1"
-done
-
-#Generate the spec file from template
-cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec
-
-cd $PKGPATH
-
-echo "Building the RPM packages"
-rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../"
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l
-
-cd ..
-
-mv x86_64/micro-$version-1.$dev.x86_64.rpm ./
-mv i686/micro-$version-1.$dev.i686.rpm ./
-mv armv7l/micro-$version-1.$dev.armv7l.rpm ./
-
-echo "Cleaning up."
-rm -rf x86_64
-rm -rf i686
-rm -rf armv7l
-rm -rf rpm
-rm -rf deb
-
-echo "Your packages should be ready now. Thank you, have a nice day. :)"

tools/build-rpm.sh

@@ -1,59 +0,0 @@
-#This script builds four rpm packages
-#One for x86 (i386) and x86_64 (amd64) and arm (armv7l)
-#and one containing the source tarball
-version=$1
-if [ "$1" == "" ] 
-   then
-     version=$(go run build-version.go | tr "-" ".")
-fi
-echo "Building packages for Version '$version'"
-echo "Compiling."
-./compile-linux.sh $version
-
-PKGPATH="../packages/rpm"
-
-rm -rf $PKGPATH
-mkdir -p $PKGPATH
-versionsplit=$(echo $version | tr "." "\n")
-version=""
-i=0
-for string in $versionsplit
-do
-	if (("$i" < "2")) 
-	then
-		version=$(echo $version$string.)
-	fi
-	if (("$i" == "2")) 
-	then
-		version=$(echo $version$string)
-	fi
-	if (("$i" == "3")) 
-	then
-		dev=$(echo $dev$string.)
-	fi
-	if (("$i"=="4"))
-	then
-		dev=$(echo $dev$string)
-	fi
-	let "i+=1"
-done
-echo "Starting the packaging process"
-#Generate the spec file
-cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec
-
-cd $PKGPATH
-
-rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../"
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686
-rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l
-
-cd ..
-
-mv x86_64/micro-$version-1.$dev.x86_64.rpm ./
-mv i686/micro-$version-1.$dev.i686.rpm ./
-mv armv7l/micro-$version-1.$dev.armv7l.rpm ./
-
-rm -rf x86_64
-rm -rf i686
-rm -rf armv7l

tools/compile-linux.sh

@@ -1,14 +1,8 @@
-# Source tar
-
-./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-mv micro-$1-src.tar.gz binaries
-mv micro-$1-src.zip binaries
-
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1
@@ -26,9 +20,13 @@ echo "Linux 32"
 GOOS=linux GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
 tar -czf micro-$1-linux32.tar.gz micro-$1
 mv micro-$1-linux32.tar.gz binaries
-echo "Linux arm"
+echo "Linux arm 32"
 GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
 tar -czf micro-$1-linux-arm.tar.gz micro-$1
 mv micro-$1-linux-arm.tar.gz binaries
+echo "Linux arm 64"
+GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+tar -czf micro-$1-linux-arm64.tar.gz micro-$1
+mv micro-$1-linux-arm64.tar.gz binaries
 
 rm -rf micro-$1

tools/cross-compile.sh

@@ -1,14 +1,8 @@
-# Source tar
-
-./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-mv micro-$1-src.tar.gz binaries
-mv micro-$1-src.zip binaries
-
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1
@@ -20,51 +14,78 @@ ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)"
 
 # Mac
 echo "OSX 64"
-GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE' $ADDITIONAL_GO_LINKER_FLAGS" -o micro-$1/micro ./cmd/micro
+GOOS=darwin GOARCH=amd64 make build
+mv micro micro-$1
 tar -czf micro-$1-osx.tar.gz micro-$1
 mv micro-$1-osx.tar.gz binaries
 
 # Linux
 echo "Linux 64"
-GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=linux GOARCH=amd64 make build
+mv micro micro-$1
 tar -czf micro-$1-linux64.tar.gz micro-$1
 mv micro-$1-linux64.tar.gz binaries
+
+echo "Linux 64 fully static"
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
+mv micro micro-$1
+tar -czf micro-$1-linux64-static.tar.gz micro-$1
+mv micro-$1-linux64-static.tar.gz binaries
+
 echo "Linux 32"
-GOOS=linux GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=linux GOARCH=386 make build
+mv micro micro-$1
 tar -czf micro-$1-linux32.tar.gz micro-$1
 mv micro-$1-linux32.tar.gz binaries
-echo "Linux arm"
-GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+
+echo "Linux ARM 32"
+GOOS=linux GOARCH=arm make build
+mv micro micro-$1
 tar -czf micro-$1-linux-arm.tar.gz micro-$1
 mv micro-$1-linux-arm.tar.gz binaries
 
+echo "Linux ARM 64"
+GOOS=linux GOARCH=arm64 make build
+mv micro micro-$1
+tar -czf micro-$1-linux-arm64.tar.gz micro-$1
+mv micro-$1-linux-arm64.tar.gz binaries
+
 # NetBSD
 echo "NetBSD 64"
-GOOS=netbsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=netbsd GOARCH=amd64 make build
+mv micro micro-$1
 tar -czf micro-$1-netbsd64.tar.gz micro-$1
 mv micro-$1-netbsd64.tar.gz binaries
+
 echo "NetBSD 32"
-GOOS=netbsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=netbsd GOARCH=386 make build
+mv micro micro-$1
 tar -czf micro-$1-netbsd32.tar.gz micro-$1
 mv micro-$1-netbsd32.tar.gz binaries
 
 # OpenBSD
 echo "OpenBSD 64"
-GOOS=openbsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=openbsd GOARCH=amd64 make build
+mv micro micro-$1
 tar -czf micro-$1-openbsd64.tar.gz micro-$1
 mv micro-$1-openbsd64.tar.gz binaries
+
 echo "OpenBSD 32"
-GOOS=openbsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=openbsd GOARCH=386 make build
+mv micro micro-$1
 tar -czf micro-$1-openbsd32.tar.gz micro-$1
 mv micro-$1-openbsd32.tar.gz binaries
 
 # FreeBSD
 echo "FreeBSD 64"
-GOOS=freebsd GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=freebsd GOARCH=amd64 make build
+mv micro micro-$1
 tar -czf micro-$1-freebsd64.tar.gz micro-$1
 mv micro-$1-freebsd64.tar.gz binaries
+
 echo "FreeBSD 32"
-GOOS=freebsd GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=freebsd GOARCH=386 make build
+mv micro micro-$1
 tar -czf micro-$1-freebsd32.tar.gz micro-$1
 mv micro-$1-freebsd32.tar.gz binaries
 
@@ -72,11 +93,14 @@ rm micro-$1/micro
 
 # Windows
 echo "Windows 64"
-GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro.exe ./cmd/micro
+GOOS=windows GOARCH=amd64 make build
+mv micro.exe micro-$1
 zip -r -q -T micro-$1-win64.zip micro-$1
 mv micro-$1-win64.zip binaries
+
 echo "Windows 32"
-GOOS=windows GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro.exe ./cmd/micro
+GOOS=windows GOARCH=386 make build
+mv micro.exe micro-$1
 zip -r -q -T micro-$1-win32.zip micro-$1
 mv micro-$1-win32.zip binaries
 

tools/micro.spec

@@ -1,71 +0,0 @@
-
-%global dev_rev dev.126
-
-Name: micro
-Version: 1.1.5
-Release: 1.%{dev_rev}
-Summary: A feature-rich terminal text editor
-URL: https://micro-editor.github.io
-Packager: Zachary Yedidia <zyedidia@gmail.com>
-License: MIT
-Group: Applications/Editors
-Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz
-
-# disable debuginfo, using prebuilt binaries
-%global debug_package   %{nil}
-
-## x86_64 section
-Source1: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux64.tar.gz
-%ifarch x86_64
-%global micro_src -a 1
-%endif
-
-## x86 section
-Source2: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux32.tar.gz
-%ifarch %{ix86}
-%define micro_src -a 2
-%endif
-
-## x86 section
-Source3: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux-arm.tar.gz
-%ifarch %{arm}
-%define micro_src -a 3
-%endif
-
-%description
-A modern and intuitive terminal-based text editor.
- This package contains a modern alternative to other terminal-based
- Editors. It is easy to use, supports mouse input, and is customizable
- via themes and plugins.
-
-
-%prep
-%setup -q -n %{name} %{?micro_src}
-
-
-%build
-# skipped, using pre-built binaries
-
-
-%install
-install -D -m 755 micro-%{version}.%{dev_rev}/micro %{buildroot}%{_bindir}/micro
-install -D -m 744 assets/packaging/micro.1 %{buildroot}%{_mandir}/man1/micro.1
-install -D -m 744 assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/micro.desktop
-install -D -m 744 assets/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/micro.svg
-
-
-%files
-%doc AUTHORS
-%doc LICENSE
-%doc LICENSE-THIRD-PARTY
-%doc README.md
-%{_bindir}/micro
-%{_mandir}/man1/micro.1*
-%{_datadir}/applications/micro.desktop
-%{_datadir}/icons/hicolor/scalable/apps/micro.svg
-
-
-%changelog
-* Thu Mar 30 2017 Zachary Yedidia <zyedidia@gmail.com>
--Version: 1.1.5
--Auto generated on DATE by rdieter1@localhost.localdomain

tools/nightly-release.sh

@@ -25,7 +25,7 @@ github-release release \
     --repo micro \
     --tag nightly \
     --name "Nightly build" \
-    --description "Autogenerated nightly build of micro" \
+    --description "Autogenerated nightly build of micro. If you don't see anything here that probably means it's building right now!" \
     --pre-release
 
 echo "Cross compiling binaries"
@@ -48,6 +48,14 @@ github-release upload \
     --name "micro-$1-linux64.tar.gz" \
     --file binaries/micro-$1-linux64.tar.gz
 
+echo "Uploading Linux 64 static binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag nightly \
+    --name "micro-$1-linux64-static.tar.gz" \
+    --file binaries/micro-$1-linux64-static.tar.gz
+
 echo "Uploading Linux 32 binary"
 github-release upload \
     --user zyedidia \
@@ -56,7 +64,7 @@ github-release upload \
     --name "micro-$1-linux32.tar.gz" \
     --file binaries/micro-$1-linux32.tar.gz
 
-echo "Uploading Linux Arm binary"
+echo "Uploading Linux Arm 32 binary"
 github-release upload \
     --user zyedidia \
     --repo micro \
@@ -64,6 +72,14 @@ github-release upload \
     --name "micro-$1-linux-arm.tar.gz" \
     --file binaries/micro-$1-linux-arm.tar.gz
 
+echo "Uploading Linux Arm 64 binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag nightly \
+    --name "micro-$1-linux-arm64.tar.gz" \
+    --file binaries/micro-$1-linux-arm64.tar.gz
+
 echo "Uploading FreeBSD 64 binary"
 github-release upload \
     --user zyedidia \
@@ -128,18 +144,18 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-echo "Uploading vendored tarball"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-src.tar.gz" \
-    --file binaries/micro-$1-src.tar.gz
-
-echo "Uploading vendored zip"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-src.zip" \
-    --file binaries/micro-$1-src.zip
+# echo "Uploading vendored tarball"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag nightly \
+#     --name "micro-$1-src.tar.gz" \
+#     --file binaries/micro-$1-src.tar.gz
+#
+# echo "Uploading vendored zip"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag nightly \
+#     --name "micro-$1-src.zip" \
+#     --file binaries/micro-$1-src.zip

tools/pre-release.sh

@@ -39,6 +39,14 @@ github-release upload \
     --name "micro-$1-linux64.tar.gz" \
     --file binaries/micro-$1-linux64.tar.gz
 
+echo "Uploading Linux 64 static binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-linux64-static.tar.gz" \
+    --file binaries/micro-$1-linux64-static.tar.gz
+
 echo "Uploading Linux 32 binary"
 github-release upload \
     --user zyedidia \
@@ -47,7 +55,7 @@ github-release upload \
     --name "micro-$1-linux32.tar.gz" \
     --file binaries/micro-$1-linux32.tar.gz
 
-echo "Uploading Linux Arm binary"
+echo "Uploading Linux Arm 32 binary"
 github-release upload \
     --user zyedidia \
     --repo micro \
@@ -55,6 +63,14 @@ github-release upload \
     --name "micro-$1-linux-arm.tar.gz" \
     --file binaries/micro-$1-linux-arm.tar.gz
 
+echo "Uploading Linux Arm 64 binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-linux-arm64.tar.gz" \
+    --file binaries/micro-$1-linux-arm64.tar.gz
+
 echo "Uploading FreeBSD 64 binary"
 github-release upload \
     --user zyedidia \
@@ -119,18 +135,18 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-echo "Uploading vendored tarball"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-src.tar.gz" \
-    --file binaries/micro-$1-src.tar.gz
-
-echo "Uploading vendored zip"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-src.zip" \
-    --file binaries/micro-$1-src.zip
+# echo "Uploading vendored tarball"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag $tag \
+#     --name "micro-$1-src.tar.gz" \
+#     --file binaries/micro-$1-src.tar.gz
+#
+# echo "Uploading vendored zip"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag $tag \
+#     --name "micro-$1-src.zip" \
+#     --file binaries/micro-$1-src.zip

tools/release.sh

@@ -38,6 +38,14 @@ github-release upload \
     --name "micro-$1-linux64.tar.gz" \
     --file binaries/micro-$1-linux64.tar.gz
 
+echo "Uploading Linux 64 static binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-linux64-static.tar.gz" \
+    --file binaries/micro-$1-linux64-static.tar.gz
+
 echo "Uploading Linux 32 binary"
 github-release upload \
     --user zyedidia \
@@ -46,7 +54,7 @@ github-release upload \
     --name "micro-$1-linux32.tar.gz" \
     --file binaries/micro-$1-linux32.tar.gz
 
-echo "Uploading Linux Arm binary"
+echo "Uploading Linux Arm 32 binary"
 github-release upload \
     --user zyedidia \
     --repo micro \
@@ -54,6 +62,14 @@ github-release upload \
     --name "micro-$1-linux-arm.tar.gz" \
     --file binaries/micro-$1-linux-arm.tar.gz
 
+echo "Uploading Linux Arm 64 binary"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-linux-arm64.tar.gz" \
+    --file binaries/micro-$1-linux-arm64.tar.gz
+
 echo "Uploading FreeBSD 64 binary"
 github-release upload \
     --user zyedidia \
@@ -118,19 +134,18 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-echo "Uploading vendored tarball"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-src.tar.gz" \
-    --file binaries/micro-$1-src.tar.gz
-
-echo "Uploading vendored zip"
-
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-src.zip" \
-    --file binaries/micro-$1-src.zip
+# echo "Uploading vendored tarball"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag $tag \
+#     --name "micro-$1-src.tar.gz" \
+#     --file binaries/micro-$1-src.tar.gz
+#
+# echo "Uploading vendored zip"
+# github-release upload \
+#     --user zyedidia \
+#     --repo micro \
+#     --tag $tag \
+#     --name "micro-$1-src.zip" \
+#     --file binaries/micro-$1-src.zip