Minor cleanup

See #300

.gitignore

@@ -1,3 +1,5 @@
 ./micro
 !cmd/micro
 binaries/
+tmp.sh
+test/

Makefile

@@ -7,7 +7,7 @@ HASH = $(shell git rev-parse --short HEAD)
 build: deps tcell
 	go build -ldflags "-X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(shell date -u '+%B %d, %Y')'" -o micro ./cmd/micro
 
-# Builds micro after building the runtiem and checking dependencies
+# Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
 # Builds micro without checking for dependencies

README.md

@@ -42,7 +42,7 @@ To see more screenshots of micro, showcasing all of the default colorschemes, se
 * Easily configurable
 * Common editor things such as undo/redo, line numbers, unicode support...
 
-Although not yet implemented, I hope to add more features such as autocompletion, and multiple cursors in the future.
+Although not yet implemented, I hope to add more features such as autocompletion ([#174](https://github.com/zyedidia/micro/issues/174)), and multiple cursors ([#5](https://github.com/zyedidia/micro/issues/5)) in the future.
 
 # Installation
 
@@ -122,7 +122,14 @@ click to enable line selection.
 # Documentation and Help
 
 Micro has a built-in help system which you can access by pressing `CtrlE` and typing `help`. Additionally, you can
-view the help files online [here](https://github.com/zyedidia/micro/tree/master/runtime/help).
+view the help files here:
+
+* [main help](https://github.com/zyedidia/micro/tree/master/runtime/help/help.md)
+* [keybindings](https://github.com/zyedidia/micro/tree/master/runtime/help/keybindings.md)
+* [commands](https://github.com/zyedidia/micro/tree/master/runtime/help/commands.md)
+* [colors](https://github.com/zyedidia/micro/tree/master/runtime/help/colors.md)
+* [options](https://github.com/zyedidia/micro/tree/master/runtime/help/options.md)
+* [plugins](https://github.com/zyedidia/micro/tree/master/runtime/help/plugins.md)
 
 I also recommend reading the [tutorial](https://github.com/zyedidia/micro/tree/master/runtime/help/tutorial.md) for
 a brief introduction to the more powerful configuration features micro offers.

cmd/micro/actions.go

@@ -44,6 +44,15 @@ func PostActionCall(funcName string, view *View) bool {
 	return relocate
 }
 
+func (v *View) deselect(index int) bool {
+	if v.Cursor.HasSelection() {
+		v.Cursor.Loc = v.Cursor.CurSelection[index]
+		v.Cursor.ResetSelection()
+		return true
+	}
+	return false
+}
+
 // Center centers the view on the cursor
 func (v *View) Center(usePlugin bool) bool {
 	if usePlugin && !PreActionCall("Center", v) {
@@ -70,10 +79,7 @@ func (v *View) CursorUp(usePlugin bool) bool {
 		return false
 	}
 
-	if v.Cursor.HasSelection() {
-		v.Cursor.Loc = v.Cursor.CurSelection[0]
-		v.Cursor.ResetSelection()
-	}
+	v.deselect(0)
 	v.Cursor.Up()
 
 	if usePlugin {
@@ -88,10 +94,7 @@ func (v *View) CursorDown(usePlugin bool) bool {
 		return false
 	}
 
-	if v.Cursor.HasSelection() {
-		v.Cursor.Loc = v.Cursor.CurSelection[1]
-		v.Cursor.ResetSelection()
-	}
+	v.deselect(1)
 	v.Cursor.Down()
 
 	if usePlugin {
@@ -290,6 +293,8 @@ func (v *View) StartOfLine(usePlugin bool) bool {
 		return false
 	}
 
+	v.deselect(0)
+
 	v.Cursor.Start()
 
 	if usePlugin {
@@ -304,6 +309,8 @@ func (v *View) EndOfLine(usePlugin bool) bool {
 		return false
 	}
 
+	v.deselect(0)
+
 	v.Cursor.End()
 
 	if usePlugin {
@@ -369,6 +376,8 @@ func (v *View) CursorEnd(usePlugin bool) bool {
 		return false
 	}
 
+	v.deselect(0)
+
 	v.Cursor.Loc = v.Buf.End()
 
 	if usePlugin {
@@ -678,6 +687,9 @@ func (v *View) InsertTab(usePlugin bool) bool {
 	// Insert a tab
 	if v.Buf.Settings["tabstospaces"].(bool) {
 		tabSize := int(v.Buf.Settings["tabsize"].(float64))
+		if remainder := v.Cursor.Loc.X % tabSize; remainder != 0 {
+			tabSize = tabSize - remainder
+		}
 		v.Buf.Insert(v.Cursor.Loc, Spaces(tabSize))
 		for i := 0; i < tabSize; i++ {
 			v.Cursor.Right()
@@ -1089,6 +1101,8 @@ func (v *View) CursorPageUp(usePlugin bool) bool {
 		return false
 	}
 
+	v.deselect(0)
+
 	if v.Cursor.HasSelection() {
 		v.Cursor.Loc = v.Cursor.CurSelection[0]
 		v.Cursor.ResetSelection()
@@ -1107,6 +1121,8 @@ func (v *View) CursorPageDown(usePlugin bool) bool {
 		return false
 	}
 
+	v.deselect(0)
+
 	if v.Cursor.HasSelection() {
 		v.Cursor.Loc = v.Cursor.CurSelection[1]
 		v.Cursor.ResetSelection()
@@ -1322,6 +1338,39 @@ func (v *View) Quit(usePlugin bool) bool {
 	return false
 }
 
+// QuitAll quits the whole editor; all splits and tabs
+func (v *View) QuitAll(usePlugin bool) bool {
+	if usePlugin && !PreActionCall("QuitAll", v) {
+		return false
+	}
+
+	closeAll := true
+	for _, tab := range tabs {
+		for _, v := range tab.views {
+			if !v.CanClose("Quit anyway? (y,n,s) ", 'y', 'n', 's') {
+				closeAll = false
+			}
+		}
+	}
+
+	if closeAll {
+		for _, tab := range tabs {
+			for _, v := range tab.views {
+				v.CloseBuffer()
+			}
+		}
+
+		if usePlugin {
+			PostActionCall("QuitAll", v)
+		}
+
+		screen.Fini()
+		os.Exit(0)
+	}
+
+	return false
+}
+
 // AddTab adds a new tab with an empty buffer
 func (v *View) AddTab(usePlugin bool) bool {
 	if usePlugin && !PreActionCall("AddTab", v) {

cmd/micro/autocomplete.go

@@ -14,13 +14,14 @@ import (
 
 // FileComplete autocompletes filenames
 func FileComplete(input string) (string, []string) {
-	dirs := strings.Split(input, "/")
+	var sep string = string(os.PathSeparator)
+	dirs := strings.Split(input, sep)
 	var files []os.FileInfo
 	var err error
 	if len(dirs) > 1 {
 		home, _ := homedir.Dir()
 
-		directories := strings.Join(dirs[:len(dirs)-1], "/")
+		directories := strings.Join(dirs[:len(dirs)-1], sep)
 		if strings.HasPrefix(directories, "~") {
 			directories = strings.Replace(directories, "~", home, 1)
 		}
@@ -35,7 +36,7 @@ func FileComplete(input string) (string, []string) {
 	for _, f := range files {
 		name := f.Name()
 		if f.IsDir() {
-			name += "/"
+			name += sep
 		}
 		if strings.HasPrefix(name, dirs[len(dirs)-1]) {
 			suggestions = append(suggestions, name)
@@ -45,13 +46,13 @@ func FileComplete(input string) (string, []string) {
 	var chosen string
 	if len(suggestions) == 1 {
 		if len(dirs) > 1 {
-			chosen = strings.Join(dirs[:len(dirs)-1], "/") + "/" + suggestions[0]
+			chosen = strings.Join(dirs[:len(dirs)-1], sep) + sep + suggestions[0]
 		} else {
 			chosen = suggestions[0]
 		}
 	} else {
 		if len(dirs) > 1 {
-			chosen = strings.Join(dirs[:len(dirs)-1], "/") + "/"
+			chosen = strings.Join(dirs[:len(dirs)-1], sep) + sep
 		}
 	}
 

cmd/micro/bindings.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"os"
 	"strings"
 
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"github.com/zyedidia/tcell"
 )
 
@@ -72,6 +72,7 @@ var bindingActions = map[string]func(*View, bool) bool{
 	"ShellMode":           (*View).ShellMode,
 	"CommandMode":         (*View).CommandMode,
 	"Quit":                (*View).Quit,
+	"QuitAll":             (*View).QuitAll,
 	"AddTab":              (*View).AddTab,
 	"PreviousTab":         (*View).PreviousTab,
 	"NextTab":             (*View).NextTab,
@@ -235,7 +236,7 @@ func InitBindings() {
 			return
 		}
 
-		err = json.Unmarshal(input, &parsed)
+		err = json5.Unmarshal(input, &parsed)
 		if err != nil {
 			TermMessage("Error reading bindings.json:", err.Error())
 		}
@@ -393,6 +394,8 @@ func DefaultBindings() map[string]string {
 		"CtrlBackslash":  "NextTab",
 		"Home":           "StartOfLine",
 		"End":            "EndOfLine",
+		"CtrlHome":       "CursorStart",
+		"CtrlEnd":        "CursorEnd",
 		"PageUp":         "CursorPageUp",
 		"PageDown":       "CursorPageDown",
 		"CtrlG":          "ToggleHelp",

cmd/micro/buffer.go

@@ -8,6 +8,8 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"strconv"
+	"strings"
 	"time"
 	"unicode/utf8"
 )
@@ -85,10 +87,36 @@ func NewBuffer(txt []byte, path string) *Buffer {
 	}
 
 	// Put the cursor at the first spot
+	cursorStartX := 0
+	cursorStartY := 0
+	// If -startpos LINE,COL was passed, use start position LINE,COL
+	if len(*flagStartPos) > 0 {
+		positions := strings.Split(*flagStartPos, ",")
+		if len(positions) == 2 {
+			lineNum, errPos1 := strconv.Atoi(positions[0])
+			colNum, errPos2 := strconv.Atoi(positions[1])
+			if errPos1 == nil && errPos2 == nil {
+				cursorStartX = colNum
+				cursorStartY = lineNum - 1
+				// Check to avoid line overflow
+				if cursorStartY > b.NumLines {
+					cursorStartY = b.NumLines - 1
+				} else if cursorStartY < 0 {
+					cursorStartY = 0
+				}
+				// Check to avoid column overflow
+				if cursorStartX > len(b.Line(cursorStartY)) {
+					cursorStartX = len(b.Line(cursorStartY))
+				} else if cursorStartX < 0 {
+					cursorStartX = 0
+				}
+			}
+		}
+	}
 	b.Cursor = Cursor{
 		Loc: Loc{
-			X: 0,
-			Y: 0,
+			X: cursorStartX,
+			Y: cursorStartY,
 		},
 		buf: b,
 	}
@@ -219,6 +247,7 @@ func (b *Buffer) Serialize() error {
 
 // SaveAs saves the buffer to a specified path (filename), creating the file if it does not exist
 func (b *Buffer) SaveAs(filename string) error {
+	b.FindFileType()
 	b.UpdateRules()
 	b.Name = filename
 	b.Path = filename
@@ -235,6 +264,7 @@ func (b *Buffer) SaveAs(filename string) error {
 // SaveAsWithSudo is the same as SaveAs except it uses a neat trick
 // with tee to use sudo so the user doesn't have to reopen micro with sudo
 func (b *Buffer) SaveAsWithSudo(filename string) error {
+	b.FindFileType()
 	b.UpdateRules()
 	b.Name = filename
 	b.Path = filename

cmd/micro/colorscheme.go

@@ -16,7 +16,25 @@ type Colorscheme map[string]tcell.Style
 // The current colorscheme
 var colorscheme Colorscheme
 
-var preInstalledColors = []string{"default", "simple", "solarized", "solarized-tc", "atom-dark-tc", "monokai", "gruvbox", "zenburn"}
+var preInstalledColors = []string{"default", "simple", "solarized", "solarized-tc", "atom-dark-tc", "monokai", "gruvbox", "zenburn", "bubblegum"}
+
+// ColorschemeExists checks if a given colorscheme exists
+func ColorschemeExists(colorschemeName string) bool {
+	files, _ := ioutil.ReadDir(configDir)
+	for _, f := range files {
+		if f.Name() == colorschemeName+".micro" {
+			return true
+		}
+	}
+
+	for _, name := range preInstalledColors {
+		if name == colorschemeName {
+			return true
+		}
+	}
+
+	return false
+}
 
 // InitColorscheme picks and initializes the colorscheme when micro starts
 func InitColorscheme() {
@@ -31,6 +49,7 @@ func LoadDefaultColorscheme() {
 // LoadColorscheme loads the given colorscheme from a directory
 func LoadColorscheme(colorschemeName, dir string) {
 	files, _ := ioutil.ReadDir(dir)
+	found := false
 	for _, f := range files {
 		if f.Name() == colorschemeName+".micro" {
 			text, err := ioutil.ReadFile(dir + "/" + f.Name())
@@ -39,6 +58,7 @@ func LoadColorscheme(colorschemeName, dir string) {
 				continue
 			}
 			colorscheme = ParseColorscheme(string(text))
+			found = true
 		}
 	}
 
@@ -50,8 +70,13 @@ func LoadColorscheme(colorschemeName, dir string) {
 				continue
 			}
 			colorscheme = ParseColorscheme(string(data))
+			found = true
 		}
 	}
+
+	if !found {
+		TermMessage(colorschemeName, "is not a valid colorscheme")
+	}
 }
 
 // ParseColorscheme parses the text definition for a colorscheme and returns the corresponding object

cmd/micro/command.go

@@ -287,15 +287,13 @@ func Replace(args []string) {
 	view := CurView()
 
 	found := 0
-	for {
-		match := regex.FindStringIndex(view.Buf.String())
-		if match == nil {
-			break
-		}
-		found++
-		if strings.Contains(flags, "c") {
+	if strings.Contains(flags, "c") {
+		for {
 			// The 'check' flag was used
 			Search(search, view, true)
+			if !view.Cursor.HasSelection() {
+				break
+			}
 			view.Relocate()
 			if view.Buf.Settings["syntax"].(bool) {
 				view.matches = Match(view)
@@ -308,13 +306,14 @@ func Replace(args []string) {
 					view.Cursor.ResetSelection()
 				}
 				messenger.Reset()
-				return
+				break
 			}
 			if choice {
 				view.Cursor.DeleteSelection()
-				view.Buf.Insert(FromCharPos(match[0], view.Buf), replace)
+				view.Buf.Insert(view.Cursor.Loc, replace)
 				view.Cursor.ResetSelection()
 				messenger.Reset()
+				found++
 			} else {
 				if view.Cursor.HasSelection() {
 					searchStart = ToCharPos(view.Cursor.CurSelection[1], view.Buf)
@@ -323,7 +322,14 @@ func Replace(args []string) {
 				}
 				continue
 			}
-		} else {
+		}
+	} else {
+		for {
+			match := regex.FindStringIndex(view.Buf.String())
+			if match == nil {
+				break
+			}
+			found++
 			view.Buf.Replace(FromCharPos(match[0], view.Buf), FromCharPos(match[1], view.Buf), replace)
 		}
 	}

cmd/micro/highlighter.go

@@ -38,6 +38,7 @@ var preInstalledSynFiles = []string{
 	"asm",
 	"awk",
 	"c",
+	"caddyfile",
 	"cmake",
 	"coffeescript",
 	"colortest",
@@ -47,6 +48,7 @@ var preInstalledSynFiles = []string{
 	"css",
 	"cython",
 	"d",
+	"dart",
 	"dot",
 	"erb",
 	"fish",
@@ -79,6 +81,7 @@ var preInstalledSynFiles = []string{
 	"man",
 	"markdown",
 	"mpdconf",
+	"micro",
 	"nanorc",
 	"nginx",
 	"ocaml",

cmd/micro/messenger.go

@@ -98,6 +98,7 @@ func (m *Messenger) Error(msg ...interface{}) {
 
 // YesNoPrompt asks the user a yes or no question (waits for y or n) and returns the result
 func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
+	m.hasPrompt = true
 	m.Message(prompt)
 
 	_, h := screen.Size()
@@ -126,6 +127,7 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
 
 // LetterPrompt gives the user a prompt and waits for a one letter response
 func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool) {
+	m.hasPrompt = true
 	m.Message(prompt)
 
 	_, h := screen.Size()
@@ -142,11 +144,16 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
 			case tcell.KeyRune:
 				for _, r := range responses {
 					if e.Rune() == r {
+						m.Clear()
 						m.Reset()
+						m.hasPrompt = false
 						return r, false
 					}
 				}
 			case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
+				m.Clear()
+				m.Reset()
+				m.hasPrompt = false
 				return ' ', true
 			}
 		}
@@ -240,18 +247,19 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
 
 		m.HandleEvent(event, m.history[historyType])
 
-		messenger.Clear()
+		m.Clear()
 		for _, v := range tabs[curTab].views {
 			v.Display()
 		}
 		DisplayTabs()
-		messenger.Display()
+		m.Display()
 		if len(suggestions) > 1 {
 			m.DisplaySuggestions(suggestions)
 		}
 		screen.Show()
 	}
 
+	m.Clear()
 	m.Reset()
 	return response, canceled
 }
@@ -347,11 +355,14 @@ func (m *Messenger) DisplaySuggestions(suggestions []string) {
 func (m *Messenger) Display() {
 	_, h := screen.Size()
 	if m.hasMessage {
-		runes := []rune(m.message + m.response)
-		for x := 0; x < len(runes); x++ {
-			screen.SetContent(x, h-1, runes[x], nil, m.style)
+		if m.hasPrompt || globalSettings["infobar"].(bool) {
+			runes := []rune(m.message + m.response)
+			for x := 0; x < len(runes); x++ {
+				screen.SetContent(x, h-1, runes[x], nil, m.style)
+			}
 		}
 	}
+
 	if m.hasPrompt {
 		screen.ShowCursor(Count(m.message)+m.cursorx, h-1)
 		screen.Show()

cmd/micro/micro.go

@@ -64,11 +64,11 @@ var (
 )
 
 // LoadInput determines which files should be loaded into buffers
-// based on the input stored in os.Args
+// based on the input stored in flag.Args()
 func LoadInput() []*Buffer {
 	// There are a number of ways micro should start given its input
 
-	// 1. If it is given a files in os.Args, it should open those
+	// 1. If it is given a files in flag.Args(), it should open those
 
 	// 2. If there is no input file and the input is not a terminal, that means
 	// something is being piped in and the stdin should be opened in an
@@ -82,11 +82,12 @@ func LoadInput() []*Buffer {
 	var err error
 	var buffers []*Buffer
 
-	if len(os.Args) > 1 {
+	if len(flag.Args()) > 0 {
 		// Option 1
 		// We go through each file and load it
-		for i := 1; i < len(os.Args); i++ {
-			filename = os.Args[i]
+		for i := 0; i < len(flag.Args()); i++ {
+			filename = flag.Args()[i]
+
 			// Check that the file exists
 			if _, e := os.Stat(filename); e == nil {
 				// If it exists we load it into a buffer
@@ -195,10 +196,24 @@ func RedrawAll() {
 }
 
 // Passing -version as a flag will have micro print out the version number
-var flagVersion = flag.Bool("version", false, "Show the version number")
+var flagVersion = flag.Bool("version", false, "Show the version number and information")
+var flagStartPos = flag.String("startpos", "", "LINE,COL to start the cursor at when opening a buffer.")
 
 func main() {
+	flag.Usage = func() {
+		fmt.Println("Usage: micro [OPTIONS] [FILE]...")
+		fmt.Println("Micro's options can be set via command line arguments for quick adjustments. For real configuration, please use the bindings.json file (see 'help options').\n")
+		flag.PrintDefaults()
+	}
+
+	optionFlags := make(map[string]*string)
+
+	for k, v := range DefaultGlobalSettings() {
+		optionFlags[k] = flag.String(k, "", fmt.Sprintf("The %s option. Default value: '%v'", k, v))
+	}
+
 	flag.Parse()
+
 	if *flagVersion {
 		// If -version was passed
 		fmt.Println("Version:", Version)
@@ -220,6 +235,7 @@ func main() {
 
 	// Load the user's settings
 	InitGlobalSettings()
+
 	InitCommands()
 	InitBindings()
 
@@ -267,6 +283,12 @@ func main() {
 		}
 	}
 
+	for k, v := range optionFlags {
+		if *v != "" {
+			SetOption(k, *v)
+		}
+	}
+
 	// Load all the plugin stuff
 	// We give plugins access to a bunch of variables here which could be useful to them
 	L.SetGlobal("OS", luar.New(L, runtime.GOOS))
@@ -338,7 +360,7 @@ func main() {
 				// If the user left clicked we check a couple things
 				_, h := screen.Size()
 				x, y := e.Position()
-				if y == h-1 && messenger.message != "" {
+				if y == h-1 && messenger.message != "" && globalSettings["infobar"].(bool) {
 					// If the user clicked in the bottom bar, and there is a message down there
 					// we copy it to the clipboard.
 					// Often error messages are displayed down there so it can be useful to easily
@@ -347,11 +369,13 @@ func main() {
 					continue
 				}
 
-				// We loop through each view in the current tab and make sure the current view
-				// it the one being clicked in
-				for _, v := range tabs[curTab].views {
-					if x >= v.x && x < v.x+v.width && y >= v.y && y < v.y+v.height {
-						tabs[curTab].curView = v.Num
+				if CurView().mouseReleased {
+					// We loop through each view in the current tab and make sure the current view
+					// is the one being clicked in
+					for _, v := range tabs[curTab].views {
+						if x >= v.x && x < v.x+v.width && y >= v.y && y < v.y+v.height {
+							tabs[curTab].curView = v.Num
+						}
 					}
 				}
 			}

cmd/micro/settings.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
@@ -9,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"github.com/zyedidia/glob"
 )
 
@@ -30,7 +30,7 @@ func InitGlobalSettings() {
 				return
 			}
 
-			err = json.Unmarshal(input, &parsed)
+			err = json5.Unmarshal(input, &parsed)
 			if err != nil {
 				TermMessage("Error reading settings.json:", err.Error())
 			}
@@ -70,7 +70,7 @@ func InitLocalSettings(buf *Buffer) {
 			return
 		}
 
-		err = json.Unmarshal(input, &parsed)
+		err = json5.Unmarshal(input, &parsed)
 		if err != nil {
 			TermMessage("Error reading settings.json:", err.Error())
 		}
@@ -110,7 +110,7 @@ func WriteSettings(filename string) error {
 					return err
 				}
 
-				err = json.Unmarshal(input, &parsed)
+				err = json5.Unmarshal(input, &parsed)
 				if err != nil {
 					TermMessage("Error reading settings.json:", err.Error())
 				}
@@ -125,8 +125,8 @@ func WriteSettings(filename string) error {
 			}
 		}
 
-		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		err = ioutil.WriteFile(filename, txt, 0644)
+		txt, _ := json5.MarshalIndent(parsed, "", "    ")
+		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return err
 }
@@ -169,6 +169,7 @@ func DefaultGlobalSettings() map[string]interface{} {
 		"cursorline":   true,
 		"ignorecase":   false,
 		"indentchar":   " ",
+		"infobar":      true,
 		"ruler":        true,
 		"savecursor":   false,
 		"saveundo":     false,
@@ -207,6 +208,12 @@ func DefaultLocalSettings() map[string]interface{} {
 // is local only it will set the local version
 // Use setlocal to force an option to be set locally
 func SetOption(option, value string) error {
+	if option == "colorscheme" {
+		if !ColorschemeExists(value) {
+			return errors.New(value + " is not a valid colorscheme")
+		}
+	}
+
 	if _, ok := globalSettings[option]; !ok {
 		if _, ok := CurView().Buf.Settings[option]; !ok {
 			return errors.New("Invalid option")
@@ -244,6 +251,12 @@ func SetOption(option, value string) error {
 		}
 	}
 
+	if option == "infobar" {
+		for _, tab := range tabs {
+			tab.Resize()
+		}
+	}
+
 	if _, ok := CurView().Buf.Settings[option]; ok {
 		for _, tab := range tabs {
 			for _, view := range tab.views {

cmd/micro/split_tree.go

@@ -146,9 +146,7 @@ func (s *SplitTree) ResizeSplits() {
 				n.view.y = s.y + n.view.height*i
 				n.view.x = s.x
 			}
-			// n.view.ToggleStatusLine()
-			_, screenH := screen.Size()
-			if n.view.Buf.Settings["statusline"].(bool) || (n.view.y+n.view.height) != screenH-1 {
+			if n.view.Buf.Settings["statusline"].(bool) {
 				n.view.height--
 			}
 

cmd/micro/tab.go

@@ -31,7 +31,12 @@ func NewTabFromView(v *View) *Tab {
 
 	w, h := screen.Size()
 	t.tree.width = w
-	t.tree.height = h - 1
+	t.tree.height = h
+
+	if globalSettings["infobar"].(bool) {
+		t.tree.height--
+	}
+
 	return t
 }
 
@@ -49,7 +54,12 @@ func (t *Tab) Cleanup() {
 func (t *Tab) Resize() {
 	w, h := screen.Size()
 	t.tree.width = w
-	t.tree.height = h - 1
+	t.tree.height = h
+
+	if globalSettings["infobar"].(bool) {
+		t.tree.height--
+	}
+
 	t.tree.ResizeSplits()
 }
 

cmd/micro/view.go

@@ -84,7 +84,7 @@ type View struct {
 // NewView returns a new fullscreen view
 func NewView(buf *Buffer) *View {
 	screenW, screenH := screen.Size()
-	return NewViewWidthHeight(buf, screenW, screenH-1)
+	return NewViewWidthHeight(buf, screenW, screenH)
 }
 
 // NewViewWidthHeight returns a new view with the specified width and height
@@ -344,7 +344,24 @@ func (v *View) HandleEvent(event tcell.Event) {
 			}
 		}
 	case *tcell.EventPaste:
-		relocate = v.Paste(true)
+		if !PreActionCall("Paste", v) {
+			break
+		}
+
+		leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y))
+
+		if v.Cursor.HasSelection() {
+			v.Cursor.DeleteSelection()
+			v.Cursor.ResetSelection()
+		}
+		clip := e.Text()
+		clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1)
+		v.Buf.Insert(v.Cursor.Loc, clip)
+		v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
+		v.freshClip = false
+		messenger.Message("Pasted clipboard")
+
+		PostActionCall("Paste", v)
 	case *tcell.EventMouse:
 		x, y := e.Position()
 		x -= v.lineNumOffset - v.leftCol + v.x

runtime/colorschemes/bubblegum.micro

@@ -0,0 +1,19 @@
+color-link default "241,231"
+color-link comment "246,231"
+color-link constant "130,231"
+color-link constant.string "136,231"
+color-link constant.number "131,231"
+color-link identifier "133,231"
+color-link statement "32,231"
+color-link preproc "28,231"
+color-link type "61,231"
+color-link special "167,231"
+color-link error "231, 160"
+color-link underlined "underline 241,231"
+color-link todo "246,231"
+
+color-link statusline "241,254"
+color-link gutter-error "197,231"
+color-link gutter-warning "134,231"
+color-link line-number "246,254"
+color-link cursor-line "254"

runtime/help/help.md

@@ -3,6 +3,12 @@
 Micro is a terminal-based text editor that aims to be easy to use and intuitive, 
 while also taking advantage of the full capabilities of modern terminals.
 
+*Press CtrlQ to quit, and CtrlS to save.*
+
+If you want to see all the keybindings press CtrlE and type `help keybindings`.
+
+See the next section for more information about documentation and help.
+
 ### Accessing more help
 
 Micro has a built-in help system much like Vim's (although less extensive).

runtime/help/keybindings.md

@@ -50,6 +50,8 @@ you can rebind them to your liking.
 	"CtrlBackslash":  "NextTab",
 	"Home":           "Start",
 	"End":            "End",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
 	"PageUp":         "CursorPageUp",
 	"PageDown":       "CursorPageDown",
 	"CtrlG":          "ToggleHelp",
@@ -169,6 +171,7 @@ ClearStatus
 ShellMode
 CommandMode
 Quit
+QuitAll
 AddTab
 PreviousTab
 NextTab

runtime/help/options.md

@@ -31,6 +31,11 @@ Here are the options that you can set:
 
 	default value: ` `
 
+* `infobar`: enables the line at the bottom of the editor where messages are printed.
+   This option is `global only`.
+
+	default value: `on`
+
 * `filetype`: sets the filetype for the current buffer. This setting is `local only`
 
     default value: this will be automatically set depending on the file you have open

runtime/help/plugins.md

@@ -37,7 +37,7 @@ for example turning off `tabstospaces` only for Go files when they are opened.
 ---
 
 There are a number of functions and variables that are available to you in
-oder to access the inner workings of micro. Here is a list (the type signatures
+order to access the inner workings of micro. Here is a list (the type signatures
 for functions are given using Go's type system):
 
 * `OS`: variable which gives the OS micro is currently running on (this is the same

runtime/help/tutorial.md

@@ -1,7 +1,7 @@
 # Tutorial
 
-This is a brief intro to micro's configuration system that will will give some
-simple examples showing how to configure settings, rebind keys, 
+This is a brief intro to micro's configuration system that will give some
+simple examples showing how to configure settings, rebind keys,
 and use `init.lua` to configure micro to your liking.
 
 Hopefully you'll find this useful.

runtime/plugins/linter/linter.lua

@@ -2,10 +2,14 @@ if GetOption("linter") == nil then
     AddOption("linter", true)
 end
 
-MakeCommand("lint", "linter.runLinter", 0)
+MakeCommand("lint", "linter.lintCommand", 0)
+
+function lintCommand()
+    CurView():Save(false)
+    runLinter()
+end
 
 function runLinter()
-    CurView():Save(false)
     local ft = CurView().Buf:FileType()
     local file = CurView().Buf.Path
     local devnull = "/dev/null"

runtime/syntax/README.md

@@ -8,8 +8,6 @@ Micro syntax files are almost identical to Nano's, except for some key differenc
 
 * Micro does not use `icolor`. Instead, for a case insensitive match, use the case insensitive flag (`i`) in the regular expression
     * For example, `icolor green ".*"` would become `color green (i) ".*"`
-* Micro does not support `start="..." end="..."`. Instead use the `s` flag to match newlines and put `.*?` in the middle
-    * For example `color green start="hello" end="world"` would become `color green (s) "hello.*?world"`
 
 # Using with colorschemes
 

runtime/syntax/asm.micro

@@ -1,17 +1,93 @@
-## Here is an example for assembler.
-##
+## Made by Nickolay Ilyushin <nickolay02@inbox.ru>. Next line is from previous (first) version (no need for modifications :P)
 syntax "asm" "\.(S|s|asm)$"
-color red "\<[A-Z_]{2,}\>"
-color brightgreen "\.(data|subsection|text)"
-color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
-color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
-brightred (i) "^[[:space:]]*[.0-9A-Z_]*:"
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
-## Highlight strings (note: VERY resource intensive)
-color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
-## Highlight comments
-color brightblue "//.*"
-color brightblue start="/\*" end="\*/"
-## Highlight trailing whitespace
-color ,green "[[:space:]]+$"
+
+# This file is made for NASM assembly
+
+## Instructions
+# x86
+color statement "\b(?i)(mov|aaa|aad|aam|aas|adc|add|and|call|cbw|clc|cld|cli|cmc|cmp|cmpsb|cmpsw|cwd|daa|das|dec|div|esc|hlt|idiv|imul|in|inc|int|into|iret|ja|jae|jb|jbe|jc|je|jg|jge|jl|jle|jna|jnae|jnb|jnbe|jnc|jne|jng|jnge|jnl|jnle|jno|jnp|jns|jnz|jo|jp|jpe|jpo|js|jz|jcxz|jmp|lahf|lds|lea|les|lock|lodsb|lodsw|loop|loope|loopne|loopnz|loopz|movsb|movsw|mul|neg|nop|or|pop|popf|push|pushf|rcl|rcr|rep|repe|repne|repnz|repz|ret|retn|retf|rol|ror|sahf|sal|sar|sbb|scasb|scasw|shl|shr|stc|std|sti|stosb|stosw|sub|test|wait|xchg|xlat|xor)(?-i)\b"
+color statement "\b(?i)(bound|enter|ins|leave|outs|popa|pusha)(?-i)\b"
+color statement "\b(?i)(arpl|clts|lar|lgdt|lidt|lldt|lmsw|loadall|lsl|ltr|sgdt|sidt|sldt|smsw|str|verr|verw)(?-i)\b"
+color statement "\b(?i)(bsf|bsr|bt|btc|btr|bts|cdq|cmpsd|cwde|insd|iret|iretd|iretf|jecxz|lfs|lgs|lss|lodsd|loopw|loopew|loopnew|loopnzw|loopzw|loopd|looped|loopned|loopnzd|loopzd|cr|tr|dr|movsd|movsx|movzx|outsd|popad|popfd|pushad|pushfd|scasd|seta|setae|setb|setbe|setc|sete|setg|setge|setl|setle|setna|setnae|setnb|setnbe|setnc|setne|setng|setnge|setnl|setnle|setno|setnp|setns|setnz|seto|setp|setpe|setpo|sets|setz|shdl|shrd|stosd)(?-i)\b"
+color statement "\b(?i)(bswap|cmpxcgh|invd|invlpg|wbinvd|xadd)(?-i)\b"
+color statement "\b(?i)(cpuid|cmpxchg8b|rdmsr|rdtsc|wrmsr|rsm)(?-i)\b"
+color statement "\b(?i)(rdpmc)(?-i)\b"
+color statement "\b(?i)(syscall|sysret)(?-i)\b"
+color statement "\b(?i)(cmova|cmovae|cmovb|cmovbe|cmovc|cmove|cmovg|cmovge|cmovl|cmovle|cmovna|cmovnae|cmovnb|cmovnbe|cmovnc|cmovne|cmovng|cmovnge|cmovnle|cmovno|cmovpn|cmovns|cmovnz|cmovo|cmovp|cmovpe|cmovpo|cmovs|cmovz|sysenter|sysexit|ud2)(?-i)\b"
+color statement "\b(?i)(maskmovq|movntps|movntq|prefetch0|prefetch1|prefetch2|prefetchnta|sfence)(?-i)\b"
+color statement "\b(?i)(clflush|lfence|maskmovdqu|mfence|movntdq|movnti|movntpd|pause)(?-i)\b"
+color statement "\b(?i)(monitor|mwait)(?-i)\b"
+color statement "\b(?i)(cdqe|cqo|cmpsq|cmpxchg16b|iretq|jrcxz|lodsq|movsdx|popfq|pushfq|rdtscp|scasq|stosq|swapgs)(?-i)\b"
+color statement "\b(?i)(clgi|invlpga|skinit|stgi|vmload|vmmcall|vmrun|vmsave)(?-i)\b"
+color statement "\b(?i)(vmptrdl|vmptrst|vmclear|vmread|vmwrite|vmcall|vmlaunch|vmresume|vmxoff|vmxon)(?-i)\b"
+color statement "\b(?i)(lzcnt|popcnt)(?-i)\b"
+color statement "\b(?i)(bextr|blcfill|blci|blcic|blcmask|blcs|blsfill|blsic|t1mskc|tzmsk)(?-i)\b"
+
+# x87
+color statement "\b(?i)(f2xm1|fabs|fadd|faddp|fbld|fbstp|fchs|fclex|fcom|fcomp|fcompp|fdecstp|fdisi|fdiv|fvidp|fdivr|fdivrp|feni|ffree|fiadd|ficom|ficomp|fidiv|fidivr|fild|fimul|fincstp|finit|fist|fistp|fisub|fisubr|fld|fld1|fldcw|fldenv|fldenvw|fldl2e|fldl2t|fldlg2|fldln2|fldpi|fldz|fmul|fmulp|fnclex|fndisi|fneni|fninit|fnop|fnsave|fnsavenew|fnstcw|fnstenv|fnstenvw|fnstsw|fpatan|fprem|fptan|frndint|frstor|frstorw|fsave|fsavew|fscale|fsqrt|fst|fstcw|fstenv|fstenvw|fstp|fstpsw|fsub|fsubp|fsubr|fsubrp|ftst|fwait|fxam|fxch|fxtract|fyl2x|fyl2xp1)(?-i)\b"
+color statement "\b(?i)(fsetpm)(?-i)\b"
+color statement "\b(?i)(fcos|fldenvd|fsaved|fstenvd|fprem1|frstord|fsin|fsincos|fstenvd|fucom|fucomp|fucompp)(?-i)\b"
+color statement "\b(?i)(fcmovb|fcmovbe|fcmove|fcmove|fcmovnb|fcmovnbe|fcmovne|fcmovnu|fcmovu)(?-i)\b"
+color statement "\b(?i)(fcomi|fcomip|fucomi|fucomip)(?-i)\b"
+color statement "\b(?i)(fxrstor|fxsave)(?-i)\b"
+color statement "\b(?i)(fisttp)(?-i)\b"
+color statement "\b(?i)(ffreep)(?-i)\b"
+
+# SIMD
+color statement "\b(?i)(emms|movd|movq|packssdw|packsswb|packuswb|paddb|paddw|paddd|paddsb|paddsw|paddusb|paddusw|pand|pandn|por|pxor|pcmpeqb|pcmpeqw|pcmpeqd|pcmpgtb|pcmpgtw|pcmpgtd|pmaddwd|pmulhw|pmullw|psllw|pslld|psllq|psrad|psraw|psrlw|psrld|psrlq|psubb|psubw|psubd|psubsb|psubsw|psubusb|punpckhbw|punpckhwd|punpckhdq|punkcklbw|punpckldq|punpcklwd)(?-i)\b"
+color statement "\b(?i)(paveb|paddsiw|pmagw|pdistib|psubsiw|pmwzb|pmulhrw|pmvnzb|pmvlzb|pmvgezb|pmulhriw|pmachriw)(?-i)\b"
+color statement "\b(?i)(femms|pavgusb|pf2id|pfacc|pfadd|pfcmpeq|pfcmpge|pfcmpgt|pfmax|pfmin|pfmul|pfrcp|pfrcpit1|pfrcpit2|pfrsqit1|pfrsqrt|pfsub|pfsubr|pi2fd|pmulhrw|prefetch|prefetchw)(?-i)\b"
+color statement "\b(?i)(pf2iw|pfnacc|pfpnacc|pi2fw|pswapd)(?-i)\b"
+color statement "\b(?i)(pfrsqrtv|pfrcpv)(?-i)\b"
+color statement "\b(?i)(addps|addss|cmpps|cmpss|comiss|cvtpi2ps|cvtps2pi|cvtsi2ss|cvtss2si|cvttps2pi|cvttss2si|divps|divss|ldmxcsr|maxps|maxss|minps|minss|movaps|movhlps|movhps|movlhps|movlps|movmskps|movntps|movss|movups|mulps|mulss|rcpps|rcpss|rsqrtps|rsqrtss|shufps|sqrtps|sqrtss|stmxcsr|subps|subss|ucomiss|unpckhps|unpcklps)(?-i)\b"
+color statement "\b(?i)(andnps|andps|orps|pavgb|pavgw|pextrw|pinsrw|pmaxsw|pmaxub|pminsw|pminub|pmovmskb|pmulhuw|psadbw|pshufw|xorps)(?-i)\b"
+color statement "\b(?i)(movups|movss|movlps|movhlps|movlps|unpcklps|unpckhps|movhps|movlhps|prefetchnta|prefetch0|prefetch1|prefetch2|nop|movaps|cvtpi2ps|cvtsi2ss|cvtps2pi|cvttss2si|cvtps2pi|cvtss2si|ucomiss|comiss|sqrtps|sqrtss|rsqrtps|rsqrtss|rcpps|andps|orps|xorps|addps|addss|mulps|mulss|subps|subss|minps|minss|divps|divss|maxps|maxss|pshufw|ldmxcsr|stmxcsr|sfence|cmpps|cmpss|pinsrw|pextrw|shufps|pmovmskb|pminub|pmaxub|pavgb|pavgw|pmulhuw|movntq|pminsw|pmaxsw|psadbw|maskmovq)(?-i)\b"
+color statement "\b(?i)(addpd|addsd|addnpd|cmppd|cmpsd)(?-i)\b"
+color statement "\b(?i)(addpd|addsd|andnpd|andpd|cmppd|cmpsd|comisd|cvtdq2pd|cvtdq2ps|cvtpd2dq|cvtpd2pi|cvtpd2ps|cvtpi2pd|cvtps2dq|cvtps2pd|cvtsd2si|cvtsd2ss|cvtsi2sd|cvtss2sd|cvttpd2dq|cvttpd2pi|cvttps2dq|cvttsd2si|divpd|divsd|maxpd|maxsd|minpd|minsd|movapd|movhpd|movlpd|movmskpd|movsd|movupd|mulpd|mulsd|orpd|shufpd|sqrtpd|sqrtsd|subpd|subsd|ucomisd|unpckhpd|unpcklpd|xorpd)(?-i)\b"
+color statement "\b(?i)(movdq2q|movdqa|movdqu|movq2dq|paddq|psubq|pmuludq|pshufhw|pshuflw|pshufd|pslldq|psrldq|punpckhqdq|punpcklqdq)(?-i)\b"
+color statement "\b(?i)(addsubpd|addsubps|haddpd|haddps|hsubpd|hsubps|movddup|movshdup|movsldu)(?-i)\b"
+color statement "\b(?i)(lddqu)(?-i)\b"
+color statement "\b(?i)(psignw|psignd|psignb|pshufb|pmulhrsw|pmaddubsw|phsubw|phsubsw|phsubd|phaddw|phaddsw|phaddd|palignr|pabsw|pabsd|pabsb)(?-i)\b"
+color statement "\b(?i)(dpps|dppd|blendps|blendpd|blendvps|blendvpd|roundps|roundss|roundpd|roundsd|insertps|extractps)(?-i)\b"
+color statement "\b(?i)(mpsadbw|phminposuw|pmulld|pmuldq|pblendvb|pblendw|pminsb|pmaxsb|pminuw|pmaxuw|pminud|pmaxud|pminsd|pmaxsd|pinsrb|pinsrd/pinsrq|pextrb|pextrw|pextrd/pextrq|pmovsxbw|pmovzxbw|pmovsxbd|pmovzxbd|pmovsxbq|pmovzxbq|pmovsxwd|pmovzxwd|pmovsxwq|pmovzxwq|pmovsxdq|pmovzxdq|ptest|pcmpeqq|packusdw|movntdqa)(?-i)\b"
+color statement "\b(?i)(extrq|insertq|movntsd|movntss)(?-i)\b"
+color statement "\b(?i)(crc32|pcmpestri|pcmpestrm|pcmpistri|pcmpistrm|pcmpgtq)(?-i)\b"
+color statement "\b(?i)(vfmaddpd|vfmaddps|vfmaddsd|vfmaddss|vfmaddsubpd|vfmaddsubps|vfmsubaddpd|vfmsubaddps|vfmsubpd|vfmsubps|vfmsubsd|vfmsubss|vfnmaddpd|vfnmaddps|vfnmaddsd|vfnmaddss|vfnmsubps|vfnmsubsd|vfnmsubss)(?-i)\b"
+
+# Crypto
+color statement "\b(?i)(aesenc|aesenclast|aesdec|aesdeclast|aeskeygenassist|aesimc)(?-i)\b"
+color statement "\b(?i)(sha1rnds4|sha1nexte|sha1msg1|sha1msg2|sha256rnds2|sha256msg1|sha256msg2)(?-i)\b"
+
+# Undocumented
+color statement "\b(?i)(aam|aad|salc|icebp|loadall|loadalld|ud1)(?-i)\b"
+
+## Registers
+color identifier "\b(?i)(al|ah|bl|bh|cl|ch|dl|dh|bpl|sil|r8b|r9b|r10b|r11b|dil|spl|r12b|r13b|r14b|r15)(?-i)\b"
+color identifier "\b(?i)(cw|sw|tw|fp_ds|fp_opc|fp_ip|fp_dp|fp_cs|cs|ss|ds|es|fs|gs|gdtr|idtr|tr|ldtr|ax|bx|cx|dx|bp|si|r8w|r9w|r10w|r11w|di|sp|r12w|r13w|r14w|r15w|ip)(?-i)\b"
+color identifier "\b(?i)(fp_dp|fp_ip|eax|ebx|ecx|edx|ebp|esi|r8d|r9d|r10d|r11d|edi|esp|r12d|r13d|r14d|r15d|eip|eflags|mxcsr)(?-i)\b"
+color identifier "\b(?i)(mm0|mm1|mm2|mm3|mm4|mm5|mm6|mm7|rax|rbx|rcx|rdx|rbp|rsi|r8|r9|r10|r11|rdi|rsp|r12|r13|r14|r15|rip|rflags|cr0|cr1|cr2|cr3|cr4|cr5|cr6|cr7|cr8|cr9|cr10|cr11|cr12|cr13|cr14|cr15|msw|dr0|dr1|dr2|dr3|r4|dr5|dr6|dr7|dr8|dr9|dr10|dr11|dr12|dr13|dr14|dr15)(?-i)\b"
+color identifier "\b(?i)(st0|st1|st2|st3|st4|st5|st6|st7)(?-i)\b"
+color identifier "\b(?i)(xmm0|xmm1|xmm2|xmm3|xmm4|xmm5|xmm6|xmm7|xmm8|xmm9|xmm10|xmm11|xmm12|xmm13|xmm14|xmm15)(?-i)\b"
+color identifier "\b(?i)(ymm0|ymm1|ymm2|ymm3|ymm4|ymm5|ymm6|ymm7|ymm8|ymm9|ymm10|ymm11|ymm12|ymm13|ymm14|ymm15)(?-i)\b"
+color identifier "\b(?i)(zmm0|zmm1|zmm2|zmm3|zmm4|zmm5|zmm6|zmm7|zmm8|zmm9|zmm10|zmm11|zmm12|zmm13|zmm14|zmm15|zmm16|zmm17|zmm18|zmm19|zmm20|zmm21|zmm22|zmm23|zmm24|zmm25|zmm26|zmm27|zmm28|zmm29|zmm30|zmm31)(?-i)\b"
+
+## Constants
+# Number - it works
+color constant.number "\b(|h|A|0x)+[0-9]+(|h|A)+\b"
+color constant.number "\b0x[0-9 a-f A-F]+\b"
+
+## Preprocessor (NASM)
+color preproc "%+(\+|\?|\?\?|)[a-z A-Z 0-9]+"
+color preproc "%\[[. a-z A-Z 0-9]*\]"
+
+## Other
+color statement "\b(?i)(extern|global|section|segment|_start|\.text|\.data|\.bss)(?-i)\b"
+color statement "\b(?i)(db|dw|dd|dq|dt|ddq|do)(?-i)\b"
+color identifier "[a-z A-Z 0-9 _]+:"
+
+# String
+color constant.string ""(\\.|[^"])*""
+color constant.string "'(\\.|[^'])*'"
+
+## Comments
+color comment ";.*"

runtime/syntax/caddyfile.micro

@@ -0,0 +1,13 @@
+syntax "caddyfile" "Caddyfile"
+
+color identifier "^\s*\S+(\s|$)"
+color type "^([\w.:/-]+,? ?)+[,{]$"
+color constant.specialChar "\s{$"
+color constant.specialChar "^\s*}$"
+color constant.string start="\"" end="\""
+color preproc "\{(\w+|\$\w+|%\w+%)\}"
+color comment "#.*"
+
+# extra and trailing spaces
+color ,red "([[:space:]]{2,}|\t){$"
+color ,red "[[:space:]]+$"

runtime/syntax/conf.micro

@@ -3,8 +3,8 @@
 syntax "conf" "\.c[o]?nf$"
 ## Possible errors and parameters
 ## Strings
-white (i) ""(\\.|[^"])*""
+color constant.string (i) ""(\\.|[^"])*""
 ## Comments
-brightblue (i) "^[[:space:]]*#.*$"
-cyan (i) "^[[:space:]]*##.*$"
+color comment (i) "^[[:space:]]*#.*$"
+color comment (i) "^[[:space:]]*##.*$"
 

runtime/syntax/dart.micro

@@ -0,0 +1,19 @@
+syntax "dart" "\.dart$"
+
+color constant.number   "\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\b"
+color constant.number   "\b[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+color constant.number   "\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
+color statement  "\b(break|case|catch|continue|default|else|finally)\b"
+color statement  "\b(for|function|get|if|in|as|is|new|return|set|switch|final|await|async|sync)\b"
+color statement  "\b(switch|this|throw|try|var|void|while|with|import|library|part|const|export)\b"
+color constant "\b(true|false|null)\b"
+color type     "\b(List|String)\b"
+color type     "\b(int|num|double|bool)\b"
+color statement "[-+/*=<>!~%?:&|]"
+color constant   "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
+color constant   "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
+color comment "(^|[[:space:]])//.*"
+color comment "/\*.+\*/"
+color todo "TODO:?"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"

runtime/syntax/gentoo-ebuild.micro

@@ -2,29 +2,27 @@
 ##
 syntax "ebuild" "\.e(build|class)$"
 ## All the standard portage functions
-color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+color identifier "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
 ## Highlight bash related syntax
-color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color green "-(e|d|f|r|g|u|w|x|L)\>"
-color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color statement "\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\b"
+color statement "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color statement "-(e|d|f|r|g|u|w|x|L)\b"
+color statement "-(eq|ne|gt|lt|ge|le|s|n|z)\b"
 ## Highlight variables ... official portage ones in red, all others in bright red
-color brightred "\$\{?[a-zA-Z_0-9]+\}?"
-color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
-color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color preproc "\$\{?[a-zA-Z_0-9]+\}?"
+color special "\b(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\b"
+color special "\b(S|D|T|PV|PF|P|PN|A)\b" "\bC(XX)?FLAGS\b" "\bLDFLAGS\b" "\bC(HOST|TARGET|BUILD)\b"
 ## Highlight portage commands
-color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
-color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-color brightblue "prepall(docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
-color brightblue "\<(doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color identifier "\buse(_(with|enable))?\b [!a-zA-Z0-9_+ -]*" "inherit.*"
+color statement "\be(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\b"
+color statement "\bdie\b" "\buse(_(with|enable))?\b" "\binherit\b" "\bhas\b" "\b(has|best)_version\b" "\bunpack\b"
+color statement "\b(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\b"
+color statement "\bdo(python|sed|dir|hard|sym|html|jar|mo)\b" "\bkeepdir\b"
+color statement "prepall(docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
+color statement "\b(doc|ins|exe)into\b" "\bf(owners|perms)\b" "\b(exe|ins|dir)opts\b"
 ## Highlight common commands used in ebuilds
-color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
+color type "\bmake\b" "\b(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\b"
 ## Highlight comments (doesnt work that well)
-color yellow "#.*$"
+color comment "#.*$"
 ## Highlight strings (doesnt work that well)
-color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
+color constant.string ""(\\.|[^\"])*"" "'(\\.|[^'])*'"

runtime/syntax/ini.micro

@@ -1,11 +1,9 @@
 syntax "ini" "\.(ini|desktop|lfl|override)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$"
 header "^\[[A-Za-z]+\]$"
 
-color brightcyan "\<(true|false)\>"
-color cyan "^[[:space:]]*[^=]*="
-color brightmagenta "^[[:space:]]*\[.*\]$"
-color red "[=;]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color constant "\b(true|false)\b"
+color identifier "^[[:space:]]*[^=]*="
+color special "^[[:space:]]*\[.*\]$"
+color statement "[=;]"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"

runtime/syntax/json.micro

@@ -1,11 +1,13 @@
 syntax "json" "\.json$"
 header "^\{$"
 
-color blue   "\<[-]?[1-9][0-9]*([Ee][+-]?[0-9]+)?\>"  "\<[-]?[0](\.[0-9]+)?\>"
-color cyan  "\<null\>"
-color brightcyan "\<(true|false)\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightyellow "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
-color magenta   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
+color constant.number   "\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\b"
+color constant.number   "\b[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+color constant.number   "\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+color constant  "\b(null)\b"
+color constant "\b(true|false)\b"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color statement "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
+color constant   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
 color ,green "[[:space:]]+$"
 color ,red "	+ +| +	+"

runtime/syntax/lfe.micro

@@ -0,0 +1,21 @@
+syntax "lfe" "lfe$" "\.lfe$"
+
+# Parens are everywhere!
+color statement "\("
+color statement "\)"
+
+# Good overrides for LFE in particular
+color type "defun|define-syntax|define|defmacro|defmodule|export"
+
+# Dirty base cases stolen from the generic lisp syntax
+color constant "\ [A-Za-z][A-Za-z0-9_-]+\ "
+color statement "\(([-+*/<>]|<=|>=)|'"
+color constant.number "\<[0-9]+\>"
+color constant.string "\"(\\.|[^"])*\""
+color special "['|`][A-Za-z][A-Za-z0-9_-]+"
+color constant.string "\\.?"
+color comment "(^|[[:space:]]);.*"
+
+# Some warning colors because our indents are wrong.
+color ,green "[[:space:]]+$"
+color ,red "	+ +| +	+"

runtime/syntax/micro.micro

@@ -0,0 +1,10 @@
+# Micro syntax by <nickolay02@inbox.ru>
+syntax "micro" "\.(micro)$"
+
+color statement "\b(syntax|color|color-link)\b"
+color statement "\b(start=|end=)\b"
+color identifier "\b(default|comment|identifier|constant|constant|string|constant|number|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|line=number|gutter-error|gutter-warning|cursor-line)\b"
+color constant.number "\b(|h|A|0x)+[0-9]+(|h|A)+\b"
+color constant.number "\b0x[0-9 a-f A-F]+\b"
+color constant.string ""(\\.|[^"])*""
+color comment "#.*"

runtime/syntax/php.micro

@@ -1,40 +1,30 @@
-## PHP Syntax Highlighting
 syntax "php" "\.php[2345s~]?$"
-color white start="<\?(php|=)?" end="\?>"
-# Functions
-color brightblue "([a-zA-Z0-9_-]*)\("
-# Constructs
-color brightblue "(class|extends|goto) ([a-zA-Z0-9_]*)"
-color green "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
-color brightblue "[a-zA-Z0-9]+:"
-# Variables
-color white "\$[a-zA-Z_0-9$]*|[=!<>]"
-color white "\->[a-zA-Z_0-9$]*|[=!<>]"
-# Special Characters
-color yellow "[.,{}();]"
-color yellow "\["
-color yellow "\]"
-color yellow "[=][^>]"
-# Numbers
-color magenta "[+-]*([0-9]\.)*[0-9]+([eE][+-]?([0-9]\.)*[0-9])*"
-color magenta "0x[0-9a-zA-Z]*"
-# Special Variables
-color brightblue "(\$this|parent::|self::|\$this->)"
-# Bitwise Operations
-color magenta "(\;|\||\^){1}"
-# And/Or/SRO/etc
-color green "(\;\;|\|\||::|=>|->)"
-# Online Comments
-color brightyellow "(#.*|//.*)$"
-# STRINGS!
-color red "('[^']*')|(\"[^\"]*\")"
-# Inline Variables
-color white "\{\$[^}]*\}"
-# PHP Tags
-color red "(<\?(php)?|\?>)"
-# General HTML
-color red start="\?>" end="<\?(php|=)?"
-# trailing whitespace
-color ,green "[^[:space:]]{1}[[:space:]]+$"
-# multi-line comments
-color brightyellow start="/\*" end="\*/"
+color default start="<\?(php|=)?" end="\?>"
+
+color special "([a-zA-Z0-9_-]+)\("
+
+color identifier "(var|class|goto|extends|function|echo|case|break|default|exit|switch|foreach|endforeach|while|const|static|extends|as|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|interface|[E|e]xception|array|int|string|bool)[\s|\)]"
+
+color identifier "[a-zA-Z\\]+::"
+
+color identifier "new\s([a-zA-Z0-9\\]+)"
+color identifier "([A-Z][a-zA-Z0-9_]+)\s"
+color identifier "([A-Z0-9_]+)[;|\s|\)|,]"
+
+color statement "(implements|abstract|global|public|instanceof|private|protected|static|if|else|elseif|endif|namespace|use|as|new|throw|catch|try|return)[\s|;]"
+
+color constant "(true|false|null|TRUE|FALSE|NULL)"
+
+color constant "[\s|=|>|\s|\(|/|+|-|\*|\[](\d+)"
+
+color identifier "(\$this|parent|self|\$this->)"
+
+color statement "(=>|===|!==|==|!=|&&|\|\||::|=|->|\!)"
+
+color default "(\$[a-zA-Z0-9\-_]+)"
+color default "[\(|\)|/|+|-|\*|\[|,|;]"
+
+color constant.string "('.*?'|\".*?\")"
+
+color comment start="/\*" end="\*/"
+color comment "(#.*|//.*)$"

runtime/syntax/sh.micro

@@ -1,4 +1,4 @@
-syntax "shell" "\.sh$" "\.bash" "\.bashrc" "bashrc" "\.bash_aliases" "bash_aliases" "\.bash_functions" "bash_functions" "\.bash_profile" "bash_profile" "Pkgfile" "PKGBUILD" ".ebuild\$" "APKBUILD"
+syntax "shell" "\.sh$" "\.bash" "\.bashrc" "bashrc" "\.bash_aliases" "bash_aliases" "\.bash_functions" "bash_functions" "\.bash_profile" "bash_profile" "Pkgfile" "pkgmk.conf" "profile" "rc.conf" "PKGBUILD" ".ebuild\$" "APKBUILD"
 header "^#!.*/(env +)?(ba)?sh( |$)"
 
 # Numbers

runtime/syntax/yaml.micro

@@ -1,13 +1,11 @@
 syntax "yaml" "\.ya?ml$"
 header "^---" "%YAML"
 
-color green     "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
-color brightcyan  "\<(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\>"
-color brightcyan "\<(true|false)\>"
-color red ":[[:space:]]" "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
-color brightyellow "[[:space:]][\*&][A-Za-z0-9]+"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color brightmagenta  "^---" "^\.\.\." "^%YAML" "^%TAG"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color type     "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
+color constant  "\b(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\b"
+color constant "\b(true|false)\b"
+color statement ":[[:space:]]" "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
+color identifier "[[:space:]][\*&][A-Za-z0-9]+"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color special  "^---" "^\.\.\." "^%YAML" "^%TAG"