Disable fake cursor for Windows Terminal

Ref #1900

Makefile

@@ -6,7 +6,8 @@ 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))
+	GOARCH=$(shell go env GOHOSTARCH) \
+	go run tools/info-plist.go "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
 GOVARS = -X github.com/zyedidia/micro/v2/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/v2/internal/util.CompileDate=$(DATE)'
 DEBUGVAR = -X github.com/zyedidia/micro/v2/internal/util.Debug=ON
@@ -14,20 +15,20 @@ VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a4
 
 # Builds micro after checking dependencies but without updating the runtime
 build:
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 build-dbg:
-	go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
 
 build-tags: fetch-tags
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
 # Builds micro without checking for dependencies
 build-quick:
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
 install:

README.md

@@ -32,7 +32,7 @@ You can also check out the website for Micro at https://micro-editor.github.io.
   - [macOS terminal](#macos-terminal)
   - [Linux clipboard support](#linux-clipboard-support)
   - [Colors and syntax highlighting](#colors-and-syntax-highlighting)
-  - [Plan9, Cygwin, Mingw](#plan9-cygwin-mingw)
+  - [Cygwin, Mingw, Plan9](#cygwin-mingw-plan9)
 - [Usage](#usage)
 - [Documentation and Help](#documentation-and-help)
 - [Contributing](#contributing)
@@ -130,6 +130,7 @@ for other operating systems. These packages are not guaranteed to be up-to-date.
     * `apt install micro` (Ubuntu 20.04 `focal`, and Debian `unstable | testing | buster-backports`). At the moment, this package (2.0.1-1) is outdated and has a known bug where debug mode is enabled.
     * `dnf install micro` (Fedora).
     * `yay -S micro` (Arch Linux).
+    * `eopkg install micro` (Solus).
     * See [wiki](https://github.com/zyedidia/micro/wiki/Installing-Micro) for details about CRUX, Termux.
 * Windows: [Chocolatey](https://chocolatey.org) and [Scoop](https://github.com/lukesampson/scoop).
     * `choco install micro`.

assets/micro-logo-mark.svg

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 103.2 103.2"
+   enable-background="new 0 0 960 560"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="micro-logo-notext.svg"
+   width="103.2"
+   height="103.2"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="733"
+     inkscape:window-height="480"
+     id="namedview5"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.28541667"
+     inkscape:cx="302"
+     inkscape:cy="-4"
+     inkscape:window-x="1699"
+     inkscape:window-y="277"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 51.6,0 C 23.1,0 0,23.1 0,51.6 c 0,28.5 23.1,51.6 51.6,51.6 28.5,0 51.6,-23.1 51.6,-51.6 C 103.2,23.1 80.1,0 51.6,0 Z m 24.5,58.6 c -0.5,2 -1.3,3.6 -2.4,4.9 -1,1.3 -2,2.1 -3.1,2.5 -1.1,0.4 -2.2,0.6 -3.4,0.6 -1.2,0 -2.2,-0.2 -3,-0.7 C 63.4,65.5 62.8,64.8 62.3,64 61.8,63.2 61.5,62.2 61.3,61.1 61.1,60 61,58.8 61,57.5 c 0,-0.5 0,-1 0.1,-1.7 0.1,-0.7 0.2,-1.6 0.3,-1.6 l -0.2,0 c -1.6,4 -3.8,6.9 -6.6,9.2 -2.8,2.3 -5.9,3.4 -9.3,3.4 -2.3,0 -4.2,-0.9 -5.5,-2.6 -1.4,-1.7 -2.1,-4.3 -2.1,-7.7 0,-0.5 0,-1 0.1,-1.6 0.1,-0.5 0.1,-0.7 0.2,-1.7 l -0.7,0 c -0.9,2 -1.7,4.8 -2.3,7.3 -0.6,2.5 -1.1,4.8 -1.4,6.9 -0.4,2.1 -0.6,4 -0.8,5.6 -0.2,1.6 -0.3,2.7 -0.4,3.3 0.1,0.5 0.2,1 0.3,1.6 0.2,0.6 0.3,1.2 0.5,1.7 0.2,0.5 0.3,1.1 0.4,1.6 0.1,0.5 0.2,0.9 0.2,1.2 0,1.4 -0.3,2.5 -0.9,3.2 -0.6,0.7 -1.3,1.1 -2,1.1 -0.9,0 -1.7,-0.3 -2.3,-0.8 -0.7,-0.6 -1,-1.5 -1,-2.7 0,-1.7 0.3,-3.9 0.9,-6.5 0.6,-2.6 1.5,-5.9 2.6,-9.8 0.6,-1.8 1.1,-3.6 1.7,-5.4 0.6,-1.8 1.1,-3.5 1.6,-5 0.5,-1.5 0.9,-2.9 1.3,-4.1 0.4,-1.2 0.6,-2.1 0.7,-2.8 0.1,-0.3 0.2,-1 0.3,-2 0.1,-1 0.2,-2.1 0.4,-3.4 0.2,-1.3 0.3,-2.7 0.5,-4.1 0.2,-1.5 0.4,-2.8 0.5,-4 0.2,-0.9 0.3,-1.9 0.5,-3 0.2,-1.1 0.5,-2.2 0.9,-3.1 0.4,-1 1,-1.8 1.7,-2.5 0.7,-0.7 1.6,-1 2.7,-1 1.2,0 2,0.4 2.4,1.1 0.4,0.7 0.6,1.6 0.5,2.6 -0.1,1 -0.2,2.1 -0.5,3.2 -0.3,1.1 -0.6,2.1 -0.9,2.9 -0.8,2.5 -1.6,4.8 -2.5,6.7 -0.9,1.9 -1.7,4 -2.4,6.2 -0.6,1.5 -0.8,2.9 -0.8,4.1 0,2.2 0.7,3.8 2,5 1.4,1.2 3,1.7 4.9,1.7 1.5,0 3,-0.5 4.4,-1.6 1.4,-1.1 2.7,-2.4 3.9,-3.9 1.2,-1.5 2.2,-3.1 3,-4.9 0.8,-1.7 1.4,-3.3 1.8,-4.6 0.1,-0.2 0.2,-0.6 0.3,-1.4 0.2,-0.8 0.3,-1.7 0.5,-2.7 0.2,-1 0.4,-2 0.6,-3.1 0.2,-1.1 0.4,-2 0.5,-2.7 0.2,-0.8 0.3,-1.6 0.5,-2.6 0.2,-1 0.5,-1.9 0.9,-2.8 0.4,-0.9 1,-1.6 1.6,-2.2 0.7,-0.6 1.5,-0.9 2.6,-0.9 1.3,0 2.1,0.4 2.6,1.1 0.4,0.7 0.6,1.6 0.6,2.6 -0.1,1 -0.2,2 -0.5,3 -0.3,1 -0.5,1.8 -0.7,2.4 -0.8,2.5 -1.6,4.7 -2.4,6.7 -0.8,2 -1.5,3.8 -2.2,5.2 -0.6,1.5 -1.1,2.6 -1.5,3.5 -0.4,0.9 -0.6,1.5 -0.6,1.8 0,2.6 0.6,4.5 1.7,5.6 1.1,1.1 2.3,1.7 3.6,1.7 2.2,0 3.9,-0.7 5.2,-2 1.3,-1.4 2.3,-3.9 2.9,-6.9 l 0.8,0 c 0.2,2.9 -0.1,5.3 -0.6,7.3 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     style="fill:#2e3192" /></svg>

assets/packaging/micro.1

@@ -14,6 +14,8 @@ of modern terminals. It comes as one single, batteries-included, static binary w
 As the name indicates, micro aims to be somewhat of a successor to the nano editor by being easy to install and use in a pinch, but micro also aims to be
 enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh).
 
+Use Ctrl-q to quit, Ctrl-s to save, and Ctrl-g to open the in-editor help menu.
+
 .SH OPTIONS
 .PP
 \-clean
@@ -51,7 +53,7 @@ Enable debug mode (enables logging to ./log.txt)
 Show the version number and information
 .RE
 
-Micro's plugin's can be managed at the command line with the following commands.
+Micro's plugins can be managed at the command line with the following commands.
 .RS 4
 
 .PP
@@ -119,5 +121,5 @@ and to report any newly encountered bugs you may find. We strive to correct
 bugs as swiftly as possible.
 
 .SH COPYRIGHT
-Copyright \(co 2020 Zachary Yedidia, et al.
-See /usr/share/doc/micro/LICENSE and /usr/share/doc/micro/AUTHORS for more information.
+Copyright \(co 2020 Zachary Yedidia, et al. MIT license.
+See \fBhttps://github.com/zyedidia/micro\fP for details.

assets/packaging/micro.desktop

@@ -6,10 +6,10 @@ Comment=Edit text files in a terminal
 
 Icon=micro
 Type=Application
-Categories=terminal;TextEditor;
+Categories=Utility;TextEditor;Development;
 Keywords=text;editor;syntax;terminal;
 
-Exec=micro %U
+Exec=micro %F
 StartupNotify=false
 Terminal=true
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;

cmd/micro/clean.go

@@ -97,14 +97,13 @@ func CleanConfig() {
 			file, e := os.Open(fname)
 
 			if e == nil {
-				defer file.Close()
-
 				decoder := gob.NewDecoder(file)
 				err = decoder.Decode(&buffer)
 
 				if err != nil && f.Name() != "history" {
 					badFiles = append(badFiles, fname)
 				}
+				file.Close()
 			}
 		}
 

cmd/micro/debug.go

@@ -12,7 +12,7 @@ type NullWriter struct{}
 
 // Write is empty
 func (NullWriter) Write(data []byte) (n int, err error) {
-	return 0, nil
+	return len(data), nil
 }
 
 // InitLog sets up the debug log system for micro if it has been enabled by compile-time variables

cmd/micro/initlua.go

@@ -10,6 +10,7 @@ import (
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
+	"github.com/zyedidia/micro/v2/internal/lsp"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
@@ -34,6 +35,8 @@ func LuaImport(pkg string) *lua.LTable {
 		return luaImportMicroConfig()
 	case "micro/util":
 		return luaImportMicroUtil()
+	case "micro/lsp":
+		return luaImportMicroLsp()
 	default:
 		return ulua.Import(pkg)
 	}
@@ -56,6 +59,7 @@ func luaImportMicro() *lua.LTable {
 	ulua.L.SetField(pkg, "Tabs", luar.New(ulua.L, func() *action.TabList {
 		return action.Tabs
 	}))
+	ulua.L.SetField(pkg, "Lock", luar.New(ulua.L, ulua.Lock))
 
 	return pkg
 }
@@ -152,3 +156,10 @@ func luaImportMicroUtil() *lua.LTable {
 
 	return pkg
 }
+func luaImportMicroLsp() *lua.LTable {
+	pkg := ulua.L.NewTable()
+
+	ulua.L.SetField(pkg, "GetLanguage", luar.New(ulua.L, lsp.GetLanguage))
+
+	return pkg
+}

cmd/micro/micro.go

@@ -5,10 +5,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/signal"
 	"regexp"
 	"runtime"
 	"sort"
 	"strconv"
+	"syscall"
 	"time"
 
 	"github.com/go-errors/errors"
@@ -16,7 +18,10 @@ import (
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/lsp"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
@@ -25,7 +30,6 @@ import (
 
 var (
 	// Event channel
-	events   chan tcell.Event
 	autosave chan bool
 
 	// Command line flags
@@ -215,6 +219,8 @@ func LoadInput(args []string) []*buffer.Buffer {
 
 func main() {
 	defer func() {
+		lsp.ShutdownAllServers()
+
 		if util.Stdout.Len() > 0 {
 			fmt.Fprint(os.Stdout, util.Stdout.String())
 		}
@@ -247,6 +253,11 @@ func main() {
 		screen.TermMessage(err)
 	}
 
+	err = lsp.Init()
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
 	// flag options
 	for k, v := range optionFlags {
 		if *v != "" {
@@ -268,9 +279,25 @@ func main() {
 		os.Exit(1)
 	}
 
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Kill, syscall.SIGTERM)
+
+	go func() {
+		<-c
+		if screen.Screen != nil {
+			screen.Screen.Fini()
+		}
+		os.Exit(0)
+	}()
+
+	m := clipboard.SetMethod(config.GetGlobalOption("clipboard").(string))
+	clipErr := clipboard.Initialize(m)
+
 	defer func() {
 		if err := recover(); err != nil {
-			screen.Screen.Fini()
+			if screen.Screen != nil {
+				screen.Screen.Fini()
+			}
 			fmt.Println("Micro encountered an error:", err)
 			// backup all open buffers
 			for _, b := range buffer.OpenBuffers {
@@ -295,6 +322,11 @@ func main() {
 		screen.TermMessage(err)
 	}
 
+	err = config.RunPluginFn("preinit")
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
 	args := flag.Args()
 	b := LoadInput(args)
 
@@ -312,7 +344,16 @@ func main() {
 		screen.TermMessage(err)
 	}
 
-	events = make(chan tcell.Event)
+	err = config.RunPluginFn("postinit")
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
+	if clipErr != nil {
+		action.InfoBar.Error(clipErr, " or change 'clipboard' option")
+	}
+
+	screen.Events = make(chan tcell.Event)
 
 	// Here is the event loop which runs in a separate thread
 	go func() {
@@ -321,7 +362,7 @@ func main() {
 			e := screen.Screen.PollEvent()
 			screen.Unlock()
 			if e != nil {
-				events <- e
+				screen.Events <- e
 			}
 		}
 	}()
@@ -334,7 +375,7 @@ func main() {
 
 	// wait for initial resize event
 	select {
-	case event := <-events:
+	case event := <-screen.Events:
 		action.Tabs.HandleEvent(event)
 	case <-time.After(10 * time.Millisecond):
 		// time out after 10ms
@@ -372,27 +413,34 @@ func DoEvent() {
 	action.MainTab().Display()
 	action.InfoBar.Display()
 	screen.Screen.Show()
+	action.InfoBar.Message("")
 
 	// Check for new events
 	select {
 	case f := <-shell.Jobs:
 		// If a new job has finished while running in the background we should execute the callback
+		ulua.Lock.Lock()
 		f.Function(f.Output, f.Args)
+		ulua.Lock.Unlock()
 	case <-config.Autosave:
+		ulua.Lock.Lock()
 		for _, b := range buffer.OpenBuffers {
 			b.Save()
 		}
+		ulua.Lock.Unlock()
 	case <-shell.CloseTerms:
-	case event = <-events:
+	case event = <-screen.Events:
 	case <-screen.DrawChan():
 		for len(screen.DrawChan()) > 0 {
 			<-screen.DrawChan()
 		}
 	}
 
+	ulua.Lock.Lock()
 	if action.InfoBar.HasPrompt {
 		action.InfoBar.HandleEvent(event)
 	} else {
 		action.Tabs.HandleEvent(event)
 	}
+	ulua.Lock.Unlock()
 }

cmd/micro/micro_test.go

@@ -20,7 +20,7 @@ var tempDir string
 var sim tcell.SimulationScreen
 
 func init() {
-	events = make(chan tcell.Event, 8)
+	screen.Events = make(chan tcell.Event, 8)
 }
 
 func startup(args []string) (tcell.SimulationScreen, error) {
@@ -106,7 +106,7 @@ func handleEvent() {
 	e := screen.Screen.PollEvent()
 	screen.Unlock()
 	if e != nil {
-		events <- e
+		screen.Events <- e
 	}
 	DoEvent()
 }

go.mod

@@ -12,13 +12,15 @@ require (
 	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-20200421031010-7c45b8673834
+	github.com/zyedidia/clipboard v1.0.3
 	github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
 	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.8
+	github.com/zyedidia/tcell v1.4.10
 	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
+	go.lsp.dev/protocol v0.8.0
+	go.lsp.dev/uri v0.3.0
 	golang.org/x/text v0.3.2
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/yaml.v2 v2.2.7

go.sum

@@ -1,45 +1,141 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
+dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
+dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
+dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
+dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 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/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
+github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 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/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
+github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 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/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
+github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 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/pty v1.1.3/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/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 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/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
+github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059 h1:/+h2b6i15wh4EWsFkfdNdBE1jjGA872tpXEyhPM5aYg=
 github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff h1:+6NUiITWwE5q1KO6SAfUX918c+Tab0+tGAM/mtdlUyA=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+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/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
+github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
+github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
+github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
+github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
+github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
+github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
+github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
+github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
+github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
+github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
+github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
+github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
+github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
+github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
+github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
+github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
+github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
+github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
+github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
+github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
+github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 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.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
+github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 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-20200421031010-7c45b8673834 h1:0nOfq3JwYRiY3+nwfWVQYEaXDmGCQgj3RKoqTifLzP4=
-github.com/zyedidia/clipboard v0.0.0-20200421031010-7c45b8673834/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA=
+github.com/zyedidia/clipboard v1.0.3 h1:F/nCDVYMdbDWTmY8s8cJl0tnwX32q96IF09JHM14bUI=
+github.com/zyedidia/clipboard v1.0.3/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA=
 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/go-shellquote v0.0.0-20200613203517-eccd813c0655 h1:Z3RhH6hvcSx7eX6Q/pP6YVsgea/1eMDG99vtWwi3nK4=
@@ -52,26 +148,124 @@ 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.8 h1:s4zYGOyCNDK4cdrgNVME0SxGizuT/oKY3OyB4Ls2Qpg=
-github.com/zyedidia/tcell v1.4.8/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
+github.com/zyedidia/tcell v1.4.10 h1:40iES9kNgiaTvp/wLTB4Elikx4uDPIPdV5fhI2EQiog=
+github.com/zyedidia/tcell v1.4.10/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=
+go.lsp.dev/jsonrpc2 v0.5.0 h1:nZfFY/G0SkMoogjAj2ltoWRvQ9xMzHDMIBWMS3CaUak=
+go.lsp.dev/jsonrpc2 v0.5.0/go.mod h1:YPWQH63927Zzz1M+t4r3p/OrmQ3EfKjRLBd3S2E0e4g=
+go.lsp.dev/protocol v0.8.0 h1:hSmnNllbCfvkRi0AjsKa8nua3EdCa4iAey75mDCpEv4=
+go.lsp.dev/protocol v0.8.0/go.mod h1:SD+a8QoAIIR7H7/SAYPDLn6iQnEeHNEicfkFOR1j9E8=
+go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo=
+go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
+go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
+go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
+golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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.1-0.20180807135948-17ff2d5776d2/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/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
+google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
 gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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=
+grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 layeh.com/gopher-luar v1.0.7 h1:53iv6CCkRs5wyofZ+qVXcyAYQOIG52s6pt4xkqZdq7k=
 layeh.com/gopher-luar v1.0.7/go.mod h1:TPnIVCZ2RJBndm7ohXyaqfhzjlZ+OA2SZR/YwL8tECk=
+sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
+sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

internal/action/actions.go

@@ -7,13 +7,15 @@ import (
 	"time"
 
 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/zyedidia/clipboard"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/lsp"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
+	"go.lsp.dev/protocol"
 )
 
 // ScrollUp is not an action
@@ -59,7 +61,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 				h.doubleClick = false
 
 				h.Cursor.SelectLine()
-				h.Cursor.CopySelection("primary")
+				h.Cursor.CopySelection(clipboard.PrimaryReg)
 			} else {
 				// Double click
 				h.lastClickTime = time.Now()
@@ -68,7 +70,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 				h.tripleClick = false
 
 				h.Cursor.SelectWord()
-				h.Cursor.CopySelection("primary")
+				h.Cursor.CopySelection(clipboard.PrimaryReg)
 			}
 		} else {
 			h.doubleClick = false
@@ -92,6 +94,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 
 	h.Cursor.StoreVisualX()
 	h.lastLoc = mouseLoc
+	h.Relocate()
 	return true
 }
 
@@ -663,6 +666,13 @@ func (h *BufPane) Autocomplete() bool {
 		return false
 	}
 
+	// if there is an existing completion, always cycle it
+	if b.HasSuggestions {
+		h.cycleAutocomplete(true)
+		return true
+	}
+
+	// don't start a new completion unless the correct conditions are met
 	if h.Cursor.X == 0 {
 		return false
 	}
@@ -672,12 +682,14 @@ func (h *BufPane) Autocomplete() bool {
 		// don't autocomplete if cursor is on alpha numeric character (middle of a word)
 		return false
 	}
-
-	if b.HasSuggestions {
-		b.CycleAutocomplete(true)
-		return true
+	ret := true
+	if !b.Autocomplete(buffer.LSPComplete) {
+		ret = b.Autocomplete(buffer.BufferComplete)
 	}
-	return b.Autocomplete(buffer.BufferComplete)
+	if ret {
+		h.displayCompletionDoc()
+	}
+	return true
 }
 
 // CycleAutocompleteBack cycles back in the autocomplete suggestion list
@@ -687,12 +699,24 @@ func (h *BufPane) CycleAutocompleteBack() bool {
 	}
 
 	if h.Buf.HasSuggestions {
-		h.Buf.CycleAutocomplete(false)
+		h.cycleAutocomplete(false)
 		return true
 	}
 	return false
 }
 
+func (h *BufPane) cycleAutocomplete(forward bool) {
+	h.Buf.CycleAutocomplete(forward)
+	h.displayCompletionDoc()
+}
+
+func (h *BufPane) displayCompletionDoc() {
+	c := h.Buf.CurCompletion
+	if c >= 0 && c < len(h.Buf.Completions) {
+		InfoBar.Message(h.Buf.Completions[c].Doc)
+	}
+}
+
 // InsertTab inserts a tab or spaces
 func (h *BufPane) InsertTab() bool {
 	b := h.Buf
@@ -961,13 +985,9 @@ func (h *BufPane) Redo() bool {
 // Copy the selection to the system clipboard
 func (h *BufPane) Copy() bool {
 	if h.Cursor.HasSelection() {
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.freshClip = true
-		if clipboard.Unsupported {
-			InfoBar.Message("Copied selection (install xclip for external clipboard)")
-		} else {
-			InfoBar.Message("Copied selection")
-		}
+		InfoBar.Message("Copied selection")
 	}
 	h.Relocate()
 	return true
@@ -979,13 +999,9 @@ func (h *BufPane) CopyLine() bool {
 		return false
 	} else {
 		h.Cursor.SelectLine()
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.freshClip = true
-		if clipboard.Unsupported {
-			InfoBar.Message("Copied line (install xclip for external clipboard)")
-		} else {
-			InfoBar.Message("Copied line")
-		}
+		InfoBar.Message("Copied line")
 	}
 	h.Cursor.Deselect(true)
 	h.Relocate()
@@ -1000,10 +1016,10 @@ func (h *BufPane) CutLine() bool {
 	}
 	if h.freshClip == true {
 		if h.Cursor.HasSelection() {
-			if clip, err := clipboard.ReadAll("clipboard"); err != nil {
-				// messenger.Error(err)
+			if clip, err := clipboard.Read(clipboard.ClipboardReg); err != nil {
+				InfoBar.Error(err)
 			} else {
-				clipboard.WriteAll(clip+string(h.Cursor.GetSelection()), "clipboard")
+				clipboard.WriteMulti(clip+string(h.Cursor.GetSelection()), clipboard.ClipboardReg, h.Cursor.Num, h.Buf.NumCursors())
 			}
 		}
 	} else if time.Since(h.lastCutTime)/time.Second > 10*time.Second || h.freshClip == false {
@@ -1021,7 +1037,7 @@ func (h *BufPane) CutLine() bool {
 // Cut the selection to the system clipboard
 func (h *BufPane) Cut() bool {
 	if h.Cursor.HasSelection() {
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.Cursor.DeleteSelection()
 		h.Cursor.ResetSelection()
 		h.freshClip = true
@@ -1147,16 +1163,24 @@ func (h *BufPane) MoveLinesDown() bool {
 // Paste whatever is in the system clipboard into the buffer
 // Delete and paste if the user has a selection
 func (h *BufPane) Paste() bool {
-	clip, _ := clipboard.ReadAll("clipboard")
-	h.paste(clip)
+	clip, err := clipboard.ReadMulti(clipboard.ClipboardReg, h.Cursor.Num, h.Buf.NumCursors())
+	if err != nil {
+		InfoBar.Error(err)
+	} else {
+		h.paste(clip)
+	}
 	h.Relocate()
 	return true
 }
 
 // PastePrimary pastes from the primary clipboard (only use on linux)
 func (h *BufPane) PastePrimary() bool {
-	clip, _ := clipboard.ReadAll("primary")
-	h.paste(clip)
+	clip, err := clipboard.ReadMulti(clipboard.PrimaryReg, h.Cursor.Num, h.Buf.NumCursors())
+	if err != nil {
+		InfoBar.Error(err)
+	} else {
+		h.paste(clip)
+	}
 	h.Relocate()
 	return true
 }
@@ -1177,11 +1201,7 @@ 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
-	if clipboard.Unsupported {
-		InfoBar.Message("Pasted clipboard (install xclip for external clipboard)")
-	} else {
-		InfoBar.Message("Pasted clipboard")
-	}
+	InfoBar.Message("Pasted clipboard")
 }
 
 // JumpToMatchingBrace moves the cursor to the matching brace if it is
@@ -1443,6 +1463,18 @@ func (h *BufPane) Escape() bool {
 	return true
 }
 
+// Deselect deselects on the current cursor
+func (h *BufPane) Deselect() bool {
+	h.Cursor.Deselect(true)
+	return true
+}
+
+// ClearInfo clears the infobar
+func (h *BufPane) ClearInfo() bool {
+	InfoBar.Message("")
+	return true
+}
+
 // Quit this will close the current tab or view that is open
 func (h *BufPane) Quit() bool {
 	quit := func() {
@@ -1805,6 +1837,52 @@ func (h *BufPane) RemoveAllMultiCursors() bool {
 	return true
 }
 
+// SemanticInfo returns information about the identifier the cursor is on and
+// displays the information in the infobar
+// The information is fetched using the LSP server (must be enabled)
+func (h *BufPane) SemanticInfo() bool {
+	info, err := h.Buf.Server.Hover(h.Buf.AbsPath, lsp.Position(h.Cursor.X, h.Cursor.Y))
+
+	if err != nil {
+		InfoBar.Error(err)
+		return false
+	}
+
+	info = strings.Split(info, "\n")[0]
+
+	InfoBar.Message(info)
+	return true
+}
+
+// AutoFormat automatically formats the document using LSP
+func (h *BufPane) AutoFormat() bool {
+	var err error
+	var edits []protocol.TextEdit
+
+	if h.Cursor.HasSelection() {
+		edits, err = h.Buf.Server.DocumentRangeFormat(h.Buf.AbsPath, protocol.Range{
+			Start: lsp.Position(h.Cursor.CurSelection[0].X, h.Cursor.CurSelection[0].Y),
+			End:   lsp.Position(h.Cursor.CurSelection[1].X, h.Cursor.CurSelection[1].Y),
+		}, protocol.FormattingOptions{
+			InsertSpaces: h.Buf.Settings["tabstospaces"].(bool),
+			TabSize:      h.Buf.Settings["tabsize"].(float64),
+		})
+	} else {
+		edits, err = h.Buf.Server.DocumentFormat(h.Buf.AbsPath, protocol.FormattingOptions{
+			InsertSpaces: h.Buf.Settings["tabstospaces"].(bool),
+			TabSize:      h.Buf.Settings["tabsize"].(float64),
+		})
+	}
+
+	if err != nil {
+		InfoBar.Error(err)
+		return false
+	}
+
+	h.Buf.ApplyEdits(edits)
+	return true
+}
+
 // None is an action that does nothing
 func (h *BufPane) None() bool {
 	return true

internal/action/bindings.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"unicode"
 
@@ -15,6 +16,12 @@ import (
 	"github.com/zyedidia/tcell"
 )
 
+var Binder = map[string]func(e Event, action string){
+	"info":     InfoMapEvent,
+	"buffer":   BufMapEvent,
+	"terminal": TermMapEvent,
+}
+
 func createBindingsIfNotExist(fname string) {
 	if _, e := os.Stat(fname); os.IsNotExist(e) {
 		ioutil.WriteFile(fname, []byte("{}"), 0644)
@@ -23,10 +30,7 @@ func createBindingsIfNotExist(fname string) {
 
 // InitBindings intializes the bindings map by reading from bindings.json
 func InitBindings() {
-	config.Bindings = DefaultBindings()
-
-	var parsed map[string]string
-	defaults := DefaultBindings()
+	var parsed map[string]interface{}
 
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
@@ -44,34 +48,87 @@ func InitBindings() {
 		}
 	}
 
-	for k, v := range defaults {
-		BindKey(k, v)
+	for p, bind := range Binder {
+		defaults := DefaultBindings(p)
+
+		for k, v := range defaults {
+			BindKey(k, v, bind)
+		}
 	}
+
 	for k, v := range parsed {
-		BindKey(k, v)
+		switch val := v.(type) {
+		case string:
+			BindKey(k, val, Binder["buffer"])
+		case map[string]interface{}:
+			bind := Binder[k]
+			for e, a := range val {
+				s, ok := a.(string)
+				if !ok {
+					screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
+				} else {
+					BindKey(e, s, bind)
+				}
+			}
+		default:
+			screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
+		}
 	}
 }
 
-func BindKey(k, v string) {
-	event, ok := findEvent(k)
-	if !ok {
-		screen.TermMessage(k, "is not a bindable event")
+func BindKey(k, v string, bind func(e Event, a string)) {
+	event, err := findEvent(k)
+	if err != nil {
+		screen.TermMessage(err)
+		return
 	}
 
-	switch e := event.(type) {
-	case KeyEvent:
-		BufMapKey(e, v)
-	case MouseEvent:
-		BufMapMouse(e, v)
-	case RawEvent:
-		BufMapKey(e, v)
-	}
+	config.Bindings[event.Name()] = v
 
-	config.Bindings[k] = v
+	bind(event, v)
+
+	// switch e := event.(type) {
+	// case KeyEvent:
+	// 	InfoMapKey(e, v)
+	// case KeySequenceEvent:
+	// 	InfoMapKey(e, v)
+	// case MouseEvent:
+	// 	InfoMapMouse(e, v)
+	// case RawEvent:
+	// 	InfoMapKey(e, v)
+	// }
 }
 
-// findEvent will find binding Key 'b' using string 'k'
-func findEvent(k string) (b Event, ok bool) {
+var r = regexp.MustCompile("<(.+?)>")
+
+func findEvents(k string) (b KeySequenceEvent, ok bool, err error) {
+	var events []Event = nil
+	for len(k) > 0 {
+		groups := r.FindStringSubmatchIndex(k)
+
+		if len(groups) > 3 {
+			if events == nil {
+				events = make([]Event, 0, 3)
+			}
+
+			e, ok := findSingleEvent(k[groups[2]:groups[3]])
+			if !ok {
+				return KeySequenceEvent{}, false, errors.New("Invalid event " + k[groups[2]:groups[3]])
+			}
+
+			events = append(events, e)
+
+			k = k[groups[3]+1:]
+		} else {
+			return KeySequenceEvent{}, false, nil
+		}
+	}
+
+	return KeySequenceEvent{events}, true, nil
+}
+
+// findSingleEvent will find binding Key 'b' using string 'k'
+func findSingleEvent(k string) (b Event, ok bool) {
 	modifiers := tcell.ModNone
 
 	// First, we'll strip off all the modifiers in the name and add them to the
@@ -162,6 +219,23 @@ modSearch:
 	return KeyEvent{}, false
 }
 
+func findEvent(k string) (Event, error) {
+	var event Event
+	event, ok, err := findEvents(k)
+	if err != nil {
+		return nil, err
+	}
+
+	if !ok {
+		event, ok = findSingleEvent(k)
+		if !ok {
+			return nil, errors.New(k + " is not a bindable event")
+		}
+	}
+
+	return event, nil
+}
+
 // TryBindKey tries to bind a key by writing to config.ConfigDir/bindings.json
 // Returns true if the keybinding already existed and a possible error
 func TryBindKey(k, v string, overwrite bool) (bool, error) {
@@ -181,14 +255,14 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 			return false, errors.New("Error reading bindings.json: " + err.Error())
 		}
 
-		key, ok := findEvent(k)
-		if !ok {
-			return false, errors.New("Invalid event " + k)
+		key, err := findEvent(k)
+		if err != nil {
+			return false, err
 		}
 
 		found := false
 		for ev := range parsed {
-			if e, ok := findEvent(ev); ok {
+			if e, err := findEvent(ev); err == nil {
 				if e == key {
 					if overwrite {
 						parsed[ev] = v
@@ -205,7 +279,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 			parsed[k] = v
 		}
 
-		BindKey(k, v)
+		BindKey(k, v, Binder["buffer"])
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
 		return true, ioutil.WriteFile(filename, append(txt, '\n'), 0644)
@@ -231,13 +305,13 @@ func UnbindKey(k string) error {
 			return errors.New("Error reading bindings.json: " + err.Error())
 		}
 
-		key, ok := findEvent(k)
-		if !ok {
-			return errors.New("Invalid event " + k)
+		key, err := findEvent(k)
+		if err != nil {
+			return err
 		}
 
 		for ev := range parsed {
-			if e, ok := findEvent(ev); ok {
+			if e, err := findEvent(ev); err == nil {
 				if e == key {
 					delete(parsed, ev)
 					break
@@ -245,9 +319,9 @@ func UnbindKey(k string) error {
 			}
 		}
 
-		defaults := DefaultBindings()
+		defaults := DefaultBindings("buffer")
 		if a, ok := defaults[k]; ok {
-			BindKey(k, a)
+			BindKey(k, a, Binder["buffer"])
 		} else if _, ok := config.Bindings[k]; ok {
 			BufUnmap(key)
 			delete(config.Bindings, k)

internal/action/bufpane.go

@@ -8,6 +8,7 @@ import (
 
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
@@ -18,14 +19,22 @@ import (
 type BufKeyAction func(*BufPane) bool
 type BufMouseAction func(*BufPane, *tcell.EventMouse) bool
 
-var BufKeyBindings map[Event]BufKeyAction
-var BufKeyStrings map[Event]string
-var BufMouseBindings map[MouseEvent]BufMouseAction
+var BufBindings *KeyTree
+
+func BufKeyActionGeneral(a BufKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		return a(p.(*BufPane))
+	}
+}
+
+func BufMouseActionGeneral(a BufMouseAction) PaneMouseAction {
+	return func(p Pane, me *tcell.EventMouse) bool {
+		return a(p.(*BufPane), me)
+	}
+}
 
 func init() {
-	BufKeyBindings = make(map[Event]BufKeyAction)
-	BufKeyStrings = make(map[Event]string)
-	BufMouseBindings = make(map[MouseEvent]BufMouseAction)
+	BufBindings = NewKeyTree()
 }
 
 func LuaAction(fn string) func(*BufPane) bool {
@@ -51,9 +60,17 @@ func LuaAction(fn string) func(*BufPane) bool {
 	}
 }
 
-// BufMapKey maps a key event to an action
-func BufMapKey(k Event, action string) {
-	BufKeyStrings[k] = action
+// BufMapKey maps an event to an action
+func BufMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		bufMapKey(e, action)
+	case MouseEvent:
+		bufMapMouse(e, action)
+	}
+}
+
+func bufMapKey(k Event, action string) {
 	var actionfns []func(*BufPane) bool
 	var names []string
 	var types []byte
@@ -108,10 +125,11 @@ func BufMapKey(k Event, action string) {
 		}
 		actionfns = append(actionfns, afn)
 	}
-	BufKeyBindings[k] = func(h *BufPane) bool {
+	bufAction := func(h *BufPane) bool {
 		cursors := h.Buf.GetCursors()
 		success := true
 		for i, a := range actionfns {
+			innerSuccess := true
 			for j, c := range cursors {
 				if c == nil {
 					continue
@@ -119,37 +137,41 @@ func BufMapKey(k Event, action string) {
 				h.Buf.SetCurCursor(c.Num)
 				h.Cursor = c
 				if i == 0 || (success && types[i-1] == '&') || (!success && types[i-1] == '|') || (types[i-1] == ',') {
-					success = h.execAction(a, names[i], j)
+					innerSuccess = innerSuccess && h.execAction(a, names[i], j)
 				} else {
 					break
 				}
 			}
 			// if the action changed the current pane, update the reference
 			h = MainTab().CurPane()
+			success = innerSuccess
 		}
 		return true
 	}
+
+	BufBindings.RegisterKeyBinding(k, BufKeyActionGeneral(bufAction))
 }
 
 // BufMapMouse maps a mouse event to an action
-func BufMapMouse(k MouseEvent, action string) {
+func bufMapMouse(k MouseEvent, action string) {
 	if f, ok := BufMouseActions[action]; ok {
-		BufMouseBindings[k] = f
+		BufBindings.RegisterMouseBinding(k, BufMouseActionGeneral(f))
 	} else {
-		delete(BufMouseBindings, k)
-		BufMapKey(k, action)
+		// TODO
+		// delete(BufMouseBindings, k)
+		bufMapKey(k, action)
 	}
 }
 
 // BufUnmap unmaps a key or mouse event from any action
 func BufUnmap(k Event) {
-	delete(BufKeyBindings, k)
-	delete(BufKeyStrings, k)
-
-	switch e := k.(type) {
-	case MouseEvent:
-		delete(BufMouseBindings, e)
-	}
+	// TODO
+	// delete(BufKeyBindings, k)
+	//
+	// switch e := k.(type) {
+	// case MouseEvent:
+	// 	delete(BufMouseBindings, e)
+	// }
 }
 
 // The BufPane connects the buffer and the window
@@ -160,9 +182,13 @@ func BufUnmap(k Event) {
 type BufPane struct {
 	display.BWindow
 
+	// Buf is the buffer this BufPane views
 	Buf *buffer.Buffer
+	// Bindings stores the association of key events and actions
+	bindings *KeyTree
 
-	Cursor *buffer.Cursor // the active cursor
+	// Cursor is the currently active buffer cursor
+	Cursor *buffer.Cursor
 
 	// Since tcell doesn't differentiate between a mouse release event
 	// and a mouse move event with no keys pressed, we need to keep
@@ -360,7 +386,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 				// 	h.Cursor.SetSelectionEnd(h.Cursor.Loc)
 				// }
 				if h.Cursor.HasSelection() {
-					h.Cursor.CopySelection("primary")
+					h.Cursor.CopySelection(clipboard.PrimaryReg)
 				}
 				h.mouseReleased = true
 			}
@@ -393,13 +419,26 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 	}
 }
 
+func (h *BufPane) Bindings() *KeyTree {
+	if h.bindings != nil {
+		return h.bindings
+	}
+	return BufBindings
+}
+
 // DoKeyEvent executes a key event by finding the action it is bound
 // to and executing it (possibly multiple times for multiple cursors)
 func (h *BufPane) DoKeyEvent(e Event) bool {
-	if action, ok := BufKeyBindings[e]; ok {
-		return action(h)
+	binds := h.Bindings()
+	action, more := binds.NextEvent(e, nil)
+	if action != nil && !more {
+		action(h)
+		binds.ResetEvents()
+		return true
+	} else if action == nil && !more {
+		binds.ResetEvents()
 	}
-	return false
+	return more
 }
 
 func (h *BufPane) execAction(action func(*BufPane) bool, name string, cursor int) bool {
@@ -433,22 +472,34 @@ func (h *BufPane) completeAction(action string) {
 }
 
 func (h *BufPane) HasKeyEvent(e Event) bool {
-	_, ok := BufKeyBindings[e]
-	return ok
+	// TODO
+	return true
+	// _, ok := BufKeyBindings[e]
+	// return ok
 }
 
 // DoMouseEvent executes a mouse event by finding the action it is bound
 // to and executing it
 func (h *BufPane) DoMouseEvent(e MouseEvent, te *tcell.EventMouse) bool {
-	if action, ok := BufMouseBindings[e]; ok {
-		if action(h, te) {
-			h.Relocate()
-		}
+	binds := h.Bindings()
+	action, _ := binds.NextEvent(e, te)
+	if action != nil {
+		action(h)
+		binds.ResetEvents()
 		return true
-	} else if h.HasKeyEvent(e) {
-		return h.DoKeyEvent(e)
 	}
+	// TODO
 	return false
+
+	// if action, ok := BufMouseBindings[e]; ok {
+	// 	if action(h, te) {
+	// 		h.Relocate()
+	// 	}
+	// 	return true
+	// } else if h.HasKeyEvent(e) {
+	// 	return h.DoKeyEvent(e)
+	// }
+	// return false
 }
 
 // DoRuneInsert inserts a given rune into the current buffer
@@ -635,6 +686,10 @@ var BufKeyActions = map[string]BufKeyAction{
 	"SkipMultiCursor":           (*BufPane).SkipMultiCursor,
 	"JumpToMatchingBrace":       (*BufPane).JumpToMatchingBrace,
 	"JumpLine":                  (*BufPane).JumpLine,
+	"Deselect":                  (*BufPane).Deselect,
+	"ClearInfo":                 (*BufPane).ClearInfo,
+	"SemanticInfo":              (*BufPane).SemanticInfo,
+	"AutoFormat":                (*BufPane).AutoFormat,
 	"None":                      (*BufPane).None,
 
 	// This was changed to InsertNewline but I don't want to break backwards compatibility
@@ -686,6 +741,7 @@ var MultiActions = map[string]bool{
 	"FindNext":                  true,
 	"FindPrevious":              true,
 	"CopyLine":                  true,
+	"Copy":                      true,
 	"Cut":                       true,
 	"CutLine":                   true,
 	"DuplicateLine":             true,

internal/action/command.go

@@ -13,6 +13,7 @@ import (
 
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
@@ -505,6 +506,12 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 			}
 		} else if option == "paste" {
 			screen.Screen.SetPaste(nativeValue.(bool))
+		} else if option == "clipboard" {
+			m := clipboard.SetMethod(nativeValue.(string))
+			err := clipboard.Initialize(m)
+			if err != nil {
+				return err
+			}
 		} else {
 			for _, pl := range config.Plugins {
 				if option == pl.Name {
@@ -634,7 +641,12 @@ func (h *BufPane) ShowKeyCmd(args []string) {
 		return
 	}
 
-	if action, ok := config.Bindings[args[0]]; ok {
+	event, err := findEvent(args[0])
+	if err != nil {
+		InfoBar.Error(err)
+		return
+	}
+	if action, ok := config.Bindings[event.Name()]; ok {
 		InfoBar.Message(action)
 	} else {
 		InfoBar.Message(args[0], " has no binding")

internal/action/defaults.go

@@ -0,0 +1,21 @@
+package action
+
+var termdefaults = map[string]string{
+	"<Ctrl-q><Ctrl-q>": "Exit",
+	"<Ctrl-e><Ctrl-e>": "CommandMode",
+	"<Ctrl-w><Ctrl-w>": "NextSplit",
+}
+
+// DefaultBindings returns a map containing micro's default keybindings
+func DefaultBindings(pane string) map[string]string {
+	switch pane {
+	case "info":
+		return infodefaults
+	case "buffer":
+		return bufdefaults
+	case "terminal":
+		return termdefaults
+	default:
+		return map[string]string{}
+	}
+}

internal/action/defaults_darwin.go

@@ -1,108 +1,179 @@
 package action
 
-// DefaultBindings returns a map containing micro's default keybindings
-func DefaultBindings() map[string]string {
-	return map[string]string{
-		"Up":             "CursorUp",
-		"Down":           "CursorDown",
-		"Right":          "CursorRight",
-		"Left":           "CursorLeft",
-		"ShiftUp":        "SelectUp",
-		"ShiftDown":      "SelectDown",
-		"ShiftLeft":      "SelectLeft",
-		"ShiftRight":     "SelectRight",
-		"AltLeft":        "WordLeft",
-		"AltRight":       "WordRight",
-		"AltUp":          "MoveLinesUp",
-		"AltDown":        "MoveLinesDown",
-		"AltShiftRight":  "SelectWordRight",
-		"AltShiftLeft":   "SelectWordLeft",
-		"CtrlLeft":       "StartOfTextToggle",
-		"CtrlRight":      "EndOfLine",
-		"CtrlShiftLeft":  "SelectToStartOfTextToggle",
-		"ShiftHome":      "SelectToStartOfTextToggle",
-		"CtrlShiftRight": "SelectToEndOfLine",
-		"ShiftEnd":       "SelectToEndOfLine",
-		"CtrlUp":         "CursorStart",
-		"CtrlDown":       "CursorEnd",
-		"CtrlShiftUp":    "SelectToStart",
-		"CtrlShiftDown":  "SelectToEnd",
-		"Alt-{":          "ParagraphPrevious",
-		"Alt-}":          "ParagraphNext",
-		"Enter":          "InsertNewline",
-		"CtrlH":          "Backspace",
-		"Backspace":      "Backspace",
-		"OldBackspace":   "Backspace",
-		"Alt-CtrlH":      "DeleteWordLeft",
-		"Alt-Backspace":  "DeleteWordLeft",
-		"Tab":            "Autocomplete|IndentSelection|InsertTab",
-		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-		"Ctrl-o":         "OpenFile",
-		"Ctrl-s":         "Save",
-		"Ctrl-f":         "Find",
-		"Ctrl-n":         "FindNext",
-		"Ctrl-p":         "FindPrevious",
-		"Ctrl-z":         "Undo",
-		"Ctrl-y":         "Redo",
-		"Ctrl-c":         "CopyLine|Copy",
-		"Ctrl-x":         "Cut",
-		"Ctrl-k":         "CutLine",
-		"Ctrl-d":         "DuplicateLine",
-		"Ctrl-v":         "Paste",
-		"Ctrl-a":         "SelectAll",
-		"Ctrl-t":         "AddTab",
-		"Alt-,":          "PreviousTab",
-		"Alt-.":          "NextTab",
-		"Home":           "StartOfTextToggle",
-		"End":            "EndOfLine",
-		"CtrlHome":       "CursorStart",
-		"CtrlEnd":        "CursorEnd",
-		"PageUp":         "CursorPageUp",
-		"PageDown":       "CursorPageDown",
-		"CtrlPageUp":     "PreviousTab",
-		"CtrlPageDown":   "NextTab",
-		"Ctrl-g":         "ToggleHelp",
-		"Alt-g":          "ToggleKeyMenu",
-		"Ctrl-r":         "ToggleRuler",
-		"Ctrl-l":         "command-edit:goto ",
-		"Delete":         "Delete",
-		"Ctrl-b":         "ShellMode",
-		"Ctrl-q":         "Quit",
-		"Ctrl-e":         "CommandMode",
-		"Ctrl-w":         "NextSplit",
-		"Ctrl-u":         "ToggleMacro",
-		"Ctrl-j":         "PlayMacro",
-		"Insert":         "ToggleOverwriteMode",
+var bufdefaults = map[string]string{
+	"Up":             "CursorUp",
+	"Down":           "CursorDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "WordLeft",
+	"AltRight":       "WordRight",
+	"AltUp":          "MoveLinesUp",
+	"AltDown":        "MoveLinesDown",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "StartOfTextToggle",
+	"CtrlRight":      "EndOfLine",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Alt-{":          "ParagraphPrevious",
+	"Alt-}":          "ParagraphNext",
+	"Enter":          "InsertNewline",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "Autocomplete|IndentSelection|InsertTab",
+	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+	"Ctrl-o":         "OpenFile",
+	"Ctrl-s":         "Save",
+	"Ctrl-f":         "Find",
+	"Ctrl-n":         "FindNext",
+	"Ctrl-p":         "FindPrevious",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-d":         "DuplicateLine",
+	"Ctrl-v":         "Paste",
+	"Ctrl-a":         "SelectAll",
+	"Ctrl-t":         "AddTab",
+	"Alt-,":          "PreviousTab",
+	"Alt-.":          "NextTab",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"PageUp":         "CursorPageUp",
+	"PageDown":       "CursorPageDown",
+	"CtrlPageUp":     "PreviousTab",
+	"CtrlPageDown":   "NextTab",
+	"Ctrl-g":         "ToggleHelp",
+	"Alt-g":          "ToggleKeyMenu",
+	"Ctrl-r":         "ToggleRuler",
+	"Ctrl-l":         "command-edit:goto ",
+	"Delete":         "Delete",
+	"Ctrl-b":         "ShellMode",
+	"Ctrl-q":         "Quit",
+	"Ctrl-e":         "CommandMode",
+	"Ctrl-w":         "NextSplit",
+	"Ctrl-u":         "ToggleMacro",
+	"Ctrl-j":         "PlayMacro",
+	"Insert":         "ToggleOverwriteMode",
 
-		// Emacs-style keybindings
-		"Alt-f": "WordRight",
-		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfText",
-		"Alt-e": "EndOfLine",
-		// "Alt-p": "CursorUp",
-		// "Alt-n": "CursorDown",
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+	// "Alt-p": "CursorUp",
+	// "Alt-n": "CursorDown",
 
-		// Integration with file managers
-		"F2":  "Save",
-		"F3":  "Find",
-		"F4":  "Quit",
-		"F7":  "Find",
-		"F10": "Quit",
-		"Esc": "Escape",
+	// Integration with file managers
+	"F2":  "Save",
+	"F3":  "Find",
+	"F4":  "Quit",
+	"F7":  "Find",
+	"F10": "Quit",
+	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors",
 
-		// Mouse bindings
-		"MouseWheelUp":   "ScrollUp",
-		"MouseWheelDown": "ScrollDown",
-		"MouseLeft":      "MousePress",
-		"MouseMiddle":    "PastePrimary",
-		"Ctrl-MouseLeft": "MouseMultiCursor",
+	// Mouse bindings
+	"MouseWheelUp":   "ScrollUp",
+	"MouseWheelDown": "ScrollDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
+	"Ctrl-MouseLeft": "MouseMultiCursor",
 
-		"Alt-n":        "SpawnMultiCursor",
-		"AltShiftUp":   "SpawnMultiCursorUp",
-		"AltShiftDown": "SpawnMultiCursorDown",
-		"Alt-m":        "SpawnMultiCursorSelect",
-		"Alt-p":        "RemoveMultiCursor",
-		"Alt-c":        "RemoveAllMultiCursors",
-		"Alt-x":        "SkipMultiCursor",
-	}
+	"Alt-n":        "SpawnMultiCursor",
+	"AltShiftUp":   "SpawnMultiCursorUp",
+	"AltShiftDown": "SpawnMultiCursorDown",
+	"Alt-m":        "SpawnMultiCursorSelect",
+	"Alt-p":        "RemoveMultiCursor",
+	"Alt-c":        "RemoveAllMultiCursors",
+	"Alt-x":        "SkipMultiCursor",
+}
+
+var infodefaults = map[string]string{
+	"Up":             "HistoryUp",
+	"Down":           "HistoryDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "WordLeft",
+	"AltRight":       "WordRight",
+	"AltUp":          "CursorStart",
+	"AltDown":        "CursorEnd",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "StartOfTextToggle",
+	"CtrlRight":      "EndOfLine",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Enter":          "ExecuteCommand",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "CommandComplete",
+	"Backtab":        "CycleAutocompleteBack",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-v":         "Paste",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"Delete":         "Delete",
+	"Ctrl-q":         "AbortCommand",
+	"Ctrl-e":         "EndOfLine",
+	"Ctrl-a":         "StartOfLine",
+	"Ctrl-w":         "DeleteWordLeft",
+	"Insert":         "ToggleOverwriteMode",
+	"Ctrl-b":         "WordLeft",
+	"Ctrl-f":         "WordRight",
+	"Ctrl-d":         "DeleteWordLeft",
+	"Ctrl-m":         "ExecuteCommand",
+	"Ctrl-n":         "HistoryDown",
+	"Ctrl-p":         "HistoryUp",
+	"Ctrl-u":         "SelectToStart",
+
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+
+	// Integration with file managers
+	"F10": "AbortCommand",
+	"Esc": "AbortCommand",
+
+	// Mouse bindings
+	"MouseWheelUp":   "HistoryUp",
+	"MouseWheelDown": "HistoryDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
 }

internal/action/defaults_other.go

@@ -2,109 +2,181 @@
 
 package action
 
-// DefaultBindings returns a map containing micro's default keybindings
-func DefaultBindings() map[string]string {
-	return map[string]string{
-		"Up":             "CursorUp",
-		"Down":           "CursorDown",
-		"Right":          "CursorRight",
-		"Left":           "CursorLeft",
-		"ShiftUp":        "SelectUp",
-		"ShiftDown":      "SelectDown",
-		"ShiftLeft":      "SelectLeft",
-		"ShiftRight":     "SelectRight",
-		"CtrlLeft":       "WordLeft",
-		"CtrlRight":      "WordRight",
-		"AltUp":          "MoveLinesUp",
-		"AltDown":        "MoveLinesDown",
-		"CtrlShiftRight": "SelectWordRight",
-		"CtrlShiftLeft":  "SelectWordLeft",
-		"AltLeft":        "StartOfTextToggle",
-		"AltRight":       "EndOfLine",
-		"AltShiftLeft":   "SelectToStartOfTextToggle",
-		"ShiftHome":      "SelectToStartOfTextToggle",
-		"AltShiftRight":  "SelectToEndOfLine",
-		"ShiftEnd":       "SelectToEndOfLine",
-		"CtrlUp":         "CursorStart",
-		"CtrlDown":       "CursorEnd",
-		"CtrlShiftUp":    "SelectToStart",
-		"CtrlShiftDown":  "SelectToEnd",
-		"Alt-{":          "ParagraphPrevious",
-		"Alt-}":          "ParagraphNext",
-		"Enter":          "InsertNewline",
-		"CtrlH":          "Backspace",
-		"Backspace":      "Backspace",
-		"OldBackspace":   "Backspace",
-		"Alt-CtrlH":      "DeleteWordLeft",
-		"Alt-Backspace":  "DeleteWordLeft",
-		"Tab":            "Autocomplete|IndentSelection|InsertTab",
-		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-		"Ctrl-o":         "OpenFile",
-		"Ctrl-s":         "Save",
-		"Ctrl-f":         "Find",
-		"Ctrl-n":         "FindNext",
-		"Ctrl-p":         "FindPrevious",
-		"Ctrl-z":         "Undo",
-		"Ctrl-y":         "Redo",
-		"Ctrl-c":         "CopyLine|Copy",
-		"Ctrl-x":         "Cut",
-		"Ctrl-k":         "CutLine",
-		"Ctrl-d":         "DuplicateLine",
-		"Ctrl-v":         "Paste",
-		"Ctrl-a":         "SelectAll",
-		"Ctrl-t":         "AddTab",
-		"Alt-,":          "PreviousTab",
-		"Alt-.":          "NextTab",
-		"Home":           "StartOfTextToggle",
-		"End":            "EndOfLine",
-		"CtrlHome":       "CursorStart",
-		"CtrlEnd":        "CursorEnd",
-		"PageUp":         "CursorPageUp",
-		"PageDown":       "CursorPageDown",
-		"CtrlPageUp":     "PreviousTab",
-		"CtrlPageDown":   "NextTab",
-		"Ctrl-g":         "ToggleHelp",
-		"Alt-g":          "ToggleKeyMenu",
-		"Ctrl-r":         "ToggleRuler",
-		"Ctrl-l":         "command-edit:goto ",
-		"Delete":         "Delete",
-		"Ctrl-b":         "ShellMode",
-		"Ctrl-q":         "Quit",
-		"Ctrl-e":         "CommandMode",
-		"Ctrl-w":         "NextSplit",
-		"Ctrl-u":         "ToggleMacro",
-		"Ctrl-j":         "PlayMacro",
-		"Insert":         "ToggleOverwriteMode",
+var bufdefaults = map[string]string{
+	"Up":             "CursorUp",
+	"Down":           "CursorDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"CtrlLeft":       "WordLeft",
+	"CtrlRight":      "WordRight",
+	"AltUp":          "MoveLinesUp",
+	"AltDown":        "MoveLinesDown",
+	"CtrlShiftRight": "SelectWordRight",
+	"CtrlShiftLeft":  "SelectWordLeft",
+	"AltLeft":        "StartOfTextToggle",
+	"AltRight":       "EndOfLine",
+	"AltShiftLeft":   "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"AltShiftRight":  "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Alt-{":          "ParagraphPrevious",
+	"Alt-}":          "ParagraphNext",
+	"Enter":          "InsertNewline",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "Autocomplete|IndentSelection|InsertTab",
+	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+	"Ctrl-o":         "OpenFile",
+	"Ctrl-s":         "Save",
+	"Ctrl-f":         "Find",
+	"Ctrl-n":         "FindNext",
+	"Ctrl-p":         "FindPrevious",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-d":         "DuplicateLine",
+	"Ctrl-v":         "Paste",
+	"Ctrl-a":         "SelectAll",
+	"Ctrl-t":         "AddTab",
+	"Alt-,":          "PreviousTab",
+	"Alt-.":          "NextTab",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"PageUp":         "CursorPageUp",
+	"PageDown":       "CursorPageDown",
+	"CtrlPageUp":     "PreviousTab",
+	"CtrlPageDown":   "NextTab",
+	"Ctrl-g":         "ToggleHelp",
+	"Alt-g":          "ToggleKeyMenu",
+	"Ctrl-r":         "ToggleRuler",
+	"Ctrl-l":         "command-edit:goto ",
+	"Delete":         "Delete",
+	"Ctrl-b":         "ShellMode",
+	"Ctrl-q":         "Quit",
+	"Ctrl-e":         "CommandMode",
+	"Ctrl-w":         "NextSplit",
+	"Ctrl-u":         "ToggleMacro",
+	"Ctrl-j":         "PlayMacro",
+	"Alt-i":          "SemanticInfo",
+	"Insert":         "ToggleOverwriteMode",
 
-		// Emacs-style keybindings
-		"Alt-f": "WordRight",
-		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfText",
-		"Alt-e": "EndOfLine",
-		// "Alt-p": "CursorUp",
-		// "Alt-n": "CursorDown",
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+	// "Alt-p": "CursorUp",
+	// "Alt-n": "CursorDown",
 
-		// Integration with file managers
-		"F2":  "Save",
-		"F3":  "Find",
-		"F4":  "Quit",
-		"F7":  "Find",
-		"F10": "Quit",
-		"Esc": "Escape",
+	// Integration with file managers
+	"F2":  "Save",
+	"F3":  "Find",
+	"F4":  "Quit",
+	"F7":  "Find",
+	"F10": "Quit",
+	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors",
 
-		// Mouse bindings
-		"MouseWheelUp":   "ScrollUp",
-		"MouseWheelDown": "ScrollDown",
-		"MouseLeft":      "MousePress",
-		"MouseMiddle":    "PastePrimary",
-		"Ctrl-MouseLeft": "MouseMultiCursor",
+	// Mouse bindings
+	"MouseWheelUp":   "ScrollUp",
+	"MouseWheelDown": "ScrollDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
+	"Ctrl-MouseLeft": "MouseMultiCursor",
 
-		"Alt-n":        "SpawnMultiCursor",
-		"Alt-m":        "SpawnMultiCursorSelect",
-		"AltShiftUp":   "SpawnMultiCursorUp",
-		"AltShiftDown": "SpawnMultiCursorDown",
-		"Alt-p":        "RemoveMultiCursor",
-		"Alt-c":        "RemoveAllMultiCursors",
-		"Alt-x":        "SkipMultiCursor",
-	}
+	"Alt-n":        "SpawnMultiCursor",
+	"Alt-m":        "SpawnMultiCursorSelect",
+	"AltShiftUp":   "SpawnMultiCursorUp",
+	"AltShiftDown": "SpawnMultiCursorDown",
+	"Alt-p":        "RemoveMultiCursor",
+	"Alt-c":        "RemoveAllMultiCursors",
+	"Alt-x":        "SkipMultiCursor",
+}
+
+var infodefaults = map[string]string{
+	"Up":             "HistoryUp",
+	"Down":           "HistoryDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "StartOfTextToggle",
+	"AltRight":       "EndOfLine",
+	"AltUp":          "CursorStart",
+	"AltDown":        "CursorEnd",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "WordLeft",
+	"CtrlRight":      "WordRight",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Enter":          "ExecuteCommand",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "CommandComplete",
+	"Backtab":        "CycleAutocompleteBack",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-v":         "Paste",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"Delete":         "Delete",
+	"Ctrl-q":         "AbortCommand",
+	"Ctrl-e":         "EndOfLine",
+	"Ctrl-a":         "StartOfLine",
+	"Ctrl-w":         "DeleteWordLeft",
+	"Insert":         "ToggleOverwriteMode",
+	"Ctrl-b":         "WordLeft",
+	"Ctrl-f":         "WordRight",
+	"Ctrl-d":         "DeleteWordLeft",
+	"Ctrl-m":         "ExecuteCommand",
+	"Ctrl-n":         "HistoryDown",
+	"Ctrl-p":         "HistoryUp",
+	"Ctrl-u":         "SelectToStart",
+
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+
+	// Integration with file managers
+	"F10": "AbortCommand",
+	"Esc": "AbortCommand",
+
+	// Mouse bindings
+	"MouseWheelUp":   "HistoryUp",
+	"MouseWheelDown": "HistoryDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
 }

internal/action/events.go

@@ -1,10 +1,17 @@
 package action
 
 import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strings"
+
 	"github.com/zyedidia/tcell"
 )
 
-type Event interface{}
+type Event interface {
+	Name() string
+}
 
 // RawEvent is simply an escape code
 // We allow users to directly bind escape codes
@@ -13,6 +20,10 @@ type RawEvent struct {
 	esc string
 }
 
+func (r RawEvent) Name() string {
+	return r.esc
+}
+
 // KeyEvent is a key event containing a key code,
 // some possible modifiers (alt, ctrl, etc...) and
 // a rune if it was simply a character press
@@ -22,6 +33,63 @@ type KeyEvent struct {
 	code tcell.Key
 	mod  tcell.ModMask
 	r    rune
+	any  bool
+}
+
+func (k KeyEvent) Name() string {
+	if k.any {
+		return "<any>"
+	}
+	s := ""
+	m := []string{}
+	if k.mod&tcell.ModShift != 0 {
+		m = append(m, "Shift")
+	}
+	if k.mod&tcell.ModAlt != 0 {
+		m = append(m, "Alt")
+	}
+	if k.mod&tcell.ModMeta != 0 {
+		m = append(m, "Meta")
+	}
+	if k.mod&tcell.ModCtrl != 0 {
+		m = append(m, "Ctrl")
+	}
+
+	ok := false
+	if s, ok = tcell.KeyNames[k.code]; !ok {
+		if k.code == tcell.KeyRune {
+			s = string(k.r)
+		} else {
+			s = fmt.Sprintf("Key[%d,%d]", k.code, int(k.r))
+		}
+	}
+	if len(m) != 0 {
+		if k.mod&tcell.ModCtrl != 0 && strings.HasPrefix(s, "Ctrl-") {
+			s = s[5:]
+			if len(s) == 1 {
+				s = strings.ToLower(s)
+			}
+		}
+		return fmt.Sprintf("%s-%s", strings.Join(m, "-"), s)
+	}
+	return s
+}
+
+// A KeySequence defines a list of consecutive
+// events. All events in the sequence must be KeyEvents
+// or MouseEvents.
+type KeySequenceEvent struct {
+	keys []Event
+}
+
+func (k KeySequenceEvent) Name() string {
+	buf := bytes.Buffer{}
+	for _, e := range k.keys {
+		buf.WriteByte('<')
+		buf.WriteString(e.Name())
+		buf.WriteByte('>')
+	}
+	return buf.String()
 }
 
 // MouseEvent is a mouse event with a mouse button and
@@ -31,8 +99,54 @@ type MouseEvent struct {
 	mod tcell.ModMask
 }
 
-type KeyAction func(Handler) bool
-type MouseAction func(Handler, tcell.EventMouse) bool
+func (m MouseEvent) Name() string {
+	mod := ""
+	if m.mod&tcell.ModShift != 0 {
+		mod = "Shift-"
+	}
+	if m.mod&tcell.ModAlt != 0 {
+		mod = "Alt-"
+	}
+	if m.mod&tcell.ModMeta != 0 {
+		mod = "Meta-"
+	}
+	if m.mod&tcell.ModCtrl != 0 {
+		mod = "Ctrl-"
+	}
+
+	for k, v := range mouseEvents {
+		if v == m.btn {
+			return fmt.Sprintf("%s%s", mod, k)
+		}
+	}
+	return ""
+}
+
+// ConstructEvent takes a tcell event and returns a micro
+// event. Note that tcell events can't express certain
+// micro events such as key sequences. This function is
+// mostly used for debugging/raw panes or constructing
+// intermediate micro events while parsing a sequence.
+func ConstructEvent(event tcell.Event) (Event, error) {
+	switch e := event.(type) {
+	case *tcell.EventKey:
+		return KeyEvent{
+			code: e.Key(),
+			mod:  e.Modifiers(),
+			r:    e.Rune(),
+		}, nil
+	case *tcell.EventRaw:
+		return RawEvent{
+			esc: e.EscSeq(),
+		}, nil
+	case *tcell.EventMouse:
+		return MouseEvent{
+			btn: e.Buttons(),
+			mod: e.Modifiers(),
+		}, nil
+	}
+	return nil, errors.New("No micro event equivalent")
+}
 
 // A Handler will take a tcell event and execute it
 // appropriately

internal/action/infocomplete.go

@@ -15,7 +15,7 @@ import (
 // for example with `vsplit filename`.
 
 // CommandComplete autocompletes commands
-func CommandComplete(b *buffer.Buffer) ([]string, []string) {
+func CommandComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	input, argstart := buffer.GetArg(b)
 
@@ -32,11 +32,11 @@ func CommandComplete(b *buffer.Buffer) ([]string, []string) {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
 
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // HelpComplete autocompletes help topics
-func HelpComplete(b *buffer.Buffer) ([]string, []string) {
+func HelpComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	input, argstart := buffer.GetArg(b)
 
@@ -54,7 +54,7 @@ func HelpComplete(b *buffer.Buffer) ([]string, []string) {
 	for i := range suggestions {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // colorschemeComplete tab-completes names of colorschemes.
@@ -87,7 +87,7 @@ func contains(s []string, e string) bool {
 }
 
 // OptionComplete autocompletes options
-func OptionComplete(b *buffer.Buffer) ([]string, []string) {
+func OptionComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	input, argstart := buffer.GetArg(b)
 
@@ -97,22 +97,17 @@ func OptionComplete(b *buffer.Buffer) ([]string, []string) {
 			suggestions = append(suggestions, option)
 		}
 	}
-	// for option := range localSettings {
-	// 	if strings.HasPrefix(option, input) && !contains(suggestions, option) {
-	// 		suggestions = append(suggestions, option)
-	// 	}
-	// }
 
 	sort.Strings(suggestions)
 	completions := make([]string, len(suggestions))
 	for i := range suggestions {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // OptionValueComplete completes values for various options
-func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
+func OptionValueComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)
@@ -128,12 +123,6 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 				break
 			}
 		}
-		// for option := range localSettings {
-		// 	if option == string(args[len(args)-2]) {
-		// 		completeValue = true
-		// 		break
-		// 	}
-		// }
 	}
 	if !completeValue {
 		return OptionComplete(b)
@@ -150,11 +139,6 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 			optionVal = option
 		}
 	}
-	// for k, option := range localSettings {
-	// 	if k == inputOpt {
-	// 		optionVal = option
-	// 	}
-	// }
 
 	switch optionVal.(type) {
 	case bool:
@@ -186,6 +170,16 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 			if strings.HasPrefix("doas", input) {
 				suggestions = append(suggestions, "doas")
 			}
+		case "clipboard":
+			if strings.HasPrefix("external", input) {
+				suggestions = append(suggestions, "external")
+			}
+			if strings.HasPrefix("internal", input) {
+				suggestions = append(suggestions, "internal")
+			}
+			if strings.HasPrefix("terminal", input) {
+				suggestions = append(suggestions, "terminal")
+			}
 		}
 	}
 	sort.Strings(suggestions)
@@ -194,11 +188,11 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 	for i := range suggestions {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // PluginCmdComplete autocompletes the plugin command
-func PluginCmdComplete(b *buffer.Buffer) ([]string, []string) {
+func PluginCmdComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	input, argstart := buffer.GetArg(b)
 
@@ -214,11 +208,11 @@ func PluginCmdComplete(b *buffer.Buffer) ([]string, []string) {
 	for i := range suggestions {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // PluginComplete completes values for the plugin command
-func PluginComplete(b *buffer.Buffer) ([]string, []string) {
+func PluginComplete(b *buffer.Buffer) []buffer.Completion {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)
@@ -250,7 +244,7 @@ func PluginComplete(b *buffer.Buffer) ([]string, []string) {
 	for i := range suggestions {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
-	return completions, suggestions
+	return buffer.ConvertCompletions(completions, suggestions, c)
 }
 
 // PluginNameComplete completes with the names of loaded plugins

internal/action/infopane.go

@@ -2,7 +2,6 @@ package action
 
 import (
 	"bytes"
-	"strings"
 
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/display"
@@ -13,6 +12,47 @@ import (
 
 type InfoKeyAction func(*InfoPane)
 
+var InfoBindings *KeyTree
+var InfoBufBindings *KeyTree
+
+func init() {
+	InfoBindings = NewKeyTree()
+	InfoBufBindings = NewKeyTree()
+}
+
+func InfoMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		infoMapKey(e, action)
+	case MouseEvent:
+		infoMapMouse(e, action)
+	}
+}
+
+func infoMapKey(k Event, action string) {
+	if f, ok := InfoKeyActions[action]; ok {
+		InfoBindings.RegisterKeyBinding(k, InfoKeyActionGeneral(f))
+	} else if f, ok := BufKeyActions[action]; ok {
+		InfoBufBindings.RegisterKeyBinding(k, BufKeyActionGeneral(f))
+	}
+}
+
+func infoMapMouse(k MouseEvent, action string) {
+	// TODO: map mouse
+	if f, ok := BufMouseActions[action]; ok {
+		InfoBufBindings.RegisterMouseBinding(k, BufMouseActionGeneral(f))
+	} else {
+		infoMapKey(k, action)
+	}
+}
+
+func InfoKeyActionGeneral(a InfoKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		a(p.(*InfoPane))
+		return true
+	}
+}
+
 type InfoPane struct {
 	*BufPane
 	*info.InfoBuf
@@ -22,6 +62,7 @@ func NewInfoPane(ib *info.InfoBuf, w display.BWindow, tab *Tab) *InfoPane {
 	ip := new(InfoPane)
 	ip.InfoBuf = ib
 	ip.BufPane = NewBufPane(ib.Buffer, w, tab)
+	ip.BufPane.bindings = InfoBufBindings
 
 	return ip
 }
@@ -76,104 +117,43 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
 
 // DoKeyEvent executes a key event for the command bar, doing any overridden actions
 func (h *InfoPane) DoKeyEvent(e KeyEvent) bool {
-	done := false
-	if action, ok := BufKeyBindings[e]; ok {
-		estr := BufKeyStrings[e]
-		for _, s := range InfoNones {
-			if s == estr {
-				return false
-			}
-		}
-		for s, a := range InfoOverrides {
-			// TODO this is a hack and really we should have support
-			// for having binding overrides for different buffers
-			if strings.HasPrefix(estr, s) {
-				done = true
-				a(h)
-				break
-			}
-		}
-		if !done {
-			done = action(h.BufPane)
+	action, more := InfoBindings.NextEvent(e, nil)
+	if action != nil && !more {
+		action(h)
+		InfoBindings.ResetEvents()
+
+		return true
+	} else if action == nil && !more {
+		InfoBindings.ResetEvents()
+		// return false //TODO:?
+	}
+
+	if !more {
+		action, more = InfoBufBindings.NextEvent(e, nil)
+		if action != nil && !more {
+			done := action(h.BufPane)
+			InfoBufBindings.ResetEvents()
+			return done
+		} else if action == nil && !more {
+			InfoBufBindings.ResetEvents()
 		}
 	}
-	return done
+
+	return more
 }
 
-// InfoNones is a list of actions that should have no effect when executed
-// by an infohandler
-var InfoNones = []string{
-	"Save",
-	"SaveAll",
-	"SaveAs",
-	"Find",
-	"FindNext",
-	"FindPrevious",
-	"Center",
-	"DuplicateLine",
-	"MoveLinesUp",
-	"MoveLinesDown",
-	"OpenFile",
-	"Start",
-	"End",
-	"PageUp",
-	"PageDown",
-	"SelectPageUp",
-	"SelectPageDown",
-	"HalfPageUp",
-	"HalfPageDown",
-	"ToggleHelp",
-	"ToggleKeyMenu",
-	"ToggleDiffGutter",
-	"ToggleRuler",
-	"JumpLine",
-	"ClearStatus",
-	"ShellMode",
-	"CommandMode",
-	"AddTab",
-	"PreviousTab",
-	"NextTab",
-	"NextSplit",
-	"PreviousSplit",
-	"Unsplit",
-	"VSplit",
-	"HSplit",
-	"ToggleMacro",
-	"PlayMacro",
-	"Suspend",
-	"ScrollUp",
-	"ScrollDown",
-	"SpawnMultiCursor",
-	"SpawnMultiCursorSelect",
-	"RemoveMultiCursor",
-	"RemoveAllMultiCursors",
-	"SkipMultiCursor",
-}
-
-// InfoOverrides is the list of actions which have been overridden
-// by the infohandler
-var InfoOverrides = map[string]InfoKeyAction{
-	"CursorUp":      (*InfoPane).CursorUp,
-	"CursorDown":    (*InfoPane).CursorDown,
-	"InsertNewline": (*InfoPane).InsertNewline,
-	"Autocomplete":  (*InfoPane).Autocomplete,
-	"Escape":        (*InfoPane).Escape,
-	"Quit":          (*InfoPane).Quit,
-	"QuitAll":       (*InfoPane).QuitAll,
-}
-
-// CursorUp cycles history up
-func (h *InfoPane) CursorUp() {
+// HistoryUp cycles history up
+func (h *InfoPane) HistoryUp() {
 	h.UpHistory(h.History[h.PromptType])
 }
 
-// CursorDown cycles history down
-func (h *InfoPane) CursorDown() {
+// HistoryDown cycles history down
+func (h *InfoPane) HistoryDown() {
 	h.DownHistory(h.History[h.PromptType])
 }
 
 // Autocomplete begins autocompletion
-func (h *InfoPane) Autocomplete() {
+func (h *InfoPane) CommandComplete() {
 	b := h.Buf
 	if b.HasSuggestions {
 		b.CycleAutocomplete(true)
@@ -201,24 +181,23 @@ func (h *InfoPane) Autocomplete() {
 	}
 }
 
-// InsertNewline completes the prompt
-func (h *InfoPane) InsertNewline() {
+// ExecuteCommand completes the prompt
+func (h *InfoPane) ExecuteCommand() {
 	if !h.HasYN {
 		h.DonePrompt(false)
 	}
 }
 
-// Quit cancels the prompt
-func (h *InfoPane) Quit() {
+// AbortCommand cancels the prompt
+func (h *InfoPane) AbortCommand() {
 	h.DonePrompt(true)
 }
 
-// QuitAll cancels the prompt
-func (h *InfoPane) QuitAll() {
-	h.DonePrompt(true)
-}
-
-// Escape cancels the prompt
-func (h *InfoPane) Escape() {
-	h.DonePrompt(true)
+// InfoKeyActions contains the list of all possible key actions the infopane could execute
+var InfoKeyActions = map[string]InfoKeyAction{
+	"HistoryUp":       (*InfoPane).HistoryUp,
+	"HistoryDown":     (*InfoPane).HistoryDown,
+	"CommandComplete": (*InfoPane).CommandComplete,
+	"ExecuteCommand":  (*InfoPane).ExecuteCommand,
+	"AbortCommand":    (*InfoPane).AbortCommand,
 }

internal/action/keytree.go

@@ -0,0 +1,261 @@
+package action
+
+import (
+	"bytes"
+
+	"github.com/zyedidia/tcell"
+)
+
+type PaneKeyAction func(Pane) bool
+type PaneMouseAction func(Pane, *tcell.EventMouse) bool
+type PaneKeyAnyAction func(Pane, []KeyEvent) bool
+
+// A KeyTreeNode stores a single node in the KeyTree (trie). The
+// children are stored as a map, and any node may store a list of
+// actions (the list will be nil if no actions correspond to a certain
+// node)
+type KeyTreeNode struct {
+	children map[Event]*KeyTreeNode
+
+	// Only one of these actions may be active in the current
+	// mode, and only one will be returned. If multiple actions
+	// are active, it is undefined which one will be the one
+	// returned.
+	actions []TreeAction
+}
+
+func NewKeyTreeNode() *KeyTreeNode {
+	n := new(KeyTreeNode)
+	n.children = make(map[Event]*KeyTreeNode)
+	n.actions = []TreeAction{}
+	return n
+}
+
+// A TreeAction stores an action, and a set of mode constraints for
+// the action to be active.
+type TreeAction struct {
+	// only one of these can be non-nil
+	action PaneKeyAction
+	any    PaneKeyAnyAction
+	mouse  PaneMouseAction
+
+	modes []ModeConstraint
+}
+
+// A KeyTree is a data structure for storing keybindings. It maps
+// key events to actions, and maintains a set of currently enabled
+// modes, which affects the action that is returned for a key event.
+// The tree acts like a Trie for Events to handle sequence events.
+type KeyTree struct {
+	root  *KeyTreeNode
+	modes map[string]bool
+
+	cursor KeyTreeCursor
+}
+
+// A KeyTreeCursor keeps track of the current location within the
+// tree, and stores any information from previous events that may
+// be needed to execute the action (values of wildcard events or
+// mouse events)
+type KeyTreeCursor struct {
+	node *KeyTreeNode
+
+	recordedEvents []Event
+	wildcards      []KeyEvent
+	mouseInfo      *tcell.EventMouse
+}
+
+// MakeClosure uses the information stored in a key tree cursor to construct
+// a PaneKeyAction from a TreeAction (which may have a PaneKeyAction, PaneMouseAction,
+// or AnyAction)
+func (k *KeyTreeCursor) MakeClosure(a TreeAction) PaneKeyAction {
+	if a.action != nil {
+		return a.action
+	} else if a.any != nil {
+		return func(p Pane) bool {
+			return a.any(p, k.wildcards)
+		}
+	} else if a.mouse != nil {
+		return func(p Pane) bool {
+			return a.mouse(p, k.mouseInfo)
+		}
+	}
+
+	return nil
+}
+
+// NewKeyTree allocates and returns an empty key tree
+func NewKeyTree() *KeyTree {
+	root := NewKeyTreeNode()
+	tree := new(KeyTree)
+
+	tree.root = root
+	tree.modes = make(map[string]bool)
+	tree.cursor = KeyTreeCursor{
+		node:      root,
+		wildcards: []KeyEvent{},
+		mouseInfo: nil,
+	}
+
+	return tree
+}
+
+// A ModeConstraint specifies that an action can only be executed
+// while a certain mode is enabled or disabled.
+type ModeConstraint struct {
+	mode     string
+	disabled bool
+}
+
+// RegisterKeyBinding registers a PaneKeyAction with an Event.
+func (k *KeyTree) RegisterKeyBinding(e Event, a PaneKeyAction) {
+	k.registerBinding(e, TreeAction{
+		action: a,
+		any:    nil,
+		mouse:  nil,
+		modes:  nil,
+	})
+}
+
+// RegisterKeyAnyBinding registers a PaneKeyAnyAction with an Event.
+// The event should contain an "any" event.
+func (k *KeyTree) RegisterKeyAnyBinding(e Event, a PaneKeyAnyAction) {
+	k.registerBinding(e, TreeAction{
+		action: nil,
+		any:    a,
+		mouse:  nil,
+		modes:  nil,
+	})
+}
+
+// RegisterMouseBinding registers a PaneMouseAction with an Event.
+// The event should contain a mouse event.
+func (k *KeyTree) RegisterMouseBinding(e Event, a PaneMouseAction) {
+	k.registerBinding(e, TreeAction{
+		action: nil,
+		any:    nil,
+		mouse:  a,
+		modes:  nil,
+	})
+}
+
+func (k *KeyTree) registerBinding(e Event, a TreeAction) {
+	switch ev := e.(type) {
+	case KeyEvent, MouseEvent, RawEvent:
+		newNode, ok := k.root.children[e]
+		if !ok {
+			newNode = NewKeyTreeNode()
+			k.root.children[e] = newNode
+		}
+		// newNode.actions = append(newNode.actions, a)
+		newNode.actions = []TreeAction{a}
+	case KeySequenceEvent:
+		n := k.root
+		for _, key := range ev.keys {
+			newNode, ok := n.children[key]
+			if !ok {
+				newNode = NewKeyTreeNode()
+				n.children[key] = newNode
+			}
+
+			n = newNode
+		}
+		// n.actions = append(n.actions, a)
+		n.actions = []TreeAction{a}
+	}
+}
+
+// NextEvent returns the action for the current sequence where e is the next
+// event. Even if the action was registered as a PaneKeyAnyAction or PaneMouseAction,
+// it will be returned as a PaneKeyAction closure where the appropriate arguments
+// have been provided.
+// If no action is associated with the given Event, or mode constraints are not
+// met for that action, nil is returned.
+// A boolean is returned to indicate if there is a conflict with this action. A
+// conflict occurs when there is an active action for this event but there are
+// bindings associated with further sequences starting with this event. The
+// calling function can decide what to do about the conflict (e.g. use a
+// timeout).
+func (k *KeyTree) NextEvent(e Event, mouse *tcell.EventMouse) (PaneKeyAction, bool) {
+	n := k.cursor.node
+	c, ok := n.children[e]
+
+	if !ok {
+		return nil, false
+	}
+
+	more := len(c.children) > 0
+
+	k.cursor.node = c
+
+	k.cursor.recordedEvents = append(k.cursor.recordedEvents, e)
+
+	switch ev := e.(type) {
+	case KeyEvent:
+		if ev.any {
+			k.cursor.wildcards = append(k.cursor.wildcards, ev)
+		}
+	case MouseEvent:
+		k.cursor.mouseInfo = mouse
+	}
+
+	if len(c.actions) > 0 {
+		// check if actions are active
+		for _, a := range c.actions {
+			active := true
+			for _, mc := range a.modes {
+				// if any mode constraint is not met, the action is not active
+				hasMode := k.modes[mc.mode]
+				if hasMode != mc.disabled {
+					active = false
+				}
+			}
+
+			if active {
+				// the first active action to be found is returned
+				return k.cursor.MakeClosure(a), more
+			}
+		}
+	}
+
+	return nil, more
+}
+
+// ResetEvents sets the current sequence back to the initial value.
+func (k *KeyTree) ResetEvents() {
+	k.cursor.node = k.root
+	k.cursor.wildcards = []KeyEvent{}
+	k.cursor.recordedEvents = []Event{}
+	k.cursor.mouseInfo = nil
+}
+
+// CurrentEventsStr returns the list of recorded events as a string
+func (k *KeyTree) RecordedEventsStr() string {
+	buf := &bytes.Buffer{}
+	for _, e := range k.cursor.recordedEvents {
+		buf.WriteString(e.Name())
+	}
+	return buf.String()
+}
+
+// DeleteBinding removes any currently active actions associated with the
+// given event.
+func (k *KeyTree) DeleteBinding(e Event) {
+
+}
+
+// DeleteAllBindings removes all actions associated with the given event,
+// regardless of whether they are active or not.
+func (k *KeyTree) DeleteAllBindings(e Event) {
+
+}
+
+// SetMode enables or disabled a given mode
+func (k *KeyTree) SetMode(mode string, en bool) {
+	k.modes[mode] = en
+}
+
+// HasMode returns if the given mode is currently active
+func (k *KeyTree) HasMode(mode string) bool {
+	return k.modes[mode]
+}

internal/action/rawpane.go

@@ -36,8 +36,8 @@ func (h *RawPane) HandleEvent(event tcell.Event) {
 
 	h.Buf.Insert(h.Cursor.Loc, reflect.TypeOf(event).String()[7:])
 
-	switch e := event.(type) {
-	case *tcell.EventKey:
+	e, err := ConstructEvent(event)
+	if err == nil {
 		h.Buf.Insert(h.Cursor.Loc, fmt.Sprintf(": %s", e.Name()))
 	}
 

internal/action/tab.go

@@ -175,6 +175,7 @@ func NewTabFromBuffer(x, y, width, height int, b *buffer.Buffer) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
+	t.release = true
 
 	e := NewBufPaneFromBuf(b, t)
 	e.SetID(t.ID())
@@ -187,6 +188,7 @@ func NewTabFromPane(x, y, width, height int, pane Pane) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
+	t.release = true
 	pane.SetTab(t)
 	pane.SetID(t.ID())
 
@@ -220,9 +222,8 @@ func (t *Tab) HandleEvent(event tcell.Event) {
 			}
 
 			if wasReleased {
-				resizeID := t.GetMouseSplitID(buffer.Loc{mx, my})
-				if resizeID != 0 {
-					t.resizing = t.GetNode(uint64(resizeID))
+				t.resizing = t.GetMouseSplitNode(buffer.Loc{mx, my})
+				if t.resizing != nil {
 					return
 				}
 

internal/action/terminal_supported.go

@@ -24,7 +24,10 @@ func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callba
 	}
 
 	t := new(shell.Terminal)
-	t.Start(args, getOutput, wait, callback, userargs)
+	err = t.Start(args, getOutput, wait, callback, userargs)
+	if err != nil {
+		return err
+	}
 
 	h.AddTab()
 	id := MainTab().Panes[0].ID()

internal/action/termpane.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"runtime"
 
-	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
@@ -12,6 +12,41 @@ import (
 	"github.com/zyedidia/terminal"
 )
 
+type TermKeyAction func(*TermPane)
+
+var TermBindings *KeyTree
+
+func init() {
+	TermBindings = NewKeyTree()
+}
+
+func TermKeyActionGeneral(a TermKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		a(p.(*TermPane))
+		return true
+	}
+}
+
+func TermMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		termMapKey(e, action)
+	case MouseEvent:
+		termMapMouse(e, action)
+	}
+}
+
+func termMapKey(k Event, action string) {
+	if f, ok := TermKeyActions[action]; ok {
+		TermBindings.RegisterKeyBinding(k, TermKeyActionGeneral(f))
+	}
+}
+
+func termMapMouse(k MouseEvent, action string) {
+	// TODO: map mouse
+	termMapKey(k, action)
+}
+
 type TermPane struct {
 	*shell.Terminal
 	display.Window
@@ -53,6 +88,7 @@ func (t *TermPane) Tab() *Tab {
 
 func (t *TermPane) Close() {}
 
+// Quit closes this termpane
 func (t *TermPane) Quit() {
 	t.Close()
 	if len(MainTab().Panes) > 1 {
@@ -66,6 +102,7 @@ func (t *TermPane) Quit() {
 	}
 }
 
+// Unsplit removes this split
 func (t *TermPane) Unsplit() {
 	n := MainTab().GetNode(t.id)
 	n.Unsplit()
@@ -81,6 +118,26 @@ func (t *TermPane) Unsplit() {
 // copy-paste
 func (t *TermPane) HandleEvent(event tcell.Event) {
 	if e, ok := event.(*tcell.EventKey); ok {
+		ke := KeyEvent{
+			code: e.Key(),
+			mod:  e.Modifiers(),
+			r:    e.Rune(),
+		}
+		action, more := TermBindings.NextEvent(ke, nil)
+
+		if !more {
+			if action != nil {
+				action(t)
+				TermBindings.ResetEvents()
+				return
+			}
+			TermBindings.ResetEvents()
+		}
+
+		if more {
+			return
+		}
+
 		if t.Status == shell.TTDone {
 			switch e.Key() {
 			case tcell.KeyEscape, tcell.KeyCtrlQ, tcell.KeyEnter:
@@ -90,7 +147,7 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 			}
 		}
 		if e.Key() == tcell.KeyCtrlC && t.HasSelection() {
-			clipboard.WriteAll(t.GetSelection(t.GetView().Width), "clipboard")
+			clipboard.Write(t.GetSelection(t.GetView().Width), clipboard.ClipboardReg)
 			InfoBar.Message("Copied selection to clipboard")
 		} else if t.Status != shell.TTDone {
 			t.WriteString(event.EscSeq())
@@ -134,6 +191,41 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 	}
 }
 
+// Exit closes the termpane
+func (t *TermPane) Exit() {
+	t.Terminal.Close()
+	t.Quit()
+}
+
+// CommandMode opens the termpane's command mode
+func (t *TermPane) CommandMode() {
+	InfoBar.Prompt("> ", "", "TerminalCommand", nil, func(resp string, canceled bool) {
+		if !canceled {
+			t.HandleCommand(resp)
+		}
+	})
+}
+
+// NextSplit moves to the next split
+func (t *TermPane) NextSplit() {
+	a := t.tab.active
+	if a < len(t.tab.Panes)-1 {
+		a++
+	} else {
+		a = 0
+	}
+
+	t.tab.SetActive(a)
+}
+
+// HandleCommand handles a command for the term pane
 func (t *TermPane) HandleCommand(input string) {
 	InfoBar.Error("Commands are unsupported in term for now")
 }
+
+// TermKeyActions contains the list of all possible key actions the termpane could execute
+var TermKeyActions = map[string]TermKeyAction{
+	"Exit":        (*TermPane).Exit,
+	"CommandMode": (*TermPane).CommandMode,
+	"NextSplit":   (*TermPane).NextSplit,
+}

internal/buffer/autocomplete.go

@@ -7,7 +7,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/zyedidia/micro/v2/internal/lsp"
 	"github.com/zyedidia/micro/v2/internal/util"
+	"go.lsp.dev/protocol"
 )
 
 // A Completer is a function that takes a buffer and returns info
@@ -17,49 +19,61 @@ import (
 // the current cursor location if selected as well as a list of
 // suggestion names which can be displayed in an autocomplete box or
 // other UI element
-type Completer func(*Buffer) ([]string, []string)
-
-func (b *Buffer) GetSuggestions() {
+type Completer func(*Buffer) []Completion
 
+type Completion struct {
+	Edits       []Delta
+	Label       string
+	CommitChars []rune
+	Kind        string
+	Filter      string
+	Detail      string
+	Doc         string
 }
 
 // Autocomplete starts the autocomplete process
 func (b *Buffer) Autocomplete(c Completer) bool {
-	b.Completions, b.Suggestions = c(b)
-	if len(b.Completions) != len(b.Suggestions) || len(b.Completions) == 0 {
+	b.Completions = c(b)
+	if len(b.Completions) == 0 {
 		return false
 	}
-	b.CurSuggestion = -1
+	b.CurCompletion = -1
 	b.CycleAutocomplete(true)
 	return true
 }
 
 // CycleAutocomplete moves to the next suggestion
 func (b *Buffer) CycleAutocomplete(forward bool) {
-	prevSuggestion := b.CurSuggestion
+	prevCompletion := b.CurCompletion
 
 	if forward {
-		b.CurSuggestion++
+		b.CurCompletion++
 	} else {
-		b.CurSuggestion--
+		b.CurCompletion--
 	}
-	if b.CurSuggestion >= len(b.Suggestions) {
-		b.CurSuggestion = 0
-	} else if b.CurSuggestion < 0 {
-		b.CurSuggestion = len(b.Suggestions) - 1
+	if b.CurCompletion >= len(b.Completions) {
+		b.CurCompletion = 0
+	} else if b.CurCompletion < 0 {
+		b.CurCompletion = len(b.Completions) - 1
 	}
 
-	c := b.GetActiveCursor()
-	start := c.Loc
-	end := c.Loc
-	if prevSuggestion < len(b.Suggestions) && prevSuggestion >= 0 {
-		start = end.Move(-util.CharacterCountInString(b.Completions[prevSuggestion]), b)
-	} else {
-		// end = start.Move(1, b)
+	// undo prev completion
+	if prevCompletion != -1 {
+		prev := b.Completions[prevCompletion]
+		for i := 0; i < len(prev.Edits); i++ {
+			if len(prev.Edits[i].Text) != 0 {
+				b.UndoOneEvent()
+			}
+			if !prev.Edits[i].Start.Equal(prev.Edits[i].End) {
+				b.UndoOneEvent()
+			}
+		}
 	}
 
-	b.Replace(start, end, b.Completions[b.CurSuggestion])
-	if len(b.Suggestions) > 1 {
+	// apply current completion
+	comp := b.Completions[b.CurCompletion]
+	b.ApplyDeltas(comp.Edits)
+	if len(b.Completions) > 1 {
 		b.HasSuggestions = true
 	}
 }
@@ -104,7 +118,7 @@ func GetArg(b *Buffer) (string, int) {
 }
 
 // FileComplete autocompletes filenames
-func FileComplete(b *Buffer) ([]string, []string) {
+func FileComplete(b *Buffer) []Completion {
 	c := b.GetActiveCursor()
 	input, argstart := GetArg(b)
 
@@ -123,7 +137,7 @@ func FileComplete(b *Buffer) ([]string, []string) {
 	}
 
 	if err != nil {
-		return nil, nil
+		return nil
 	}
 
 	var suggestions []string
@@ -149,16 +163,16 @@ func FileComplete(b *Buffer) ([]string, []string) {
 		completions[i] = util.SliceEndStr(complete, c.X-argstart)
 	}
 
-	return completions, suggestions
+	return ConvertCompletions(completions, suggestions, c)
 }
 
 // BufferComplete autocompletes based on previous words in the buffer
-func BufferComplete(b *Buffer) ([]string, []string) {
+func BufferComplete(b *Buffer) []Completion {
 	c := b.GetActiveCursor()
 	input, argstart := GetWord(b)
 
 	if argstart == -1 {
-		return []string{}, []string{}
+		return nil
 	}
 
 	inputLen := util.CharacterCount(input)
@@ -201,5 +215,97 @@ func BufferComplete(b *Buffer) ([]string, []string) {
 		completions[i] = util.SliceEndStr(suggestions[i], c.X-argstart)
 	}
 
-	return completions, suggestions
+	return ConvertCompletions(completions, suggestions, c)
+}
+
+func LSPComplete(b *Buffer) []Completion {
+	if !b.HasLSP() {
+		return nil
+	}
+
+	c := b.GetActiveCursor()
+	pos := lsp.Position(c.X, c.Y)
+	items, err := b.Server.Completion(b.AbsPath, pos)
+	if err != nil {
+		return nil
+	}
+
+	completions := make([]Completion, len(items))
+
+	for i, item := range items {
+		completions[i] = Completion{
+			Label:  item.Label,
+			Detail: item.Detail,
+			Kind:   toKindStr(item.Kind),
+			Doc:    getDoc(item.Documentation),
+		}
+
+		if item.TextEdit != nil && len(item.TextEdit.NewText) > 0 {
+			completions[i].Edits = []Delta{Delta{
+				Text:  []byte(item.TextEdit.NewText),
+				Start: toLoc(item.TextEdit.Range.Start),
+				End:   toLoc(item.TextEdit.Range.End),
+			}}
+			// for _, e := range item.AdditionalTextEdits {
+			// 	d := Delta{
+			// 		Text:  []byte(e.NewText),
+			// 		Start: toLoc(e.Range.Start),
+			// 		End:   toLoc(e.Range.End),
+			// 	}
+			// 	completions[i].Edits = append(completions[i].Edits, d)
+			// }
+		} else {
+			var t string
+			if len(item.InsertText) > 0 {
+				t = item.InsertText
+			} else {
+				t = item.Label
+			}
+			_, argstart := GetWord(b)
+			str := util.SliceEnd([]byte(t), c.X-argstart)
+			completions[i].Edits = []Delta{Delta{
+				Text:  str,
+				Start: Loc{c.X, c.Y},
+				End:   Loc{c.X, c.Y},
+			}}
+		}
+	}
+
+	return completions
+}
+
+// ConvertCompletions converts a list of insert text with suggestion labels
+// to an array of completion objects ready for autocompletion
+func ConvertCompletions(completions, suggestions []string, c *Cursor) []Completion {
+	comp := make([]Completion, len(completions))
+
+	for i := 0; i < len(completions); i++ {
+		comp[i] = Completion{
+			Label: suggestions[i],
+		}
+		comp[i].Edits = []Delta{Delta{
+			Text:  []byte(completions[i]),
+			Start: Loc{c.X, c.Y},
+			End:   Loc{c.X, c.Y},
+		}}
+	}
+	return comp
+}
+
+func toKindStr(k protocol.CompletionItemKind) string {
+	s := k.String()
+	return strings.ToLower(string(s[0]))
+}
+
+// returns documentation from a string | MarkupContent item
+func getDoc(documentation interface{}) string {
+	var doc string
+	switch s := documentation.(type) {
+	case string:
+		doc = s
+	case protocol.MarkupContent:
+		doc = s.Value
+	}
+
+	return strings.Split(doc, "\n")[0]
 }

internal/buffer/buffer.go

@@ -10,23 +10,26 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	gopath "path"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	luar "layeh.com/gopher-luar"
-
 	dmp "github.com/sergi/go-diff/diffmatchpatch"
 	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/lsp"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/micro/v2/pkg/highlight"
+	lspt "go.lsp.dev/protocol"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
+	luar "layeh.com/gopher-luar"
 )
 
 const backupTime = 8000
@@ -90,9 +93,8 @@ type SharedBuffer struct {
 	// Settings customized by the user
 	Settings map[string]interface{}
 
-	Suggestions   []string
-	Completions   []string
-	CurSuggestion int
+	Completions   []Completion
+	CurCompletion int
 
 	Messages []*Message
 
@@ -123,6 +125,9 @@ type SharedBuffer struct {
 
 	// Hash of the original buffer -- empty if fastdirty is on
 	origHash [md5.Size]byte
+
+	Server  *lsp.Server
+	version uint64
 }
 
 func (b *SharedBuffer) insert(pos Loc, value []byte) {
@@ -132,12 +137,37 @@ func (b *SharedBuffer) insert(pos Loc, value []byte) {
 
 	inslines := bytes.Count(value, []byte{'\n'})
 	b.MarkModified(pos.Y, pos.Y+inslines)
+
+	b.lspDidChange(pos, pos, string(value))
 }
 func (b *SharedBuffer) remove(start, end Loc) []byte {
 	b.isModified = true
 	b.HasSuggestions = false
 	defer b.MarkModified(start.Y, end.Y)
-	return b.LineArray.remove(start, end)
+	sub := b.LineArray.remove(start, end)
+	b.lspDidChange(start, end, "")
+	return sub
+}
+
+func (b *SharedBuffer) lspDidChange(start, end Loc, text string) {
+	b.version++
+	// TODO: convert to UTF16 codepoints
+	change := lspt.TextDocumentContentChangeEvent{
+		Range: &lspt.Range{
+			Start: lsp.Position(start.X, start.Y),
+			End:   lsp.Position(end.X, end.Y),
+		},
+		Text: text,
+	}
+
+	if b.HasLSP() {
+		b.Server.DidChange(b.AbsPath, b.version, []lspt.TextDocumentContentChangeEvent{change})
+	}
+}
+
+// HasLSP returns whether this buffer is communicating with an LSP server
+func (b *SharedBuffer) HasLSP() bool {
+	return b.Server != nil && b.Server.Active
 }
 
 // MarkModified marks the buffer as modified for this frame
@@ -369,9 +399,40 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 
 	OpenBuffers = append(OpenBuffers, b)
 
+	if !found {
+		if btype == BTDefault && b.Settings["lsp"].(bool) {
+			b.lspInit()
+		}
+	}
+
 	return b
 }
 
+// initializes an LSP server if possible, or calls didOpen on an existing
+// LSP server in this workspace
+func (b *Buffer) lspInit() {
+	ft := lsp.Filetype(b.Settings["filetype"].(string))
+	l, ok := lsp.GetLanguage(ft)
+	if ok && l.Installed() {
+		b.Server = lsp.GetServer(l, gopath.Dir(b.AbsPath))
+		if b.Server == nil {
+			var err error
+			b.Server, err = lsp.StartServer(l)
+			if err == nil {
+				d, _ := os.Getwd()
+				b.Server.Initialize(d)
+			}
+		}
+		if b.HasLSP() {
+			bytes := b.Bytes()
+			if len(bytes) == 0 {
+				bytes = []byte{'\n'}
+			}
+			b.Server.DidOpen(b.AbsPath, ft, string(bytes), b.version)
+		}
+	}
+}
+
 // Close removes this buffer from the list of open buffers
 func (b *Buffer) Close() {
 	for i, buf := range OpenBuffers {
@@ -396,6 +457,10 @@ func (b *Buffer) Fini() {
 	if b.Type == BTStdout {
 		fmt.Fprint(util.Stdout, string(b.Bytes()))
 	}
+
+	if b.HasLSP() {
+		b.Server.DidClose(b.AbsPath)
+	}
 }
 
 // GetName returns the name that should be displayed in the statusline
@@ -427,6 +492,7 @@ func (b *Buffer) Insert(start Loc, text string) {
 		b.EventHandler.Insert(start, text)
 
 		b.RequestBackup()
+		b.RelocateCursors()
 	}
 }
 
@@ -438,6 +504,68 @@ func (b *Buffer) Remove(start, end Loc) {
 		b.EventHandler.Remove(start, end)
 
 		b.RequestBackup()
+		b.RelocateCursors()
+	}
+}
+
+// ApplyEdit performs a LSP text edit on the buffer
+func (b *Buffer) ApplyEdit(e lspt.TextEdit) {
+	if len(e.NewText) == 0 {
+		// deletion
+		b.Remove(toLoc(e.Range.Start), toLoc(e.Range.End))
+	} else {
+		// insert/replace
+		b.Replace(toLoc(e.Range.Start), toLoc(e.Range.End), e.NewText)
+	}
+}
+
+func (b *Buffer) ApplyEdits(edits []lspt.TextEdit) {
+	if !b.Type.Readonly {
+		locs := make([]struct {
+			t          string
+			start, end Loc
+		}, len(edits))
+		for i, e := range edits {
+			locs[i] = struct {
+				t          string
+				start, end Loc
+			}{
+				t:     e.NewText,
+				start: toLoc(e.Range.Start),
+				end:   toLoc(e.Range.End),
+			}
+		}
+		// Since edit ranges are guaranteed by LSP to never overlap we can sort
+		// by last edit first and apply each edit in order
+		// Perhaps in the future we should make this more robust to a non-conforming
+		// server that sends overlapping ranges
+		sort.Slice(locs, func(i, j int) bool {
+			return locs[i].start.GreaterThan(locs[j].start)
+		})
+		for _, d := range locs {
+			if len(d.t) == 0 {
+				b.Remove(d.start, d.end)
+			} else {
+				b.Replace(d.start, d.end, d.t)
+			}
+		}
+		b.RelocateCursors()
+	}
+}
+
+func (b *Buffer) ApplyDeltas(deltas []Delta) {
+	if !b.Type.Readonly {
+		sort.Slice(deltas, func(i, j int) bool {
+			return deltas[i].Start.GreaterThan(deltas[j].Start)
+		})
+		for _, d := range deltas {
+			if len(d.Text) == 0 {
+				b.Remove(d.Start, d.End)
+			} else {
+				b.ReplaceBytes(d.Start, d.End, d.Text)
+			}
+		}
+		b.RelocateCursors()
 	}
 }
 

internal/buffer/cursor.go

@@ -1,7 +1,7 @@
 package buffer
 
 import (
-	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/util"
 )
 
@@ -125,10 +125,10 @@ func (c *Cursor) End() {
 
 // CopySelection copies the user's selection to either "primary"
 // or "clipboard"
-func (c *Cursor) CopySelection(target string) {
+func (c *Cursor) CopySelection(target clipboard.Register) {
 	if c.HasSelection() {
-		if target != "primary" || c.buf.Settings["useprimary"].(bool) {
-			clipboard.WriteAll(string(c.GetSelection()), target)
+		if target != clipboard.PrimaryReg || c.buf.Settings["useprimary"].(bool) {
+			clipboard.WriteMulti(string(c.GetSelection()), target, c.Num, c.buf.NumCursors())
 		}
 	}
 }

internal/buffer/eventhandler.go

@@ -2,6 +2,7 @@ package buffer
 
 import (
 	"bytes"
+	"log"
 	"time"
 
 	dmp "github.com/sergi/go-diff/diffmatchpatch"
@@ -52,6 +53,7 @@ func (eh *EventHandler) DoTextEvent(t *TextEvent, useUndo bool) {
 	}
 
 	if len(t.Deltas) != 1 {
+		log.Println("Multiple deltas not supported")
 		return
 	}
 
@@ -230,6 +232,12 @@ func (eh *EventHandler) Replace(start, end Loc, replace string) {
 	eh.Insert(start, replace)
 }
 
+// ReplaceBytes deletes from start to end and replaces it with the given string
+func (eh *EventHandler) ReplaceBytes(start, end Loc, replace []byte) {
+	eh.Remove(start, end)
+	eh.InsertBytes(start, replace)
+}
+
 // Execute a textevent and add it to the undo stack
 func (eh *EventHandler) Execute(t *TextEvent) {
 	if eh.RedoStack.Len() > 0 {

internal/buffer/loc.go

@@ -2,6 +2,7 @@ package buffer
 
 import (
 	"github.com/zyedidia/micro/v2/internal/util"
+	"go.lsp.dev/protocol"
 )
 
 // Loc stores a location
@@ -47,6 +48,11 @@ func (l Loc) LessEqual(b Loc) bool {
 	return l == b
 }
 
+// Equal returns true if two locs are equal
+func (l Loc) Equal(b Loc) bool {
+	return l.Y == b.Y && l.X == b.X
+}
+
 // The following functions require a buffer to know where newlines are
 
 // Diff returns the distance between two locations
@@ -146,3 +152,10 @@ func clamp(pos Loc, la *LineArray) Loc {
 	}
 	return pos
 }
+
+func toLoc(r protocol.Position) Loc {
+	return Loc{
+		X: int(r.Character),
+		Y: int(r.Line),
+	}
+}

internal/buffer/save.go

@@ -195,5 +195,10 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 	b.AbsPath = absPath
 	b.isModified = false
 	b.UpdateRules()
+
+	if b.HasLSP() {
+		b.Server.DidSave(b.AbsPath)
+	}
+
 	return err
 }

internal/buffer/settings.go

@@ -10,9 +10,11 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
 
 	if option == "fastdirty" {
 		if !nativeValue.(bool) {
-			e := calcHash(b, &b.origHash)
-			if e == ErrFileTooLarge {
-				b.Settings["fastdirty"] = false
+			if !b.Modified() {
+				e := calcHash(b, &b.origHash)
+				if e == ErrFileTooLarge {
+					b.Settings["fastdirty"] = false
+				}
 			}
 		}
 	} else if option == "statusline" {
@@ -37,6 +39,12 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
 		b.isModified = true
 	} else if option == "readonly" && b.Type.Kind == BTDefault.Kind {
 		b.Type.Readonly = nativeValue.(bool)
+	} else if option == "lsp" && b.Type.Kind == BTDefault.Kind {
+		if nativeValue.(bool) && !b.HasLSP() {
+			b.lspInit()
+		} else if b.HasLSP() {
+			b.Server.Shutdown()
+		}
 	}
 
 	return nil

internal/clipboard/clipboard.go

@@ -0,0 +1,151 @@
+package clipboard
+
+import (
+	"errors"
+
+	"github.com/zyedidia/clipboard"
+)
+
+type Method int
+
+const (
+	// External relies on external tools for accessing the clipboard
+	// These include xclip, xsel, wl-clipboard for linux, pbcopy/pbpaste on Mac,
+	// and Syscalls on Windows.
+	External Method = iota
+	// Terminal uses the terminal to manage the clipboard via OSC 52. Many
+	// terminals do not support OSC 52, in which case this method won't work.
+	Terminal
+	// Internal just manages the clipboard with an internal buffer and doesn't
+	// attempt to interface with the system clipboard
+	Internal
+)
+
+// CurrentMethod is the method used to store clipboard information
+var CurrentMethod Method = Internal
+
+// A Register is a buffer used to store text. The system clipboard has the 'clipboard'
+// and 'primary' (linux-only) registers, but other registers may be used internal to micro.
+type Register int
+
+const (
+	// ClipboardReg is the main system clipboard
+	ClipboardReg Register = -1
+	// PrimaryReg is the system primary clipboard (linux only)
+	PrimaryReg = -2
+)
+
+// Initialize attempts to initialize the clipboard using the given method
+func Initialize(m Method) error {
+	var err error
+	switch m {
+	case External:
+		err = clipboard.Initialize()
+	}
+	return err
+}
+
+// SetMethod changes the clipboard access method
+func SetMethod(m string) Method {
+	switch m {
+	case "internal":
+		CurrentMethod = Internal
+	case "external":
+		CurrentMethod = External
+	case "terminal":
+		CurrentMethod = Terminal
+	}
+	return CurrentMethod
+}
+
+// Read reads from a clipboard register
+func Read(r Register) (string, error) {
+	return read(r, CurrentMethod)
+}
+
+// Write writes text to a clipboard register
+func Write(text string, r Register) error {
+	return write(text, r, CurrentMethod)
+}
+
+// ReadMulti reads text from a clipboard register for a certain multi-cursor
+func ReadMulti(r Register, num, ncursors int) (string, error) {
+	clip, err := Read(r)
+	if err != nil {
+		return "", err
+	}
+	if ValidMulti(r, clip, ncursors) {
+		return multi.getText(r, num), nil
+	}
+	return clip, nil
+}
+
+// WriteMulti writes text to a clipboard register for a certain multi-cursor
+func WriteMulti(text string, r Register, num int, ncursors int) error {
+	return writeMulti(text, r, num, ncursors, CurrentMethod)
+}
+
+// ValidMulti checks if the internal multi-clipboard is valid and up-to-date
+// with the system clipboard
+func ValidMulti(r Register, clip string, ncursors int) bool {
+	return multi.isValid(r, clip, ncursors)
+}
+
+func writeMulti(text string, r Register, num int, ncursors int, m Method) error {
+	multi.writeText(text, r, num, ncursors)
+	return write(multi.getAllText(r), r, m)
+}
+
+func read(r Register, m Method) (string, error) {
+	switch m {
+	case External:
+		switch r {
+		case ClipboardReg:
+			return clipboard.ReadAll("clipboard")
+		case PrimaryReg:
+			return clipboard.ReadAll("primary")
+		default:
+			return internal.read(r), nil
+		}
+	case Internal:
+		return internal.read(r), nil
+	case Terminal:
+		switch r {
+		case ClipboardReg:
+			// terminal paste works by sending an esc sequence to the
+			// terminal to trigger a paste event
+			return terminal.read("clipboard")
+		case PrimaryReg:
+			return terminal.read("primary")
+		default:
+			return internal.read(r), nil
+		}
+	}
+	return "", errors.New("Invalid clipboard method")
+}
+
+func write(text string, r Register, m Method) error {
+	switch m {
+	case External:
+		switch r {
+		case ClipboardReg:
+			return clipboard.WriteAll(text, "clipboard")
+		case PrimaryReg:
+			return clipboard.WriteAll(text, "primary")
+		default:
+			internal.write(text, r)
+		}
+	case Internal:
+		internal.write(text, r)
+	case Terminal:
+		switch r {
+		case ClipboardReg:
+			return terminal.write(text, "c")
+		case PrimaryReg:
+			return terminal.write(text, "p")
+		default:
+			internal.write(text, r)
+		}
+	}
+	return nil
+}

internal/clipboard/internal.go

@@ -0,0 +1,17 @@
+package clipboard
+
+type internalClipboard map[Register]string
+
+var internal internalClipboard
+
+func init() {
+	internal = make(internalClipboard)
+}
+
+func (c internalClipboard) read(r Register) string {
+	return c[r]
+}
+
+func (c internalClipboard) write(text string, r Register) {
+	c[r] = text
+}

internal/clipboard/multi.go

@@ -0,0 +1,63 @@
+package clipboard
+
+import (
+	"bytes"
+)
+
+// For storing multi cursor clipboard contents
+type multiClipboard map[Register][]string
+
+var multi multiClipboard
+
+func (c multiClipboard) getAllText(r Register) string {
+	content := c[r]
+	if content == nil {
+		return ""
+	}
+
+	buf := &bytes.Buffer{}
+	for _, s := range content {
+		buf.WriteString(s)
+	}
+	return buf.String()
+}
+
+func (c multiClipboard) getText(r Register, num int) string {
+	content := c[r]
+	if content == nil || len(content) <= num {
+		return ""
+	}
+
+	return content[num]
+}
+
+// isValid checks if the text stored in this multi-clipboard is the same as the
+// text stored in the system clipboard (provided as an argument), and therefore
+// if it is safe to use the multi-clipboard for pasting instead of the system
+// clipboard.
+func (c multiClipboard) isValid(r Register, clipboard string, ncursors int) bool {
+	content := c[r]
+	if content == nil || len(content) != ncursors {
+		return false
+	}
+
+	return clipboard == c.getAllText(r)
+}
+
+func (c multiClipboard) writeText(text string, r Register, num int, ncursors int) {
+	content := c[r]
+	if content == nil || len(content) != ncursors {
+		content = make([]string, ncursors, ncursors)
+		c[r] = content
+	}
+
+	if num >= ncursors {
+		return
+	}
+
+	content[num] = text
+}
+
+func init() {
+	multi = make(multiClipboard)
+}

internal/clipboard/terminal.go

@@ -0,0 +1,33 @@
+package clipboard
+
+import (
+	"errors"
+	"time"
+
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/tcell"
+)
+
+type terminalClipboard struct{}
+
+var terminal terminalClipboard
+
+func (t terminalClipboard) read(reg string) (string, error) {
+	screen.Screen.GetClipboard(reg)
+	// wait at most 200ms for response
+	for {
+		select {
+		case event := <-screen.Events:
+			e, ok := event.(*tcell.EventPaste)
+			if ok {
+				return e.Text(), nil
+			}
+		case <-time.After(200 * time.Millisecond):
+			return "", errors.New("No clipboard received from terminal")
+		}
+	}
+}
+
+func (t terminalClipboard) write(text, reg string) error {
+	return screen.Screen.SetClipboard(text, reg)
+}

internal/config/colorscheme.go

@@ -117,16 +117,12 @@ func ParseColorscheme(text string) (map[string]tcell.Style, error) {
 
 // StringToStyle returns a style from a string
 // The strings must be in the format "extra foregroundcolor,backgroundcolor"
-// The 'extra' can be bold, reverse, or underline
+// The 'extra' can be bold, reverse, italic or underline
 func StringToStyle(str string) tcell.Style {
 	var fg, bg string
 	spaceSplit := strings.Split(str, " ")
 	var split []string
-	if len(spaceSplit) > 1 {
-		split = strings.Split(spaceSplit[1], ",")
-	} else {
-		split = strings.Split(str, ",")
-	}
+	split = strings.Split(spaceSplit[len(spaceSplit)-1], ",")
 	if len(split) > 1 {
 		fg, bg = split[0], split[1]
 	} else {

internal/config/colorscheme_test.go

@@ -26,6 +26,18 @@ func TestAttributeStringToStyle(t *testing.T) {
 	assert.NotEqual(t, 0, attr&tcell.AttrBold)
 }
 
+func TestMultiAttributesStringToStyle(t *testing.T) {
+	s := StringToStyle("bold italic underline cyan,brightcyan")
+
+	fg, bg, attr := s.Decompose()
+
+	assert.Equal(t, tcell.ColorTeal, fg)
+	assert.Equal(t, tcell.ColorAqua, bg)
+	assert.NotEqual(t, 0, attr&tcell.AttrBold)
+	assert.NotEqual(t, 0, attr&tcell.AttrItalic)
+	assert.NotEqual(t, 0, attr&tcell.AttrUnderline)
+}
+
 func TestColor256StringToStyle(t *testing.T) {
 	s := StringToStyle("128,60")
 

internal/config/globals.go

@@ -5,3 +5,7 @@ const (
 )
 
 var Bindings map[string]string
+
+func init() {
+	Bindings = make(map[string]string)
+}

internal/config/plugin_installer.go

@@ -607,7 +607,7 @@ func UpdatePlugins(out io.Writer, plugins []string) {
 	// if no plugins are specified, update all installed plugins.
 	if len(plugins) == 0 {
 		for _, p := range Plugins {
-			if !p.IsEnabled() {
+			if !p.IsEnabled() || p.Default {
 				continue
 			}
 			plugins = append(plugins, p.Name)

internal/config/settings.go

@@ -43,6 +43,7 @@ func init() {
 // Options with validators
 var optionValidators = map[string]optionValidator{
 	"autosave":     validateNonNegativeValue,
+	"clipboard":    validateClipboard,
 	"tabsize":      validatePositiveValue,
 	"scrollmargin": validateNonNegativeValue,
 	"scrollspeed":  validateNonNegativeValue,
@@ -271,6 +272,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"ignorecase":     false,
 	"indentchar":     " ",
 	"keepautoindent": false,
+	"lsp":            true,
 	"matchbrace":     true,
 	"mkparents":      false,
 	"permbackup":     false,
@@ -322,6 +324,7 @@ func DefaultCommonSettings() map[string]interface{} {
 // default values
 var DefaultGlobalOnlySettings = map[string]interface{}{
 	"autosave":       float64(0),
+	"clipboard":      "external",
 	"colorscheme":    "default",
 	"divchars":       "|-",
 	"divreverse":     true,
@@ -450,6 +453,22 @@ func validateColorscheme(option string, value interface{}) error {
 	return nil
 }
 
+func validateClipboard(option string, value interface{}) error {
+	val, ok := value.(string)
+
+	if !ok {
+		return errors.New("Expected string type for clipboard")
+	}
+
+	switch val {
+	case "internal", "external", "terminal":
+	default:
+		return errors.New(option + " must be 'internal', 'external', or 'terminal'")
+	}
+
+	return nil
+}
+
 func validateLineEnding(option string, value interface{}) error {
 	endingType, ok := value.(string)
 

internal/display/bufwindow.go

@@ -17,7 +17,8 @@ type BufWindow struct {
 	*View
 
 	// Buffer being shown in this window
-	Buf *buffer.Buffer
+	Buf         *buffer.Buffer
+	completeBox buffer.Loc
 
 	active bool
 
@@ -583,6 +584,13 @@ func (w *BufWindow) displayBuffer() {
 
 				screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, combc, style)
 
+				if w.Buf.HasSuggestions && len(w.Buf.Completions) > 0 {
+					compl := w.Buf.Completions[0].Edits[0].Start
+					if bloc.X == compl.X && bloc.Y == compl.Y {
+						w.completeBox = buffer.Loc{w.X + vloc.X, w.Y + vloc.Y}
+					}
+				}
+
 				if showcursor {
 					for _, c := range cursors {
 						if c.X == bloc.X && c.Y == bloc.Y && !c.HasSelection() {
@@ -742,9 +750,60 @@ func (w *BufWindow) displayScrollBar() {
 	}
 }
 
+func (w *BufWindow) displayCompleteBox() {
+	if !w.Buf.HasSuggestions || w.Buf.NumCursors() > 1 {
+		return
+	}
+
+	labelw := 0
+	detailw := 0
+	kindw := 0
+	for _, comp := range w.Buf.Completions {
+		charcount := util.CharacterCountInString(comp.Label)
+		if charcount > labelw {
+			labelw = charcount
+		}
+		charcount = util.CharacterCountInString(comp.Detail)
+		if charcount > detailw {
+			detailw = charcount
+		}
+		charcount = util.CharacterCountInString(comp.Kind)
+		if charcount > kindw {
+			kindw = charcount
+		}
+	}
+	labelw++
+	kindw++
+
+	display := func(s string, width, x, y int, cur bool) {
+		for j := 0; j < width; j++ {
+			r := ' '
+			var combc []rune
+			var size int
+			if len(s) > 0 {
+				r, combc, size = util.DecodeCharacterInString(s)
+				s = s[size:]
+			}
+			st := config.DefStyle.Reverse(true)
+			if cur {
+				st = st.Reverse(false)
+			}
+			screen.SetContent(w.completeBox.X+x+j, w.completeBox.Y+y, r, combc, st)
+		}
+	}
+
+	for i, comp := range w.Buf.Completions {
+		cur := i == w.Buf.CurCompletion
+		display(comp.Label+" ", labelw, 0, i+1, cur)
+		display(comp.Kind+" ", kindw, labelw, i+1, cur)
+		display(comp.Detail, detailw, labelw+kindw, i+1, cur)
+	}
+}
+
 // Display displays the buffer and the statusline
 func (w *BufWindow) Display() {
 	w.displayStatusLine()
 	w.displayScrollBar()
 	w.displayBuffer()
+	w.displayCompleteBox()
 }

internal/display/infowindow.go

@@ -179,8 +179,8 @@ func (i *InfoWindow) displayKeyMenu() {
 
 func (i *InfoWindow) totalSize() int {
 	sum := 0
-	for _, n := range i.Suggestions {
-		sum += runewidth.StringWidth(n) + 1
+	for _, n := range i.Completions {
+		sum += runewidth.StringWidth(n.Label) + 1
 	}
 	return sum
 }
@@ -189,9 +189,9 @@ func (i *InfoWindow) scrollToSuggestion() {
 	x := 0
 	s := i.totalSize()
 
-	for j, n := range i.Suggestions {
-		c := util.CharacterCountInString(n)
-		if j == i.CurSuggestion {
+	for j, n := range i.Completions {
+		c := util.CharacterCountInString(n.Label)
+		if j == i.CurCompletion {
 			if x+c >= i.hscroll+i.Width {
 				i.hscroll = util.Clamp(x+c+1-i.Width, 0, s-i.Width)
 			} else if x < i.hscroll {
@@ -236,7 +236,7 @@ func (i *InfoWindow) Display() {
 		}
 	}
 
-	if i.HasSuggestions && len(i.Suggestions) > 1 {
+	if i.HasSuggestions && len(i.Completions) > 1 {
 		i.scrollToSuggestion()
 
 		x := -i.hscroll
@@ -273,12 +273,12 @@ func (i *InfoWindow) Display() {
 			}
 		}
 
-		for j, s := range i.Suggestions {
+		for j, s := range i.Completions {
 			style := statusLineStyle
-			if i.CurSuggestion == j {
+			if i.CurCompletion == j {
 				style = style.Reverse(true)
 			}
-			for _, r := range s {
+			for _, r := range s.Label {
 				draw(r, style)
 				// screen.SetContent(x, i.Y-keymenuOffset-1, r, nil, style)
 			}

internal/display/statusline.go

@@ -98,44 +98,6 @@ func (s *StatusLine) Display() {
 	// We'll draw the line at the lowest line in the window
 	y := s.win.Height + s.win.Y - 1
 
-	b := s.win.Buf
-	// autocomplete suggestions (for the buffer, not for the infowindow)
-	if b.HasSuggestions && len(b.Suggestions) > 1 {
-		statusLineStyle := config.DefStyle.Reverse(true)
-		if style, ok := config.Colorscheme["statusline"]; ok {
-			statusLineStyle = style
-		}
-		keymenuOffset := 0
-		if config.GetGlobalOption("keymenu").(bool) {
-			keymenuOffset = len(keydisplay)
-		}
-		x := 0
-		for j, sug := range b.Suggestions {
-			style := statusLineStyle
-			if b.CurSuggestion == j {
-				style = style.Reverse(true)
-			}
-			for _, r := range sug {
-				screen.SetContent(x, y-keymenuOffset, r, nil, style)
-				x++
-				if x >= s.win.Width {
-					return
-				}
-			}
-			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
-			x++
-			if x >= s.win.Width {
-				return
-			}
-		}
-
-		for x < s.win.Width {
-			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
-			x++
-		}
-		return
-	}
-
 	formatter := func(match []byte) []byte {
 		name := match[2 : len(match)-1]
 		if bytes.HasPrefix(name, []byte("opt")) {

internal/display/uiwindow.go

@@ -38,15 +38,14 @@ func (w *UIWindow) drawNode(n *views.Node) {
 	}
 
 	for i, c := range cs {
-		if c.IsLeaf() && c.Kind == views.STVert {
+		if c.Kind == views.STVert {
 			if i != len(cs)-1 {
 				for h := 0; h < c.H; h++ {
 					screen.SetContent(c.X+c.W, c.Y+h, divchar, combc, dividerStyle)
 				}
 			}
-		} else {
-			w.drawNode(c)
 		}
+		w.drawNode(c)
 	}
 }
 
@@ -54,32 +53,32 @@ func (w *UIWindow) Display() {
 	w.drawNode(w.root)
 }
 
-func (w *UIWindow) GetMouseSplitID(vloc buffer.Loc) uint64 {
-	var mouseLoc func(*views.Node) uint64
-	mouseLoc = func(n *views.Node) uint64 {
+func (w *UIWindow) GetMouseSplitNode(vloc buffer.Loc) *views.Node {
+	var mouseLoc func(*views.Node) *views.Node
+	mouseLoc = func(n *views.Node) *views.Node {
 		cs := n.Children()
 		for i, c := range cs {
 			if c.Kind == views.STVert {
 				if i != len(cs)-1 {
 					if vloc.X == c.X+c.W && vloc.Y >= c.Y && vloc.Y < c.Y+c.H {
-						return c.ID()
+						return c
 					}
 				}
 			} else if c.Kind == views.STHoriz {
 				if i != len(cs)-1 {
 					if vloc.Y == c.Y+c.H-1 && vloc.X >= c.X && vloc.X < c.X+c.W {
-						return c.ID()
+						return c
 					}
 				}
 			}
 		}
 		for _, c := range cs {
 			m := mouseLoc(c)
-			if m != 0 {
+			if m != nil {
 				return m
 			}
 		}
-		return 0
+		return nil
 	}
 	return mouseLoc(w.root)
 }

internal/lsp/install.go

@@ -0,0 +1,94 @@
+package lsp
+
+import (
+	"errors"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/zyedidia/micro/v2/internal/config"
+	"gopkg.in/yaml.v2"
+)
+
+var ErrManualInstall = errors.New("Requires manual installation")
+
+type Config struct {
+	Languages map[string]Language `yaml:"language"`
+}
+
+type Language struct {
+	Command string     `yaml:"command"`
+	Args    []string   `yaml:"args"`
+	Install [][]string `yaml:"install"`
+}
+
+var conf *Config
+
+func GetLanguage(lang string) (Language, bool) {
+	if conf != nil {
+		l, ok := conf.Languages[lang]
+		return l, ok
+	}
+	return Language{}, false
+}
+
+func Init() error {
+	var servers []byte
+	var err error
+
+	filename := filepath.Join(config.ConfigDir, "lsp.yaml")
+	if _, e := os.Stat(filename); e == nil {
+		servers, err = ioutil.ReadFile(filename)
+		if err != nil {
+			servers = servers_internal
+		}
+	} else {
+		err = ioutil.WriteFile(filename, servers_internal, 0644)
+		servers = servers_internal
+	}
+
+	conf, err = LoadConfig(servers)
+	return err
+}
+
+func LoadConfig(data []byte) (*Config, error) {
+	var conf Config
+	if err := yaml.Unmarshal(data, &conf); err != nil {
+		return nil, err
+	}
+
+	return &conf, nil
+}
+
+func (l Language) Installed() bool {
+	_, err := exec.LookPath(l.Command)
+	if err != nil {
+		return false
+	}
+
+	return true
+}
+
+func (l Language) DoInstall(w io.Writer) error {
+	if l.Installed() {
+		return nil
+	}
+
+	if len(l.Install) == 0 {
+		return ErrManualInstall
+	}
+
+	for _, c := range l.Install {
+		io.WriteString(w, strings.Join(c, " ")+"\n")
+		cmd := exec.Command(c[0], c[1:]...)
+		err := cmd.Run()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/lsp/languages.go

@@ -0,0 +1,20 @@
+package lsp
+
+// mappings for when micro filetypes don't match LSP language identifiers
+var languages = map[string]string{
+	"batch":           "bat",
+	"c++":             "cpp",
+	"git-rebase-todo": "git-rebase",
+	"html4":           "html",
+	"html5":           "html",
+	"python2":         "python",
+	"shell":           "shellscript",
+	// "tex": "latex",
+}
+
+func Filetype(ft string) string {
+	if l, ok := languages[ft]; ok {
+		return l
+	}
+	return ft
+}

internal/lsp/notifications.go

@@ -0,0 +1,58 @@
+package lsp
+
+import (
+	lsp "go.lsp.dev/protocol"
+	"go.lsp.dev/uri"
+)
+
+func (s *Server) DidOpen(filename, language, text string, version uint64) {
+	doc := lsp.TextDocumentItem{
+		URI:        uri.File(filename),
+		LanguageID: lsp.LanguageIdentifier(language),
+		Version:    float64(version), // not sure why this is a float on go.lsp.dev
+		Text:       text,
+	}
+
+	params := lsp.DidOpenTextDocumentParams{
+		TextDocument: doc,
+	}
+
+	go s.sendNotification(lsp.MethodTextDocumentDidOpen, params)
+}
+
+func (s *Server) DidSave(filename string) {
+	doc := lsp.TextDocumentIdentifier{
+		URI: uri.File(filename),
+	}
+
+	params := lsp.DidSaveTextDocumentParams{
+		TextDocument: doc,
+	}
+	go s.sendNotification(lsp.MethodTextDocumentDidSave, params)
+}
+
+func (s *Server) DidChange(filename string, version uint64, changes []lsp.TextDocumentContentChangeEvent) {
+	doc := lsp.VersionedTextDocumentIdentifier{
+		TextDocumentIdentifier: lsp.TextDocumentIdentifier{
+			URI: uri.File(filename),
+		},
+		Version: &version,
+	}
+
+	params := lsp.DidChangeTextDocumentParams{
+		TextDocument:   doc,
+		ContentChanges: changes,
+	}
+	go s.sendNotification(lsp.MethodTextDocumentDidChange, params)
+}
+
+func (s *Server) DidClose(filename string) {
+	doc := lsp.TextDocumentIdentifier{
+		URI: uri.File(filename),
+	}
+
+	params := lsp.DidCloseTextDocumentParams{
+		TextDocument: doc,
+	}
+	go s.sendNotification(lsp.MethodTextDocumentDidClose, params)
+}

internal/lsp/requests.go

@@ -0,0 +1,198 @@
+package lsp
+
+import (
+	"encoding/json"
+	"errors"
+
+	lsp "go.lsp.dev/protocol"
+	"go.lsp.dev/uri"
+)
+
+var ErrNotSupported = errors.New("Operation not supported by language server")
+
+type RPCCompletion struct {
+	RPCVersion string             `json:"jsonrpc"`
+	ID         int                `json:"id"`
+	Result     lsp.CompletionList `json:"result"`
+}
+
+type RPCCompletionAlternate struct {
+	RPCVersion string               `json:"jsonrpc"`
+	ID         int                  `json:"id"`
+	Result     []lsp.CompletionItem `json:"result"`
+}
+
+type RPCHover struct {
+	RPCVersion string    `json:"jsonrpc"`
+	ID         int       `json:"id"`
+	Result     lsp.Hover `json:"result"`
+}
+
+type RPCFormat struct {
+	RPCVersion string         `json:"jsonrpc"`
+	ID         int            `json:"id"`
+	Result     []lsp.TextEdit `json:"result"`
+}
+
+type hoverAlternate struct {
+	// Contents is the hover's content
+	Contents []interface{} `json:"contents"`
+
+	// Range an optional range is a range inside a text document
+	// that is used to visualize a hover, e.g. by changing the background color.
+	Range lsp.Range `json:"range,omitempty"`
+}
+
+type RPCHoverAlternate struct {
+	RPCVersion string         `json:"jsonrpc"`
+	ID         int            `json:"id"`
+	Result     hoverAlternate `json:"result"`
+}
+
+func Position(x, y int) lsp.Position {
+	return lsp.Position{
+		Line:      float64(y),
+		Character: float64(x),
+	}
+}
+
+func (s *Server) DocumentFormat(filename string, options lsp.FormattingOptions) ([]lsp.TextEdit, error) {
+	if !s.capabilities.DocumentFormattingProvider {
+		return nil, ErrNotSupported
+	}
+	doc := lsp.TextDocumentIdentifier{
+		URI: uri.File(filename),
+	}
+
+	params := lsp.DocumentFormattingParams{
+		Options:      options,
+		TextDocument: doc,
+	}
+
+	resp, err := s.sendRequest(lsp.MethodTextDocumentFormatting, params)
+	if err != nil {
+		return nil, err
+	}
+
+	var r RPCFormat
+	err = json.Unmarshal(resp, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.Result, nil
+}
+
+func (s *Server) DocumentRangeFormat(filename string, r lsp.Range, options lsp.FormattingOptions) ([]lsp.TextEdit, error) {
+	if !s.capabilities.DocumentRangeFormattingProvider {
+		return nil, ErrNotSupported
+	}
+
+	doc := lsp.TextDocumentIdentifier{
+		URI: uri.File(filename),
+	}
+
+	params := lsp.DocumentRangeFormattingParams{
+		Options:      options,
+		Range:        r,
+		TextDocument: doc,
+	}
+
+	resp, err := s.sendRequest(lsp.MethodTextDocumentFormatting, params)
+	if err != nil {
+		return nil, err
+	}
+
+	var rpc RPCFormat
+	err = json.Unmarshal(resp, &rpc)
+	if err != nil {
+		return nil, err
+	}
+
+	return rpc.Result, nil
+}
+
+func (s *Server) Completion(filename string, pos lsp.Position) ([]lsp.CompletionItem, error) {
+	if s.capabilities.CompletionProvider == nil {
+		return nil, ErrNotSupported
+	}
+
+	cc := lsp.CompletionContext{
+		TriggerKind: lsp.Invoked,
+	}
+
+	docpos := lsp.TextDocumentPositionParams{
+		TextDocument: lsp.TextDocumentIdentifier{
+			URI: uri.File(filename),
+		},
+		Position: pos,
+	}
+
+	params := lsp.CompletionParams{
+		TextDocumentPositionParams: docpos,
+		Context:                    &cc,
+	}
+	resp, err := s.sendRequest(lsp.MethodTextDocumentCompletion, params)
+	if err != nil {
+		return nil, err
+	}
+
+	var r RPCCompletion
+	err = json.Unmarshal(resp, &r)
+	if err == nil {
+		return r.Result.Items, nil
+	}
+	var ra RPCCompletionAlternate
+	err = json.Unmarshal(resp, &ra)
+	if err != nil {
+		return nil, err
+	}
+	return ra.Result, nil
+}
+
+func (s *Server) CompletionResolve() {
+
+}
+
+func (s *Server) Hover(filename string, pos lsp.Position) (string, error) {
+	if !s.capabilities.HoverProvider {
+		return "", ErrNotSupported
+	}
+
+	params := lsp.TextDocumentPositionParams{
+		TextDocument: lsp.TextDocumentIdentifier{
+			URI: uri.File(filename),
+		},
+		Position: pos,
+	}
+
+	resp, err := s.sendRequest(lsp.MethodTextDocumentHover, params)
+	if err != nil {
+		return "", err
+	}
+
+	var r RPCHover
+	err = json.Unmarshal(resp, &r)
+	if err == nil {
+		return r.Result.Contents.Value, nil
+	}
+
+	var ra RPCHoverAlternate
+	err = json.Unmarshal(resp, &ra)
+	if err != nil {
+		return "", err
+	}
+
+	for _, c := range ra.Result.Contents {
+		switch t := c.(type) {
+		case string:
+			return t, nil
+		case map[string]interface{}:
+			s, ok := t["value"].(string)
+			if ok {
+				return s, nil
+			}
+		}
+	}
+	return "", nil
+}

internal/lsp/server.go

@@ -0,0 +1,322 @@
+package lsp
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"io"
+	"log"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	lsp "go.lsp.dev/protocol"
+	"go.lsp.dev/uri"
+)
+
+var activeServers map[string]*Server
+var slock sync.Mutex
+
+func init() {
+	activeServers = make(map[string]*Server)
+}
+
+func GetServer(l Language, dir string) *Server {
+	s, ok := activeServers[l.Command+"-"+dir]
+	if ok && s.Active {
+		return s
+	}
+	return nil
+}
+
+func ShutdownAllServers() {
+	for _, s := range activeServers {
+		if s.Active {
+			s.Shutdown()
+		}
+	}
+}
+
+type Server struct {
+	cmd          *exec.Cmd
+	stdin        io.WriteCloser
+	stdout       *bufio.Reader
+	language     *Language
+	capabilities lsp.ServerCapabilities
+	root         string
+	lock         sync.Mutex
+	Active       bool
+	requestID    int
+	responses    map[int]chan ([]byte)
+}
+
+type RPCRequest struct {
+	RPCVersion string      `json:"jsonrpc"`
+	ID         int         `json:"id"`
+	Method     string      `json:"method"`
+	Params     interface{} `json:"params"`
+}
+
+type RPCNotification struct {
+	RPCVersion string      `json:"jsonrpc"`
+	Method     string      `json:"method"`
+	Params     interface{} `json:"params"`
+}
+
+type RPCInit struct {
+	RPCVersion string               `json:"jsonrpc"`
+	ID         int                  `json:"id"`
+	Result     lsp.InitializeResult `json:"result"`
+}
+
+type RPCResult struct {
+	RPCVersion string `json:"jsonrpc"`
+	ID         int    `json:"id,omitempty"`
+	Method     string `json:"method,omitempty"`
+}
+
+func StartServer(l Language) (*Server, error) {
+	s := new(Server)
+
+	c := exec.Command(l.Command, l.Args...)
+
+	c.Stderr = log.Writer()
+
+	stdin, err := c.StdinPipe()
+	if err != nil {
+		log.Println("[micro-lsp]", err)
+		return nil, err
+	}
+
+	stdout, err := c.StdoutPipe()
+	if err != nil {
+		log.Println("[micro-lsp]", err)
+		return nil, err
+	}
+
+	err = c.Start()
+	if err != nil {
+		log.Println("[micro-lsp]", err)
+		return nil, err
+	}
+
+	s.cmd = c
+	s.stdin = stdin
+	s.stdout = bufio.NewReader(stdout)
+	s.language = &l
+	s.responses = make(map[int]chan []byte)
+
+	return s, nil
+}
+
+// Initialize performs the LSP initialization handshake
+// The directory must be an absolute path
+func (s *Server) Initialize(directory string) {
+	params := lsp.InitializeParams{
+		ProcessID: float64(os.Getpid()),
+		RootURI:   uri.File(directory),
+		Capabilities: lsp.ClientCapabilities{
+			Workspace: &lsp.WorkspaceClientCapabilities{
+				WorkspaceEdit: &lsp.WorkspaceClientCapabilitiesWorkspaceEdit{
+					DocumentChanges:    true,
+					ResourceOperations: []string{"create", "rename", "delete"},
+				},
+				ApplyEdit: true,
+			},
+			TextDocument: &lsp.TextDocumentClientCapabilities{
+				Formatting: &lsp.TextDocumentClientCapabilitiesFormatting{
+					DynamicRegistration: false,
+				},
+				Completion: &lsp.TextDocumentClientCapabilitiesCompletion{
+					DynamicRegistration: false,
+					CompletionItem: &lsp.TextDocumentClientCapabilitiesCompletionItem{
+						SnippetSupport:          false,
+						CommitCharactersSupport: false,
+						DocumentationFormat:     []lsp.MarkupKind{lsp.PlainText},
+						DeprecatedSupport:       false,
+						PreselectSupport:        false,
+					},
+					ContextSupport: false,
+				},
+				Hover: &lsp.TextDocumentClientCapabilitiesHover{
+					DynamicRegistration: false,
+					ContentFormat:       []lsp.MarkupKind{lsp.PlainText},
+				},
+			},
+		},
+	}
+
+	activeServers[s.language.Command+"-"+directory] = s
+	s.Active = true
+	s.root = directory
+
+	go s.receive()
+
+	s.lock.Lock()
+	go func() {
+		resp, err := s.sendRequest(lsp.MethodInitialize, params)
+		if err != nil {
+			log.Println("[micro-lsp]", err)
+			s.Active = false
+			s.lock.Unlock()
+			return
+		}
+
+		// todo parse capabilities
+		log.Println("[micro-lsp] <<<", string(resp))
+
+		var r RPCInit
+		json.Unmarshal(resp, &r)
+
+		s.lock.Unlock()
+		err = s.sendNotification(lsp.MethodInitialized, struct{}{})
+		if err != nil {
+			log.Println("[micro-lsp]", err)
+		}
+
+		s.capabilities = r.Result.Capabilities
+	}()
+}
+
+func (s *Server) Shutdown() {
+	s.sendRequest(lsp.MethodShutdown, nil)
+	s.sendNotification(lsp.MethodExit, nil)
+	s.Active = false
+}
+
+func (s *Server) receive() {
+	for s.Active {
+		resp, err := s.receiveMessage()
+		if err == io.EOF {
+			log.Println("Received EOF, shutting down")
+			s.Active = false
+			return
+		}
+		if err != nil {
+			log.Println("[micro-lsp,error]", err)
+			continue
+		}
+		log.Println("[micro-lsp] <<<", string(resp))
+
+		var r RPCResult
+		err = json.Unmarshal(resp, &r)
+		if err != nil {
+			log.Println("[micro-lsp]", err)
+			continue
+		}
+
+		switch r.Method {
+		case lsp.MethodWindowLogMessage:
+			// TODO
+		case lsp.MethodTextDocumentPublishDiagnostics:
+			// TODO
+		case "":
+			// Response
+			if _, ok := s.responses[r.ID]; ok {
+				log.Println("[micro-lsp] Got response for", r.ID)
+				s.responses[r.ID] <- resp
+			}
+		}
+	}
+}
+
+func (s *Server) receiveMessage() ([]byte, error) {
+	n := -1
+	for {
+		b, err := s.stdout.ReadBytes('\n')
+		if err != nil {
+			return nil, err
+		}
+		headerline := strings.TrimSpace(string(b))
+		if len(headerline) == 0 {
+			break
+		}
+		if strings.HasPrefix(headerline, "Content-Length:") {
+			split := strings.Split(headerline, ":")
+			if len(split) <= 1 {
+				break
+			}
+			n, err = strconv.Atoi(strings.TrimSpace(split[1]))
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	if n <= 0 {
+		return []byte{}, nil
+	}
+
+	bytes := make([]byte, n)
+	_, err := io.ReadFull(s.stdout, bytes)
+	if err != nil {
+		log.Println("[micro-lsp]", err)
+	}
+	return bytes, err
+}
+
+func (s *Server) sendNotification(method string, params interface{}) error {
+	m := RPCNotification{
+		RPCVersion: "2.0",
+		Method:     method,
+		Params:     params,
+	}
+
+	s.lock.Lock()
+	go s.sendMessageUnlock(m)
+	return nil
+}
+
+func (s *Server) sendRequest(method string, params interface{}) ([]byte, error) {
+	id := s.requestID
+	s.requestID++
+	r := make(chan []byte)
+	s.responses[id] = r
+
+	m := RPCRequest{
+		RPCVersion: "2.0",
+		ID:         id,
+		Method:     method,
+		Params:     params,
+	}
+
+	err := s.sendMessage(m)
+	if err != nil {
+		return nil, err
+	}
+
+	var bytes []byte
+	select {
+	case bytes = <-r:
+	case <-time.After(5 * time.Second):
+		err = errors.New("Request timed out")
+	}
+	delete(s.responses, id)
+
+	return bytes, err
+}
+
+func (s *Server) sendMessage(m interface{}) error {
+	msg, err := json.Marshal(m)
+	if err != nil {
+		return err
+	}
+
+	log.Println("[micro-lsp] >>>", string(msg))
+
+	// encode header and proper line endings
+	msg = append(msg, '\r', '\n')
+	header := []byte("Content-Length: " + strconv.Itoa(len(msg)) + "\r\n\r\n")
+	msg = append(header, msg...)
+
+	_, err = s.stdin.Write(msg)
+	return err
+}
+
+func (s *Server) sendMessageUnlock(m interface{}) error {
+	defer s.lock.Unlock()
+	return s.sendMessage(m)
+}

internal/lsp/servers_yaml.go

@@ -0,0 +1,67 @@
+package lsp
+
+var servers_internal = []byte(`language:
+  rust:
+    command: rls
+    install: [["rustup", "update"], ["rustup", "component", "add", "rls", "rust-analysis", "rust-src"]]
+  javascript:
+    command: typescript-language-server
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "typescript-language-server"]]
+  typescript:
+    command: typescript-language-server
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "typescript-language-server"]]
+  html:
+    command: html-languageserver
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "vscode-html-languageserver-bin"]]
+  ocaml:
+    command: ocaml-language-server
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "ocaml-language-server"]]
+  python:
+    command: pyls
+    install: [["pip", "install", "python-language-server"]]
+  c:
+    command: clangd
+    args: []
+  cpp:
+    command: clangd
+    args: []
+  haskell:
+    command: hie
+    args: ["--lsp"]
+  go:
+    command: gopls
+    args: ["serve"]
+    install: [["go", "get", "-u", "golang.org/x/tools/gopls"]]
+  dart:
+    command: dart_language_server
+    install: [["pub", "global", "activate", "dart_language_server"]]
+  ruby:
+    command: solargraph
+    args: ["stdio"]
+    install: [["gem", "install", "solargraph"]]
+  css:
+    command: css-languageserver
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "vscode-css-languageserver-bin"]]
+  scss:
+    command: css-languageserver
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "vscode-css-languageserver-bin"]]
+  viml:
+    command: vim-language-server
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "vim-language-server"]]
+  purescript:
+    command: purescript-language-server
+    args: ["--stdio"]
+    install: [["npm", "install", "-g", "purescript-language-server"]]
+  verilog:
+    command: svls
+    install: [["cargo", "install", "svls"]]
+  d:
+    command: serve-d
+`)

internal/lua/lua.go

@@ -15,6 +15,7 @@ import (
 	"regexp"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 	"unicode/utf8"
 
@@ -24,6 +25,7 @@ import (
 )
 
 var L *lua.LState
+var Lock sync.Mutex
 
 // LoadFile loads a lua file
 func LoadFile(module string, file string, data []byte) error {
@@ -565,8 +567,6 @@ func importHumanize() *lua.LTable {
 
 	L.SetField(pkg, "Bytes", luar.New(L, humanize.Bytes))
 	L.SetField(pkg, "Ordinal", luar.New(L, humanize.Ordinal))
-	L.SetField(pkg, "Ftoa", luar.New(L, humanize.Ftoa))
-	L.SetField(pkg, "FtoaWithDigits", luar.New(L, humanize.FtoaWithDigits))
 
 	return pkg
 }

internal/screen/screen.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"os"
 	"sync"
-	"unicode"
 
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
@@ -19,6 +18,9 @@ import (
 // same time too.
 var Screen tcell.Screen
 
+// Events is the channel of tcell events
+var Events chan (tcell.Event)
+
 // The lock is necessary since the screen is polled on a separate thread
 var lock sync.Mutex
 
@@ -98,7 +100,7 @@ func ShowCursor(x, y int) {
 // 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) {
-	if !unicode.IsPrint(mainc) {
+	if !Screen.CanDisplay(mainc, true) {
 		mainc = '<27>'
 	}
 
@@ -157,6 +159,8 @@ func Init() error {
 		return err
 	}
 
+	Screen.SetPaste(config.GetGlobalOption("paste").(bool))
+
 	// restore TERM
 	if config.GetGlobalOption("xterm").(bool) {
 		os.Setenv("TERM", oldTerm)

internal/shell/job.go

@@ -37,6 +37,12 @@ type CallbackFile struct {
 	args     []interface{}
 }
 
+// Job stores the executing command for the job, and the stdin pipe
+type Job struct {
+	*exec.Cmd
+	Stdin io.WriteCloser
+}
+
 func (f *CallbackFile) Write(data []byte) (int, error) {
 	// This is either stderr or stdout
 	// In either case we create a new job function callback and put it in the jobs channel
@@ -47,13 +53,13 @@ func (f *CallbackFile) Write(data []byte) (int, error) {
 
 // JobStart starts a shell command in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
+func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *Job {
 	return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
 }
 
 // JobSpawn starts a process with args in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
+func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *Job {
 	// Set up everything correctly if the functions have been provided
 	proc := exec.Command(cmdName, cmdArgs...)
 	var outbuf bytes.Buffer
@@ -67,6 +73,7 @@ func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(
 	} else {
 		proc.Stderr = &outbuf
 	}
+	stdin, _ := proc.StdinPipe()
 
 	go func() {
 		// Run the process in the background and create the onExit callback
@@ -75,20 +82,15 @@ func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(
 		Jobs <- jobFunc
 	}()
 
-	return proc
+	return &Job{proc, stdin}
 }
 
 // JobStop kills a job
-func JobStop(cmd *exec.Cmd) {
-	cmd.Process.Kill()
+func JobStop(j *Job) {
+	j.Process.Kill()
 }
 
 // JobSend sends the given data into the job's stdin stream
-func JobSend(cmd *exec.Cmd, data string) {
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return
-	}
-
-	stdin.Write([]byte(data))
+func JobSend(j *Job, data string) {
+	j.Stdin.Write([]byte(data))
 }

internal/util/util.go

@@ -46,7 +46,8 @@ func init() {
 		fmt.Println("Invalid version: ", Version, err)
 	}
 
-	if runtime.GOOS == "windows" {
+	_, wt := os.LookupEnv("WT_SESSION")
+	if runtime.GOOS == "windows" && !wt {
 		FakeCursor = true
 	}
 	Stdout = new(bytes.Buffer)
@@ -336,6 +337,10 @@ func GetModTime(path string) (time.Time, error) {
 // EscapePath replaces every path separator in a given path with a %
 func EscapePath(path string) string {
 	path = filepath.ToSlash(path)
+	if runtime.GOOS == "windows" {
+		// ':' is not valid in a path name on Windows but is ok on Unix
+		path = strings.Replace(path, ":", "%", -1)
+	}
 	return strings.Replace(path, "/", "%", -1)
 }
 
@@ -419,7 +424,7 @@ func IsNonAlphaNumeric(c rune) bool {
 }
 
 func IsAutocomplete(c rune) bool {
-	return c == '.' || !IsNonAlphaNumeric(c)
+	return !unicode.IsSpace(c) || !IsNonAlphaNumeric(c)
 }
 
 func ParseSpecial(s string) string {

runtime/help/copypaste.md

@@ -4,8 +4,52 @@ because there are multiple methods. This help document will explain
 the various methods for copying and pasting, how they work,
 and the best methods for doing so over SSH.
 
+# OSC 52 (terminal clipboard)
+
+If possible, setting the `clipboard` option to `terminal` will give
+best results because it will work over SSH and locally. However, there
+is limited support among terminal emulators for the terminal clipboard
+(which uses the OSC 52 protocol to communicate clipboard contents).
+Here is a list of terminal emulators and their status:
+
+* Kitty: supported, but only writing is enabled by default. To enable
+  reading, add `read-primary` and `read-clipboard` to the
+  `clipboard_control` option.
+
+* iTerm2: only copying (writing to clipboard) is supported. Must be enabled in
+  `Preferences->General-> Selection->Applications in terminal may access clipboard`.
+  You can use Command-v to paste.
+
+* `st`: supported.
+
+* `rxvt-unicode`: not natively supported, but there is a Perl extension
+   [here](http://anti.teamidiot.de/static/nei/*/Code/urxvt/).
+
+* `xterm`: supported, but disabled by default. It can be enabled by putting
+   the following in `.Xresources` or `.Xdefaults`:
+   `XTerm*disallowedWindowOps: 20,21,SetXprop`.
+
+* `gnome-terminal`: does not support OSC 52.
+
+**Summary:** If you want copy and paste to work over SSH, then you
+should set `clipboard` to `terminal`, and make sure your terminal
+supports OSC 52.
+
 # Pasting
 
+## Recommendations (TL;DR)
+
+The recommended method of pasting is the following:
+
+* If you are not working over SSH, use the micro keybinding (Ctrl-v
+  by default) to perform pastes. If on Linux, install `xclip` or
+  `xsel` beforehand.
+
+* If you are working over SSH, use the terminal keybinding
+  (Ctrl-Shift-v or Command-v) to perform pastes. If your terminal
+  does not support bracketed paste, when performing a paste first
+  enable the `paste` option, and when finished disable the option.
+
 ## Micro paste events
 
 Micro is an application that runs within the terminal. This means
@@ -56,20 +100,23 @@ machine's clipboard. On the other hand, the terminal keybinding
 for paste will access your local clipboard and send the text over
 the network as a paste event, which is what you want.
 
-## Recommendations
+# Copying
 
-The recommended method of pasting is the following:
+# Recommendations (TL;DR)
 
-* If you are not working over SSH, use the micro keybinding (Ctrl-v
-  by default) to perform pastes. If on Linux, install `xclip` or
-  `xsel` beforehand.
+The recommended method of copying is the following:
+
+* If you are not working over SSH, use the micro keybinding (Ctrl-c by
+  default) to perform copies. If on Linux, install `xclip` or `xsel`
+  beforehand.
 
 * If you are working over SSH, use the terminal keybinding
-  (Ctrl-Shift-v or Command-v) to perform pastes. If your terminal
-  does not support bracketed paste, when performing a paste first
-  enable the `paste` option, and when finished disable the option.
-
-# Copying
+  (Ctrl-Shift-c or Command-c) to perform copies. You must first disable
+  the `mouse` option to perform a terminal selection, and you may wish
+  to disable line numbers and diff indicators (`ruler` and `diffgutter`
+  options) and close other splits. This method will only be able to copy
+  characters that are displayed on the screen (you will not be able to
+  copy more than one page's worth of characters).
 
 Copying follows a similar discussion to the one above about pasting.
 The primary difference is before performing a copy, the application
@@ -92,19 +139,3 @@ means that for copying multiple lines using the terminal selection, you
 should first disable line numbers and diff indicators (turn off the `ruler`
 and `diffgutter` options), otherwise they might be part of your selection
 and copied.
-
-## Recommendations
-
-The recommended method of copying is the following:
-
-* If you are not working over SSH, use the micro keybinding (Ctrl-c by
-  default) to perform copies. If on Linux, install `xclip` or `xsel`
-  beforehand.
-
-* If you are working over SSH, use the terminal keybinding
-  (Ctrl-Shift-c or Command-c) to perform copies. You must first disable
-  the `mouse` option to perform a terminal selection, and you may wish
-  to disable line numbers and diff indicators (`ruler` and `diffgutter`
-  options) and close other splits. This method will only be able to copy
-  characters that are displayed on the screen (you will not be able to
-  copy more than one page's worth of characters).

runtime/help/options.md

@@ -54,6 +54,25 @@ Here are the available options:
 
     default value: `false`
 
+* `clipboard`: specifies how micro should access the system clipboard.
+   Possible values are:
+    * `external`: accesses clipboard via an external tool, such as xclip/xsel
+       or wl-clipboard on Linux, pbcopy/pbpaste on MacOS, and system calls on
+       Windows. On Linux, if you do not have one of the tools installed, or if
+       they are not working, micro will throw an error and use an internal
+       clipboard.
+    * `terminal`: accesses the clipboard via your terminal emulator. Note that
+       there is limited support among terminal emulators for this feature
+       (called OSC 52). Terminals that are known to work are Kitty (enable
+       reading with `clipboard_control` setting), iTerm2 (only copying),
+       st, rxvt-unicode and xterm if enabled (see `> help copypaste` for
+       details). Note that Gnome-terminal does not support this feature. With
+       this setting, copy-paste **will** work over ssh. See `> help copypaste`
+       for details.
+    * `internal`: micro will use an internal clipboard.
+
+    default value: `external`
+
 * `colorcolumn`: if this is not set to 0, it will display a column at the
    specified column. This is useful if you want column 80 to be highlighted
    special for example.
@@ -375,6 +394,84 @@ Any option you set in the editor will be saved to the file
 created for you. If you'd like to take your configuration with you to another
 machine, simply copy the settings.json to the other machine.
 
+## Settings.json file
+
+The settings.json file should go in your configuration directory (by default
+at `~/.config/micro`), and should contain only options which have been modified
+from their default setting. Here is the full list of options in json format,
+so that you can see what the formatting should look like.
+
+```json
+{
+    "autoclose": true,
+    "autoindent": true,
+    "autosave": 0,
+    "autosu": false,
+    "backup": true,
+    "backupdir": "",
+    "basename": false,
+    "clipboard": "external",
+    "colorcolumn": 0,
+    "colorscheme": "default",
+    "comment": true,
+    "cursorline": true,
+    "diff": true,
+    "diffgutter": false,
+    "divchars": "|-",
+    "divreverse": true,
+    "encoding": "utf-8",
+    "eofnewline": true,
+    "fastdirty": false,
+    "fileformat": "unix",
+    "filetype": "unknown",
+    "ftoptions": true,
+    "ignorecase": false,
+    "indentchar": " ",
+    "infobar": true,
+    "initlua": true,
+    "keepautoindent": false,
+    "keymenu": false,
+    "linter": true,
+    "literate": true,
+    "matchbrace": true,
+    "mkparents": false,
+    "mouse": true,
+    "parsecursor": false,
+    "paste": false,
+    "permbackup": false,
+    "pluginchannels": [
+        "https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"
+    ],
+    "pluginrepos": [],
+    "readonly": false,
+    "relativeruler": false,
+    "rmtrailingws": false,
+    "ruler": true,
+    "savecursor": false,
+    "savehistory": true,
+    "saveundo": false,
+    "scrollbar": false,
+    "scrollmargin": 3,
+    "scrollspeed": 2,
+    "smartpaste": true,
+    "softwrap": false,
+    "splitbottom": true,
+    "splitright": true,
+    "status": true,
+    "statusformatl": "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)",
+    "statusformatr": "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help",
+    "statusline": true,
+    "sucmd": "sudo",
+    "syntax": true,
+    "tabmovement": false,
+    "tabsize": 4,
+    "tabstospaces": false,
+    "test": true,
+    "useprimary": true,
+    "xterm": false
+}
+```
+
 ## Global and local settings
 
 You can set these settings either globally or locally. Locally means that the

runtime/help/plugins.md

@@ -43,6 +43,12 @@ are called when certain events happen. Here is the list of callbacks
 which micro defines:
 
 * `init()`: this function should be used for your plugin initialization.
+   This function is called after buffers have been initialized.
+
+* `preinit()`: initialization function called before buffers have been
+   initialized.
+
+* `postinit()`: initialization function called after `init()`.
 
 * `onBufferOpen(buf)`: runs when a buffer is opened. The input contains
    the buffer object.
@@ -364,8 +370,6 @@ The following functions are also available from the go-humanize package:
 The `humanize` package exposes:
 * `Bytes`
 * `Ordinal`
-* `Ftoa`
-* `FtoaWithDigits`
 
 ## Adding help files, syntax files, or colorschemes in your plugin
 

runtime/plugins/comment/comment.lua

@@ -35,6 +35,7 @@ ft["markdown"] = "<!-- %s -->"
 ft["nginx"] = "# %s"
 ft["nim"] = "# %s"
 ft["objc"] = "// %s"
+ft["ocaml"] = "(* %s *)"
 ft["pascal"] = "{ %s }"
 ft["perl"] = "# %s"
 ft["php"] = "// %s"
@@ -69,10 +70,38 @@ function onBufferOpen(buf)
     end
 end
 
+function isCommented(bp, lineN, commentRegex)
+    local line = bp.Buf:Line(lineN)
+    if string.match(line, commentRegex) then
+        return true
+    end
+    return false
+end
+
 function commentLine(bp, lineN)
     local line = bp.Buf:Line(lineN)
     local commentType = bp.Buf.Settings["commenttype"]
-    local commentRegex = "^%s*" .. commentType:gsub("%%","%%%%"):gsub("%$","%$"):gsub("%)","%)"):gsub("%(","%("):gsub("%?","%?"):gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%]", "%]"):gsub("%[", "%["):gsub("%%%%s", "(.*)")
+    local sel = -bp.Cursor.CurSelection
+    local curpos = -bp.Cursor.Loc
+    local index = string.find(commentType, "%%s") - 1
+    local commentedLine = commentType:gsub("%%s", trim(line))
+    bp.Buf:Replace(buffer.Loc(0, lineN), buffer.Loc(#line, lineN), util.GetLeadingWhitespace(line) .. commentedLine)
+    if bp.Cursor:HasSelection() then
+        bp.Cursor.CurSelection[1].Y = sel[1].Y
+        bp.Cursor.CurSelection[2].Y = sel[2].Y
+        bp.Cursor.CurSelection[1].X = sel[1].X
+        bp.Cursor.CurSelection[2].X = sel[2].X
+    else
+        bp.Cursor.X = curpos.X + index
+        bp.Cursor.Y = curpos.Y
+    end
+    bp.Cursor:Relocate()
+    bp.Cursor.LastVisualX = bp.Cursor:GetVisualX()
+end
+
+function uncommentLine(bp, lineN, commentRegex)
+    local line = bp.Buf:Line(lineN)
+    local commentType = bp.Buf.Settings["commenttype"]
     local sel = -bp.Cursor.CurSelection
     local curpos = -bp.Cursor.Loc
     local index = string.find(commentType, "%%s") - 1
@@ -88,46 +117,57 @@ function commentLine(bp, lineN)
             bp.Cursor.X = curpos.X - index
             bp.Cursor.Y = curpos.Y
         end
-    else
-        local commentedLine = commentType:gsub("%%s", trim(line))
-        bp.Buf:Replace(buffer.Loc(0, lineN), buffer.Loc(#line, lineN), util.GetLeadingWhitespace(line) .. commentedLine)
-        if bp.Cursor:HasSelection() then
-            bp.Cursor.CurSelection[1].Y = sel[1].Y
-            bp.Cursor.CurSelection[2].Y = sel[2].Y
-            bp.Cursor.CurSelection[1].X = sel[1].X
-            bp.Cursor.CurSelection[2].X = sel[2].X
-        else
-            bp.Cursor.X = curpos.X + index
-            bp.Cursor.Y = curpos.Y
-        end
     end
     bp.Cursor:Relocate()
     bp.Cursor.LastVisualX = bp.Cursor:GetVisualX()
 end
 
-function commentSelection(bp, startLine, endLine)
+function toggleCommentLine(bp, lineN, commentRegex)
+    if isCommented(bp, lineN, commentRegex) then
+        uncommentLine(bp, lineN, commentRegex)
+    else
+        commentLine(bp, lineN)
+    end
+end
+
+function toggleCommentSelection(bp, startLine, endLine, commentRegex)
+    local allComments = true
     for line = startLine, endLine do
-        commentLine(bp, line)
+        if not isCommented(bp, line, commentRegex) then
+            allComments = false
+            break
+        end
+    end
+
+    for line = startLine, endLine do
+        if allComments then
+            uncommentLine(bp, line, commentRegex)
+        else
+            commentLine(bp, line)
+        end
     end
 end
 
 function comment(bp, args)
+    local commentType = bp.Buf.Settings["commenttype"]
+    local commentRegex = "^%s*" .. commentType:gsub("%%","%%%%"):gsub("%$","%$"):gsub("%)","%)"):gsub("%(","%("):gsub("%?","%?"):gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%]", "%]"):gsub("%[", "%["):gsub("%%%%s", "(.*)"):gsub("%s+", "%s*")
+
     if bp.Cursor:HasSelection() then
         if bp.Cursor.CurSelection[1]:GreaterThan(-bp.Cursor.CurSelection[2]) then
             local endLine = bp.Cursor.CurSelection[1].Y
             if bp.Cursor.CurSelection[1].X == 0 then
                 endLine = endLine - 1
             end
-            commentSelection(bp, bp.Cursor.CurSelection[2].Y, endLine)
+            toggleCommentSelection(bp, bp.Cursor.CurSelection[2].Y, endLine, commentRegex)
         else
             local endLine = bp.Cursor.CurSelection[2].Y
             if bp.Cursor.CurSelection[2].X == 0 then
                 endLine = endLine - 1
             end
-            commentSelection(bp, bp.Cursor.CurSelection[1].Y, endLine)
+            toggleCommentSelection(bp, bp.Cursor.CurSelection[1].Y, endLine, commentRegex)
         end
     else
-        commentLine(bp, bp.Cursor.Y)
+        toggleCommentLine(bp, bp.Cursor.Y, commentRegex)
     end
 end
 

runtime/plugins/linter/help/linter.md

@@ -9,8 +9,10 @@ following filetypes and linters:
 * c++: g++
 * d: dmd
 * go: go build
+* haskell: hlint
 * java: javac
 * javascript: jshint
+* javascript: eslint
 * literate: lit
 * lua: luacheck
 * nim: nim
@@ -19,7 +21,7 @@ following filetypes and linters:
 * python: mypy
 * python: pylint
 * shell: shfmt
-* swift: swiftc
+* swift: swiftc (MacOS and Linux only)
 * yaml: yamllint
 
 If the linter plugin is enabled and the file corresponds to one of
@@ -64,17 +66,17 @@ Below is an example for including a linter for any filetype using
 the `misspell` linter which checks for misspelled words in a file.
 
 ```lua
-local config = import("micro/config")
-
-config.RegisterCommonOption("misspell", true)
-
 function init()
     -- uses the default linter plugin
     -- matches any filetype
-    linter.makeLinter("misspell", "", "misspell", {"%f"}, "%f:%l:%c: %m", {}, false, true, 0, 0, hasMisspell)
-end
-
-function hasMisspell(buf)
-    return buf.Settings["misspell"]
+    linter.makeLinter("misspell", "", "misspell", {"%f"}, "%f:%l:%c: %m", {}, false, true)
+end
+```
+
+Here is an example for a more typical use-case, where the linter will only match one filetype (C in this case):
+
+```lua
+function init()
+    linter.makeLinter("gcc", "c", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
 end
 ```

runtime/plugins/linter/linter.lua

@@ -59,7 +59,7 @@ function removeLinter(name)
     linters[name] = nil
 end
 
-function init()
+function preinit()
     local devnull = "/dev/null"
     if runtime.GOOS == "windows" then
         devnull = "NUL"
@@ -68,6 +68,7 @@ function init()
     makeLinter("gcc", "c", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
     makeLinter("g++", "c++", "gcc", {"-fsyntax-only","-std=c++14", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
     makeLinter("dmd", "d", "dmd", {"-color=off", "-o-", "-w", "-wi", "-c", "%f"}, "%f%(%l%):.+: %m")
+    makeLinter("eslint", "javascript", "eslint", {"-f","compact","%f"}, "%f: line %l, col %c, %m")
     makeLinter("gobuild", "go", "go", {"build", "-o", devnull, "%d"}, "%f:%l:%c:? %m")
     -- makeLinter("golint", "go", "golint", {"%f"}, "%f:%l:%c: %m")
     makeLinter("hlint", "haskell", "hlint", {"%f"}, "%f:%l:%c.-: %m")
@@ -80,9 +81,10 @@ function init()
     makeLinter("pyflakes", "python", "pyflakes", {"%f"}, "%f:%l:.-:? %m")
     makeLinter("mypy", "python", "mypy", {"%f"}, "%f:%l: %m")
     makeLinter("pylint", "python", "pylint", {"--output-format=parseable", "--reports=no", "%f"}, "%f:%l: %m")
+    makeLinter("flake8", "python", "flake8", {"%f"}, "%f:%l:%c: %m")
     makeLinter("shfmt", "shell", "shfmt", {"%f"}, "%f:%l:%c: %m")
     makeLinter("swiftc", "swift", "xcrun", {"swiftc", "%f"}, "%f:%l:%c:.+: %m", {"darwin"}, true)
-    makeLinter("swiftc", "swiftc", {"%f"}, "%f:%l:%c:.+: %m", {"linux"}, true)
+    makeLinter("swiftc", "swift", "swiftc", {"%f"}, "%f:%l:%c:.+: %m", {"linux"}, true)
     makeLinter("yaml", "yaml", "yamllint", {"--format", "parsable", "%f"}, "%f:%l:%c:.+ %m")
 
     config.MakeCommand("lint", function(bp, args)
@@ -166,7 +168,6 @@ function onExit(output, args)
             elseif col == nil then
                 hascol = false
             end
-            micro.Log(basename(buf.Path), basename(file))
             if basename(buf.Path) == basename(file) then
                 local bmsg = nil
                 if hascol then

runtime/plugins/status/status.lua

@@ -13,6 +13,7 @@ function init()
     micro.SetStatusInfoFn("status.lines")
     micro.SetStatusInfoFn("status.bytes")
     micro.SetStatusInfoFn("status.size")
+    micro.SetStatusInfoFn("status.lsp")
     config.AddRuntimeFile("status", config.RTHelp, "help/status.md")
 end
 
@@ -32,6 +33,25 @@ function size(b)
     return humanize.Bytes(b:Size())
 end
 
+function lsp(b)
+    if not b.Settings["lsp"] then
+        return "disabled"
+    end
+    if b:HasLSP() then
+        return "on"
+    end
+
+    local lsp = import("micro/lsp")
+    local l, ok = lsp.GetLanguage(b.Settings["filetype"])
+    if not ok then
+        return "unsupported"
+    end
+    if not l:Installed() then
+        return l.Command .. " not installed"
+    end
+    return "off"
+end
+
 function branch(b)
     if b.Type.Kind ~= buffer.BTInfo then
         local shell = import("micro/shell")

runtime/syntax/c.yaml

@@ -12,9 +12,6 @@ rules:
     - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
     - statement: "\\b(goto|continue|break|return)\\b"
     - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
-    - constant: "'([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'"
-    - constant: "'\\\\(([0-3]?[0-7]{1,2}))'"
-    - constant: "'\\\\x[0-9A-Fa-f]{1,2}'"
       # GCC builtins
     - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)"
     - statement: "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
@@ -29,15 +26,15 @@ rules:
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - constant.string:
         start: "'"
         end: "'"
         skip: "\\\\."
         rules:
-            - preproc: "..+"
-            - constant.specialChar: "\\\\."
+            - error: "..+"
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - comment:
         start: "//"

runtime/syntax/cpp.yaml

@@ -4,8 +4,7 @@ detect:
     filename: "(\\.c(c|pp|xx)$|\\.h(h|pp|xx)$|\\.ii?$|\\.(def)$)"
 
 rules:
-
-    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b" 
+    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b"
     - type: "\\b(auto|float|double|bool|char|int|short|long|sizeof|enum|void|static|const|constexpr|struct|union|typedef|extern|(un)?signed|inline)\\b"
     - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
     - statement: "\\b(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\\b"
@@ -13,13 +12,12 @@ rules:
     - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
     - statement: "\\b(goto|continue|break|return)\\b"
     - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
-    - constant: "('([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'|'\\\\(([0-3]?[0-7]{1,2}))'|'\\\\x[0-9A-Fa-f]{1,2}')"
 
       # GCC builtins
     - statement: "(__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__)"
 
       # Operator Color
-    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)"
       # Parenthetical Color
     - symbol.brackets: "[(){}]|\\[|\\]"
 
@@ -31,15 +29,15 @@ rules:
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - constant.string:
         start: "'"
         end: "'"
         skip: "\\\\."
         rules:
-            - preproc: "..+"
-            - constant.specialChar: "\\\\."
+            - error: "..+"
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - comment:
         start: "//"

runtime/syntax/haskell.yaml

@@ -5,9 +5,7 @@ detect:
 
 rules:
     # Keywords
-    - statement: "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
-    - statement: "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
-    - statement: "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+    - statement: "\\b(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)\\b"
 
       # Various symbols
     - symbol: "(\\||@|!|:|_|~|=|\\\\|;|\\(\\)|,|\\[|\\]|\\{|\\})"

runtime/syntax/julia.yaml

@@ -33,11 +33,16 @@ rules:
         rules: []
 
     - constant.string:
-        start: "'''"
-        end: "'''"
+        start: "\"[^\"]|\"$"
+        end: "\""
         rules: []
 
     - comment:
-        start: "#"
+        start: "#[^=]|#$"
         end: "$"
         rules: []
+
+    - comment:
+        start: "#="
+        end: "=#"
+        rules: []

runtime/syntax/php.yaml

@@ -12,7 +12,6 @@ rules:
     - special: "&[^;[[:space:]]]*;"
     - symbol: "[:=]"
     - identifier: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
-    - constant.string: "\"[^\"]*\""
     - constant.number: "(?i)#[0-9A-F]{6,6}"
     - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
     - comment: "<!--.+?-->"
@@ -33,8 +32,12 @@ rules:
     - symbol.operator: "(=>|===|!==|==|!=|&&|\\|\\||::|=|->|\\!)"
     - identifier.var: "(\\$[a-zA-Z0-9\\-_]+)"
     - symbol.operator: "[\\(|\\)|/|+|\\-|\\*|\\[|.|,|;]"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
-    - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
     - symbol.brackets: "(\\[|\\]|\\{|\\}|[()])"
     - comment: "(^|[[:space:]])//.*"
     - comment: "(^|[[:space:]])#.*"

runtime/syntax/renpy.yaml

@@ -0,0 +1,15 @@
+filetype: renpy
+
+detect:
+    filename: "\\.rpy$"
+
+rules:
+    # Script language keywords.
+    - statement: "\\b(python|init|early|define|default|label|call|jump|image|layeredimage|screen|style|transform|menu|show|hide|scene|at|with|zorder|behind|pause|play|stop|fadeout|fadein|queue)\\b"
+    # ATL keywords.
+    - type: "\\b(repeat|block|choice|parallel|(x|y|)(pos|offset|anchor|align|center|tile|zoom)|time|linear|easein|alpha|subpixel)\\b"
+    - identifier: "\\bpersistent\\b"
+    - special: "\\$ "
+    # Tab characters are not allowed in Renpy scripts.
+    - error: "\\t"
+    - include: python

runtime/syntax/rust.yaml

@@ -7,15 +7,19 @@ rules:
     # function definition
     - identifier: "fn [a-z0-9_]+"
       # Reserved words
-    - statement: "\\b(abstract|alignof|as|become|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\\b"
+    - statement: "\\b(abstract|alignof|as|become|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\\b"
       # macros
     - special: "[a-z_]+!"
       # Constants
-    - constant: "[A-Z][A-Z_]+"
+    - constant: "\\b[A-Z][A-Z_0-9]+\\b"
       # Numbers
     - constant.number: "\\b[0-9]+\\b"
+      # Booleans
+    - constant: "\\b(true|false)\\b"
       # Traits/Enums/Structs/Types/etc.
-    - type: "[A-Z][a-z]+"
+    - type: "\\b[A-Z]+[a-zA-Z_0-9]*[a-z]+[a-zA-Z_0-9]*\\b"
+      # Builtin types that start with lowercase.
+    - type: "\\b(bool|str|isize|usize|((i|u)(8|16|32|64))|f32|f64)\\b"
 
     - constant.string:
         start: "\""

runtime/syntax/zig.yaml

@@ -4,34 +4,50 @@ detect:
     filename: "\\.zig$"
 
 rules:
-    # function definition
-    - identifier: "fn [a-z0-9_]+"
       # Reserved words
-    - statement: "\\b(align|and|allowzero|anyerror|asm|async|await|break|cancel|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|false|fn|for|if|inline|nakedcc|noalias|null|or|orelse|packed|promise|pub|resume|return|linksection|stdcallcc|struct|suspend|switch|test|threadlocal|true|try|undefined|union|unreachable|use|var|volatile|while)\\b"
+    - statement: "\\b(align|allowzero|and|asm|async|await|break|callconv|catch|comptime|const|continue|defer|else|errdefer|error|export|extern|fn|for|if|inline|noalias|noinline|nosuspend|or|orelse|packed|pub|resume|return|linksection|suspend|switch|test|threadlocal|try|unreachable|usingnamespace|var|volatile|while)\\b"
       # builtin functions
-    - special: "@+[a-z_]+"
-      # Constants
-    - constant: "[A-Z][A-Z_]+([0-9]+)?"
-      # Numbers (hexadecimal + decimal)
-    - constant.number: "\\b(0x[A-F0-9]+|[0-9]+)\\b"
-      # Primitive Types / Derived Data Types
-    - type: "\\b([A-Z][a-z]+|(i8|u8|i16|u16|i32|u32|i64|u64|i128|u128|isize|usize|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void|f16|f32|f64|f128|bool|void|noreturn|type|anyerror|comptime_int|comptime_float))\\b"
+    - special: "@[a-zA-Z_]+"
+      # Primitive Types
+    - type: "\\b(anyframe|anytype|anyerror|bool|comptime_int|comptime_float|enum|f(16|32|64|128)|isize|noreturn|struct|type|union|usize|void)\\b"
+    - type: "\\b(c_u?(short|int|long(long)?)|c_longdouble|c_void)\\b"
+    - type: "\\b((i|u)[0-9]+)\\b"
+
+     # Operators
+    - symbol.operator: "[-!|=;%.+^*:&?<>~]"
+
+     # Parenthesis
+    - symbol.brackets: "[(){}]|\\[|\\]"
+
+     # Constants
+    - constant: "\\b(null|undefined)\\b"
+    - constant.number: "\\b(0b[01_]+|0o[0-7_]+|[0-9_]+|0x[a-fA-F0-9_]+)\\b"
+    - constant.bool: "\\b(true|false)\\b"
 
     - constant.string:
         start: "\""
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
 
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - error: "..+"
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
+
+    - constant.string:
+        start: "\\\\\\\\"
+        end: "$"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
+    
     - comment:
         start: "//"
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-
-    - comment:
-        start: "/\\*"
-        end: "\\*/"
-        rules:
-            - todo: "(TODO|XXX|FIXME):?"

tools/build-date.go

@@ -2,9 +2,23 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"strconv"
 	"time"
 )
 
 func main() {
-	fmt.Println(time.Now().Local().Format("January 02, 2006"))
+	var buildTime time.Time
+	epoch := os.Getenv("SOURCE_DATE_EPOCH")
+	if epoch != "" {
+		i, err := strconv.Atoi(epoch)
+		if err != nil {
+			fmt.Errorf("SOURCE_DATE_EPOCH is not a valid integer")
+			os.Exit(1)
+		}
+		buildTime = time.Unix(int64(i), 0)
+	} else {
+		buildTime = time.Now().Local()
+	}
+	fmt.Println(buildTime.Format("January 02, 2006"))
 }

tools/cross-compile.sh

@@ -6,6 +6,9 @@ mkdir -p micro-$1
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1
+cp assets/packaging/micro.1 micro-$1
+cp assets/packaging/micro.desktop micro-$1
+cp assets/micro-logo-mark.svg micro-$1/micro.svg
 
 HASH="$(git rev-parse --short HEAD)"
 VERSION="$(go run tools/build-version.go)"
@@ -22,6 +25,9 @@ mv micro-$1-osx.tar.gz binaries
 # Linux
 echo "Linux 64"
 GOOS=linux GOARCH=amd64 make build
+./tools/package-deb.sh $1
+mv micro-$1-amd64.deb binaries
+
 mv micro micro-$1
 tar -czf micro-$1-linux64.tar.gz micro-$1
 mv micro-$1-linux64.tar.gz binaries

tools/nightly-release.sh

@@ -1,35 +1,25 @@
-# This script creates the nightly release on Github for micro
+# This script updates the nightly release on Github for micro
 # Must be run from inside the micro git repository
 
 commitID=$(git rev-parse --short HEAD)
-# info=$(github-release info -u zyedidia -r micro -t nightly)
-
-# if [[ $info = *$commitID* ]]; then
-#     echo "No new commits since last nightly"
-#     exit 1
-# fi
 
 go run remove-nightly-assets.go
 
-# echo "Moving tag"
-# hub push origin :refs/tags/nightly
-# git tag -f nightly $commitID
-# hub push --tags
-
 echo "Cross compiling binaries"
 ./cross-compile.sh $1
 mv ../binaries .
 
 MESSAGE=$'Nightly build\n\nAutogenerated nightly build of micro'
 
-echo "Creating new release"
+echo "Updating release"
 hub release edit nightly \
     --prerelease \
     --draft=false \
-    --message "$MESSAGE. Assets uploaded on $(date) for commit $commitID." \
+    --message "$MESSAGE (please DISREGARD the creation date of this Github release). Assets uploaded on $(date) for commit $commitID." \
     --attach "binaries/micro-$1-osx.tar.gz" \
     --attach "binaries/micro-$1-linux64.tar.gz" \
     --attach "binaries/micro-$1-linux64-static.tar.gz" \
+    --attach "binaries/micro-$1-amd64.deb" \
     --attach "binaries/micro-$1-linux32.tar.gz" \
     --attach "binaries/micro-$1-linux-arm.tar.gz" \
     --attach "binaries/micro-$1-linux-arm64.tar.gz" \

tools/package-deb.sh

@@ -0,0 +1 @@
+fpm -s dir -t deb -p micro-$1-amd64.deb --name micro --license mit --version $1 --deb-recommends xclip --description "A modern and intuitive terminal-based text editor" ./micro=/usr/bin/micro ./assets/packaging/micro.1=/usr/share/man/man1/micro.1

tools/pre-release.sh

@@ -23,6 +23,7 @@ hub release create $tag \
     --attach "binaries/micro-$1-osx.tar.gz" \
     --attach "binaries/micro-$1-linux64.tar.gz" \
     --attach "binaries/micro-$1-linux64-static.tar.gz" \
+    --attach "binaries/micro-$1-amd64.deb" \
     --attach "binaries/micro-$1-linux32.tar.gz" \
     --attach "binaries/micro-$1-linux-arm.tar.gz" \
     --attach "binaries/micro-$1-linux-arm64.tar.gz" \

tools/release.sh

@@ -22,6 +22,7 @@ hub release create $tag \
     --attach "binaries/micro-$1-osx.tar.gz" \
     --attach "binaries/micro-$1-linux64.tar.gz" \
     --attach "binaries/micro-$1-linux64-static.tar.gz" \
+    --attach "binaries/micro-$1-amd64.deb" \
     --attach "binaries/micro-$1-linux32.tar.gz" \
     --attach "binaries/micro-$1-linux-arm.tar.gz" \
     --attach "binaries/micro-$1-linux-arm64.tar.gz" \

tools/update-nightly-tag.sh

@@ -0,0 +1,13 @@
+commitID=$(git rev-parse --short HEAD)
+echo "Moving tag"
+hub push origin :refs/tags/nightly
+git tag -f nightly $commitID
+hub push --tags
+
+MESSAGE=$'Nightly build\n\nAutogenerated nightly build of micro'
+
+echo "Creating new release"
+hub release create nightly \
+    --prerelease \
+    --draft=false \
+    --message "$MESSAGE."