feat: Added syntax highlighting to textfile widget.

2025-01-18 04:03:14 -08:00 · 2018-07-20 12:10:08 +05:30 · 2018-07-20 12:10:08 +05:30 · e8f726696d
commit e8f726696d
parent 0d713325dc
114 changed files with 4609 additions and 2 deletions
--- a/Gopkg.lock
+++ b/Gopkg.lock
@ -130,6 +130,12 @@
  packages = ["."]
  revision = "7c9c2852e8f9e69a80bff4f4f1fe4cdd15eeba19"

+[[projects]]
+  branch = "master"
+  name = "github.com/zyedidia/highlight"
+  packages = ["."]
+  revision = "201131ce5cf5ba174570dcd878d1f2698db5af9f"
+
 [[projects]]
  branch = "master"
  name = "golang.org/x/net"
@ -201,6 +207,6 @@
 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "a7a00554f9040d7617458773eafa64b82f9502eace145152cb50eb082800e936"
+  inputs-digest = "44328d9f71a21b64ed00b346dd77be8af49d0542f393f3e17c52de6125c57e24"
  solver-name = "gps-cdcl"
  solver-version = 1
--- a/textfile/widget.go
+++ b/textfile/widget.go
@ -1,12 +1,16 @@
 package textfile

 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
+	"os"
+	"strings"

 	"github.com/gdamore/tcell"
 	"github.com/rivo/tview"
 	"github.com/senorprogrammer/wtf/wtf"
+	"github.com/zyedidia/highlight"
 )

 const HelpText = `
@ -57,7 +61,87 @@ func (widget *Widget) Refresh() {
 	if err != nil {
 		widget.View.SetText(err.Error())
 	} else {
+		var (
+			defs   []*highlight.Def
+			buffer bytes.Buffer
+		)
+
+		gopath := os.Getenv("GOPATH")
+		files, err := ioutil.ReadDir(gopath + "/src/github.com/senorprogrammer/wtf/vendor/github.com/zyedidia/highlight/syntax_files")
+		if err != nil {
+			widget.View.SetText(err.Error())
+			return
+		}
+
+		// Iterate over available syntax files if any def matches.
+		for _, f := range files {
+			if strings.HasSuffix(f.Name(), ".yaml") {
+				input, _ := ioutil.ReadFile(gopath + "/src/github.com/senorprogrammer/wtf/vendor/github.com/zyedidia/highlight/syntax_files/" + f.Name())
+				d, err := highlight.ParseDef(input)
+				if err != nil {
+					fmt.Println(err)
+					continue
+				}
+				defs = append(defs, d)
+			}
+		}
+
+		highlight.ResolveIncludes(defs)
+		// Attempt to detect the filetype.
+		def := highlight.DetectFiletype(defs, filePath, bytes.Split(fileData, []byte("\n"))[0])
+		// If no highlighter found, dont modify.
+		if def == nil {
 			widget.View.SetText(string(fileData))
+			return
+		}
+
+		// Add highlight information to the text based on matches.
+		h := highlight.NewHighlighter(def)
+		matches := h.HighlightString(string(fileData))
+
+		lines := strings.Split(string(fileData), "\n")
+		for lineN, l := range lines {
+			colN := 0
+			for _, c := range l {
+				if group, ok := matches[lineN][colN]; ok {
+					// There are more possible groups available than just these ones
+					if group == highlight.Groups["statement"] {
+						buffer.WriteString("[green]")
+					} else if group == highlight.Groups["identifier"] {
+						buffer.WriteString("[blue]")
+					} else if group == highlight.Groups["preproc"] {
+						buffer.WriteString("[darkred]")
+					} else if group == highlight.Groups["special"] {
+						buffer.WriteString("[red]")
+					} else if group == highlight.Groups["constant.string"] {
+						buffer.WriteString("[cyan]")
+					} else if group == highlight.Groups["constant"] {
+						buffer.WriteString("[lightcyan]")
+					} else if group == highlight.Groups["constant.specialChar"] {
+						buffer.WriteString("[magenta]")
+					} else if group == highlight.Groups["type"] {
+						buffer.WriteString("[yellow]")
+					} else if group == highlight.Groups["constant.number"] {
+						buffer.WriteString("[darkcyan]")
+					} else if group == highlight.Groups["comment"] {
+						buffer.WriteString("[darkgreen]")
+					} else {
+						buffer.WriteString("[default]")
+					}
+				}
+				buffer.WriteString(string(c))
+				colN++
+			}
+			if group, ok := matches[lineN][colN]; ok {
+				if group == highlight.Groups["default"] || group == highlight.Groups[""] {
+					buffer.WriteString("[default]") // Handle default fallback after setting.
+				}
+			}
+
+			buffer.WriteString("\n")
+		}
+
+		widget.View.SetText(buffer.String())
 	}
 }

--- a/vendor/github.com/zyedidia/highlight/LICENSE
+++ b/vendor/github.com/zyedidia/highlight/LICENSE
@ -0,0 +1,23 @@
+Highlight is licensed under the MIT "Expat" License:
+
+Copyright (c) 2016: Zachary Yedidia.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
--- a/vendor/github.com/zyedidia/highlight/README.md
+++ b/vendor/github.com/zyedidia/highlight/README.md
@ -0,0 +1,127 @@
+# Highlight
+[![Go Report Card](https://goreportcard.com/badge/github.com/zyedidia/highlight)](https://goreportcard.com/report/github.com/zyedidia/highlight)
+[![GoDoc](https://godoc.org/github.com/zyedidia/highlight?status.svg)](http://godoc.org/github.com/zyedidia/highlight)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/zyedidia/highlight/blob/master/LICENSE)
+
+This is a package for syntax highlighting a large number of different languages. To see the list of
+languages currently supported, see the [`syntax_files`](./syntax_files) directory.
+
+Highlight allows you to pass in a string and get back all the information you need to syntax highlight
+that string well.
+
+This project is still a work in progress and more features and documentation will be coming later.
+
+# Installation
+
+```
+go get github.com/zyedidia/highlight
+```
+
+# Usage
+
+Here is how to use this package to highlight a string. We will also be using `github.com/fatih/color` to actually
+colorize the output to the console.
+
+```go
+package main
+
+import (
+    "fmt"
+    "io/ioutil"
+    "strings"
+
+    "github.com/fatih/color"
+    "github.com/zyedidia/highlight"
+)
+
+func main() {
+    // Here is the go code we will highlight
+    inputString := `package main
+
+import "fmt"
+
+// A hello world program
+func main() {
+    fmt.Println("Hello world")
+}`
+
+    // Load the go syntax file
+    // Make sure that the syntax_files directory is in the current directory
+    syntaxFile, _ := ioutil.ReadFile("highlight/syntax_files/go.yaml")
+
+    // Parse it into a `*highlight.Def`
+    syntaxDef, err := highlight.ParseDef(syntaxFile)
+    if err != nil {
+        fmt.Println(err)
+        return
+    }
+
+    // Make a new highlighter from the definition
+    h := highlight.NewHighlighter(syntaxDef)
+    // Highlight the string
+    // Matches is an array of maps which point to groups
+    // matches[lineNum][colNum] will give you the change in group at that line and column number
+    // Note that there is only a group at a line and column number if the syntax highlighting changed at that position
+    matches := h.HighlightString(inputString)
+
+    // We split the string into a bunch of lines
+    // Now we will print the string
+    lines := strings.Split(inputString, "\n")
+    for lineN, l := range lines {
+        for colN, c := range l {
+            // Check if the group changed at the current position
+            if group, ok := matches[lineN][colN]; ok {
+                // Check the group name and set the color accordingly (the colors chosen are arbitrary)
+                if group == highlight.Groups["statement"] {
+                    color.Set(color.FgGreen)
+                } else if group == highlight.Groups["preproc"] {
+                    color.Set(color.FgHiRed)
+                } else if group == highlight.Groups["special"] {
+                    color.Set(color.FgBlue)
+                } else if group == highlight.Groups["constant.string"] {
+                    color.Set(color.FgCyan)
+                } else if group == highlight.Groups["constant.specialChar"] {
+                    color.Set(color.FgHiMagenta)
+                } else if group == highlight.Groups["type"] {
+                    color.Set(color.FgYellow)
+                } else if group == highlight.Groups["constant.number"] {
+                    color.Set(color.FgCyan)
+                } else if group == highlight.Groups["comment"] {
+                    color.Set(color.FgHiGreen)
+                } else {
+                    color.Unset()
+                }
+            }
+            // Print the character
+            fmt.Print(string(c))
+        }
+        // This is at a newline, but highlighting might have been turned off at the very end of the line so we should check that.
+        if group, ok := matches[lineN][len(l)]; ok {
+            if group == highlight.Groups["default"] || group == highlight.Groups[""] {
+                color.Unset()
+            }
+        }
+
+        fmt.Print("\n")
+    }
+}
+```
+
+If you would like to automatically detect the filetype of a file based on the filename, and have the appropriate definition returned,
+you can use the `DetectFiletype` function:
+
+```go
+// Name of the file
+filename := ...
+// The first line of the file (needed to check the filetype by header: e.g. `#!/bin/bash` means shell)
+firstLine := ...
+
+// Parse all the syntax files in an array with type []*highlight.Def
+var defs []*highlight.Def
+...
+
+def := highlight.DetectFiletype(defs, filename, firstLine)
+fmt.Println("Filetype is", def.FileType)
+```
+
+For a full example, see the [`syncat`](./examples) example which acts like cat but will syntax highlight the output (if highlight recognizes the filetype).
--- a/vendor/github.com/zyedidia/highlight/ftdetect.go
+++ b/vendor/github.com/zyedidia/highlight/ftdetect.go
@ -0,0 +1,22 @@
+package highlight
+
+// DetectFiletype will use the list of syntax definitions provided and the filename and first line of the file
+// to determine the filetype of the file
+// It will return the corresponding syntax definition for the filetype
+func DetectFiletype(defs []*Def, filename string, firstLine []byte) *Def {
+	for _, d := range defs {
+		if d.ftdetect[0].MatchString(filename) {
+			return d
+		}
+		if len(d.ftdetect) > 1 {
+			if d.ftdetect[1].MatchString(string(firstLine)) {
+				return d
+			}
+		}
+	}
+
+	emptyDef := new(Def)
+	emptyDef.FileType = "Unknown"
+	emptyDef.rules = new(rules)
+	return emptyDef
+}
--- a/vendor/github.com/zyedidia/highlight/highlighter.go
+++ b/vendor/github.com/zyedidia/highlight/highlighter.go
@ -0,0 +1,374 @@
+package highlight
+
+import (
+	"regexp"
+	"strings"
+	"unicode/utf8"
+)
+
+// RunePos returns the rune index of a given byte index
+// This could cause problems if the byte index is between code points
+func runePos(p int, str string) int {
+	if p < 0 {
+		return 0
+	}
+	if p >= len(str) {
+		return utf8.RuneCountInString(str)
+	}
+	return utf8.RuneCountInString(str[:p])
+}
+
+func combineLineMatch(src, dst LineMatch) LineMatch {
+	for k, v := range src {
+		if g, ok := dst[k]; ok {
+			if g == 0 {
+				dst[k] = v
+			}
+		} else {
+			dst[k] = v
+		}
+	}
+	return dst
+}
+
+// A State represents the region at the end of a line
+type State *region
+
+// LineStates is an interface for a buffer-like object which can also store the states and matches for every line
+type LineStates interface {
+	Line(n int) string
+	LinesNum() int
+	State(lineN int) State
+	SetState(lineN int, s State)
+	SetMatch(lineN int, m LineMatch)
+}
+
+// A Highlighter contains the information needed to highlight a string
+type Highlighter struct {
+	lastRegion *region
+	Def        *Def
+}
+
+// NewHighlighter returns a new highlighter from the given syntax definition
+func NewHighlighter(def *Def) *Highlighter {
+	h := new(Highlighter)
+	h.Def = def
+	return h
+}
+
+// LineMatch represents the syntax highlighting matches for one line. Each index where the coloring is changed is marked with that
+// color's group (represented as one byte)
+type LineMatch map[int]Group
+
+func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []rune, canMatchStart, canMatchEnd bool) []int {
+	regexStr := regex.String()
+	if strings.Contains(regexStr, "^") {
+		if !canMatchStart {
+			return nil
+		}
+	}
+	if strings.Contains(regexStr, "$") {
+		if !canMatchEnd {
+			return nil
+		}
+	}
+
+	var strbytes []byte
+	if skip != nil {
+		strbytes = skip.ReplaceAllFunc([]byte(string(str)), func(match []byte) []byte {
+			res := make([]byte, utf8.RuneCount(match))
+			return res
+		})
+	} else {
+		strbytes = []byte(string(str))
+	}
+
+	match := regex.FindIndex(strbytes)
+	if match == nil {
+		return nil
+	}
+	// return []int{match.Index, match.Index + match.Length}
+	return []int{runePos(match[0], string(str)), runePos(match[1], string(str))}
+}
+
+func findAllIndex(regex *regexp.Regexp, str []rune, canMatchStart, canMatchEnd bool) [][]int {
+	regexStr := regex.String()
+	if strings.Contains(regexStr, "^") {
+		if !canMatchStart {
+			return nil
+		}
+	}
+	if strings.Contains(regexStr, "$") {
+		if !canMatchEnd {
+			return nil
+		}
+	}
+	matches := regex.FindAllIndex([]byte(string(str)), -1)
+	for i, m := range matches {
+		matches[i][0] = runePos(m[0], string(str))
+		matches[i][1] = runePos(m[1], string(str))
+	}
+	return matches
+}
+
+func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, curRegion *region, statesOnly bool) LineMatch {
+	// highlights := make(LineMatch)
+
+	if start == 0 {
+		if !statesOnly {
+			if _, ok := highlights[0]; !ok {
+				highlights[0] = curRegion.group
+			}
+		}
+	}
+
+	loc := findIndex(curRegion.end, curRegion.skip, line, start == 0, canMatchEnd)
+	if loc != nil {
+		if !statesOnly {
+			highlights[start+loc[0]] = curRegion.limitGroup
+		}
+		if curRegion.parent == nil {
+			if !statesOnly {
+				highlights[start+loc[1]] = 0
+				h.highlightRegion(highlights, start, false, lineNum, line[:loc[0]], curRegion, statesOnly)
+			}
+			h.highlightEmptyRegion(highlights, start+loc[1], canMatchEnd, lineNum, line[loc[1]:], statesOnly)
+			return highlights
+		}
+		if !statesOnly {
+			highlights[start+loc[1]] = curRegion.parent.group
+			h.highlightRegion(highlights, start, false, lineNum, line[:loc[0]], curRegion, statesOnly)
+		}
+		h.highlightRegion(highlights, start+loc[1], canMatchEnd, lineNum, line[loc[1]:], curRegion.parent, statesOnly)
+		return highlights
+	}
+
+	if len(line) == 0 || statesOnly {
+		if canMatchEnd {
+			h.lastRegion = curRegion
+		}
+
+		return highlights
+	}
+
+	firstLoc := []int{len(line), 0}
+
+	var firstRegion *region
+	for _, r := range curRegion.rules.regions {
+		loc := findIndex(r.start, nil, line, start == 0, canMatchEnd)
+		if loc != nil {
+			if loc[0] < firstLoc[0] {
+				firstLoc = loc
+				firstRegion = r
+			}
+		}
+	}
+	if firstLoc[0] != len(line) {
+		highlights[start+firstLoc[0]] = firstRegion.limitGroup
+		h.highlightRegion(highlights, start, false, lineNum, line[:firstLoc[0]], curRegion, statesOnly)
+		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, line[firstLoc[1]:], firstRegion, statesOnly)
+		return highlights
+	}
+
+	fullHighlights := make([]Group, len([]rune(string(line))))
+	for i := 0; i < len(fullHighlights); i++ {
+		fullHighlights[i] = curRegion.group
+	}
+
+	for _, p := range curRegion.rules.patterns {
+		matches := findAllIndex(p.regex, line, start == 0, canMatchEnd)
+		for _, m := range matches {
+			for i := m[0]; i < m[1]; i++ {
+				fullHighlights[i] = p.group
+			}
+		}
+	}
+	for i, h := range fullHighlights {
+		if i == 0 || h != fullHighlights[i-1] {
+			// if _, ok := highlights[start+i]; !ok {
+			highlights[start+i] = h
+			// }
+		}
+	}
+
+	if canMatchEnd {
+		h.lastRegion = curRegion
+	}
+
+	return highlights
+}
+
+func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, statesOnly bool) LineMatch {
+	if len(line) == 0 {
+		if canMatchEnd {
+			h.lastRegion = nil
+		}
+		return highlights
+	}
+
+	firstLoc := []int{len(line), 0}
+	var firstRegion *region
+	for _, r := range h.Def.rules.regions {
+		loc := findIndex(r.start, nil, line, start == 0, canMatchEnd)
+		if loc != nil {
+			if loc[0] < firstLoc[0] {
+				firstLoc = loc
+				firstRegion = r
+			}
+		}
+	}
+	if firstLoc[0] != len(line) {
+		if !statesOnly {
+			highlights[start+firstLoc[0]] = firstRegion.limitGroup
+		}
+		h.highlightEmptyRegion(highlights, start, false, lineNum, line[:firstLoc[0]], statesOnly)
+		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, line[firstLoc[1]:], firstRegion, statesOnly)
+		return highlights
+	}
+
+	if statesOnly {
+		if canMatchEnd {
+			h.lastRegion = nil
+		}
+
+		return highlights
+	}
+
+	fullHighlights := make([]Group, len(line))
+	for _, p := range h.Def.rules.patterns {
+		matches := findAllIndex(p.regex, line, start == 0, canMatchEnd)
+		for _, m := range matches {
+			for i := m[0]; i < m[1]; i++ {
+				fullHighlights[i] = p.group
+			}
+		}
+	}
+	for i, h := range fullHighlights {
+		if i == 0 || h != fullHighlights[i-1] {
+			// if _, ok := highlights[start+i]; !ok {
+			highlights[start+i] = h
+			// }
+		}
+	}
+
+	if canMatchEnd {
+		h.lastRegion = nil
+	}
+
+	return highlights
+}
+
+// HighlightString syntax highlights a string
+// Use this function for simple syntax highlighting and use the other functions for
+// more advanced syntax highlighting. They are optimized for quick rehighlighting of the same
+// text with minor changes made
+func (h *Highlighter) HighlightString(input string) []LineMatch {
+	lines := strings.Split(input, "\n")
+	var lineMatches []LineMatch
+
+	for i := 0; i < len(lines); i++ {
+		line := []rune(lines[i])
+		highlights := make(LineMatch)
+
+		if i == 0 || h.lastRegion == nil {
+			lineMatches = append(lineMatches, h.highlightEmptyRegion(highlights, 0, true, i, line, false))
+		} else {
+			lineMatches = append(lineMatches, h.highlightRegion(highlights, 0, true, i, line, h.lastRegion, false))
+		}
+	}
+
+	return lineMatches
+}
+
+// HighlightStates correctly sets all states for the buffer
+func (h *Highlighter) HighlightStates(input LineStates) {
+	for i := 0; i < input.LinesNum(); i++ {
+		line := []rune(input.Line(i))
+		// highlights := make(LineMatch)
+
+		if i == 0 || h.lastRegion == nil {
+			h.highlightEmptyRegion(nil, 0, true, i, line, true)
+		} else {
+			h.highlightRegion(nil, 0, true, i, line, h.lastRegion, true)
+		}
+
+		curState := h.lastRegion
+
+		input.SetState(i, curState)
+	}
+}
+
+// HighlightMatches sets the matches for each line in between startline and endline
+// It sets all other matches in the buffer to nil to conserve memory
+// This assumes that all the states are set correctly
+func (h *Highlighter) HighlightMatches(input LineStates, startline, endline int) {
+	for i := startline; i < endline; i++ {
+		if i >= input.LinesNum() {
+			break
+		}
+
+		line := []rune(input.Line(i))
+		highlights := make(LineMatch)
+
+		var match LineMatch
+		if i == 0 || input.State(i-1) == nil {
+			match = h.highlightEmptyRegion(highlights, 0, true, i, line, false)
+		} else {
+			match = h.highlightRegion(highlights, 0, true, i, line, input.State(i-1), false)
+		}
+
+		input.SetMatch(i, match)
+	}
+}
+
+// ReHighlightStates will scan down from `startline` and set the appropriate end of line state
+// for each line until it comes across the same state in two consecutive lines
+func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {
+	// lines := input.LineData()
+
+	h.lastRegion = nil
+	if startline > 0 {
+		h.lastRegion = input.State(startline - 1)
+	}
+	for i := startline; i < input.LinesNum(); i++ {
+		line := []rune(input.Line(i))
+		// highlights := make(LineMatch)
+
+		// var match LineMatch
+		if i == 0 || h.lastRegion == nil {
+			h.highlightEmptyRegion(nil, 0, true, i, line, true)
+		} else {
+			h.highlightRegion(nil, 0, true, i, line, h.lastRegion, true)
+		}
+		curState := h.lastRegion
+		lastState := input.State(i)
+
+		input.SetState(i, curState)
+
+		if curState == lastState {
+			break
+		}
+	}
+}
+
+// ReHighlightLine will rehighlight the state and match for a single line
+func (h *Highlighter) ReHighlightLine(input LineStates, lineN int) {
+	line := []rune(input.Line(lineN))
+	highlights := make(LineMatch)
+
+	h.lastRegion = nil
+	if lineN > 0 {
+		h.lastRegion = input.State(lineN - 1)
+	}
+
+	var match LineMatch
+	if lineN == 0 || h.lastRegion == nil {
+		match = h.highlightEmptyRegion(highlights, 0, true, lineN, line, false)
+	} else {
+		match = h.highlightRegion(highlights, 0, true, lineN, line, h.lastRegion, false)
+	}
+	curState := h.lastRegion
+
+	input.SetMatch(lineN, match)
+	input.SetState(lineN, curState)
+}
--- a/vendor/github.com/zyedidia/highlight/parser.go
+++ b/vendor/github.com/zyedidia/highlight/parser.go
@ -0,0 +1,265 @@
+package highlight
+
+import (
+	"fmt"
+	"regexp"
+
+	"gopkg.in/yaml.v2"
+)
+
+// A Group represents a syntax group
+type Group uint8
+
+// Groups contains all of the groups that are defined
+// You can access them in the map via their string name
+var Groups map[string]Group
+var numGroups Group
+
+// String returns the group name attached to the specific group
+func (g Group) String() string {
+	for k, v := range Groups {
+		if v == g {
+			return k
+		}
+	}
+	return ""
+}
+
+// A Def is a full syntax definition for a language
+// It has a filetype, information about how to detect the filetype based
+// on filename or header (the first line of the file)
+// Then it has the rules which define how to highlight the file
+type Def struct {
+	FileType string
+	ftdetect []*regexp.Regexp
+	rules    *rules
+}
+
+// A Pattern is one simple syntax rule
+// It has a group that the rule belongs to, as well as
+// the regular expression to match the pattern
+type pattern struct {
+	group Group
+	regex *regexp.Regexp
+}
+
+// rules defines which patterns and regions can be used to highlight
+// a filetype
+type rules struct {
+	regions  []*region
+	patterns []*pattern
+	includes []string
+}
+
+// A region is a highlighted region (such as a multiline comment, or a string)
+// It belongs to a group, and has start and end regular expressions
+// A region also has rules of its own that only apply when matching inside the
+// region and also rules from the above region do not match inside this region
+// Note that a region may contain more regions
+type region struct {
+	group      Group
+	limitGroup Group
+	parent     *region
+	start      *regexp.Regexp
+	end        *regexp.Regexp
+	skip       *regexp.Regexp
+	rules      *rules
+}
+
+func init() {
+	Groups = make(map[string]Group)
+}
+
+// ParseDef parses an input syntax file into a highlight Def
+func ParseDef(input []byte) (s *Def, err error) {
+	// This is just so if we have an error, we can exit cleanly and return the parse error to the user
+	defer func() {
+		if e := recover(); e != nil {
+			err = e.(error)
+		}
+	}()
+
+	var rules map[interface{}]interface{}
+	if err = yaml.Unmarshal(input, &rules); err != nil {
+		return nil, err
+	}
+
+	s = new(Def)
+
+	for k, v := range rules {
+		if k == "filetype" {
+			filetype := v.(string)
+
+			s.FileType = filetype
+		} else if k == "detect" {
+			ftdetect := v.(map[interface{}]interface{})
+			if len(ftdetect) >= 1 {
+				syntax, err := regexp.Compile(ftdetect["filename"].(string))
+				if err != nil {
+					return nil, err
+				}
+
+				s.ftdetect = append(s.ftdetect, syntax)
+			}
+			if len(ftdetect) >= 2 {
+				header, err := regexp.Compile(ftdetect["header"].(string))
+				if err != nil {
+					return nil, err
+				}
+
+				s.ftdetect = append(s.ftdetect, header)
+			}
+		} else if k == "rules" {
+			inputRules := v.([]interface{})
+
+			rules, err := parseRules(inputRules, nil)
+			if err != nil {
+				return nil, err
+			}
+
+			s.rules = rules
+		}
+	}
+
+	return s, err
+}
+
+// ResolveIncludes will sort out the rules for including other filetypes
+// You should call this after parsing all the Defs
+func ResolveIncludes(defs []*Def) {
+	for _, d := range defs {
+		resolveIncludesInDef(defs, d)
+	}
+}
+
+func resolveIncludesInDef(defs []*Def, d *Def) {
+	for _, lang := range d.rules.includes {
+		for _, searchDef := range defs {
+			if lang == searchDef.FileType {
+				d.rules.patterns = append(d.rules.patterns, searchDef.rules.patterns...)
+				d.rules.regions = append(d.rules.regions, searchDef.rules.regions...)
+			}
+		}
+	}
+	for _, r := range d.rules.regions {
+		resolveIncludesInRegion(defs, r)
+		r.parent = nil
+	}
+}
+
+func resolveIncludesInRegion(defs []*Def, region *region) {
+	for _, lang := range region.rules.includes {
+		for _, searchDef := range defs {
+			if lang == searchDef.FileType {
+				region.rules.patterns = append(region.rules.patterns, searchDef.rules.patterns...)
+				region.rules.regions = append(region.rules.regions, searchDef.rules.regions...)
+			}
+		}
+	}
+	for _, r := range region.rules.regions {
+		resolveIncludesInRegion(defs, r)
+		r.parent = region
+	}
+}
+
+func parseRules(input []interface{}, curRegion *region) (*rules, error) {
+	rules := new(rules)
+
+	for _, v := range input {
+		rule := v.(map[interface{}]interface{})
+		for k, val := range rule {
+			group := k
+
+			switch object := val.(type) {
+			case string:
+				if k == "include" {
+					rules.includes = append(rules.includes, object)
+				} else {
+					// Pattern
+					r, err := regexp.Compile(object)
+					if err != nil {
+						return nil, err
+					}
+
+					groupStr := group.(string)
+					if _, ok := Groups[groupStr]; !ok {
+						numGroups++
+						Groups[groupStr] = numGroups
+					}
+					groupNum := Groups[groupStr]
+					rules.patterns = append(rules.patterns, &pattern{groupNum, r})
+				}
+			case map[interface{}]interface{}:
+				// region
+				region, err := parseRegion(group.(string), object, curRegion)
+				if err != nil {
+					return nil, err
+				}
+				rules.regions = append(rules.regions, region)
+			default:
+				return nil, fmt.Errorf("Bad type %T", object)
+			}
+		}
+	}
+
+	return rules, nil
+}
+
+func parseRegion(group string, regionInfo map[interface{}]interface{}, prevRegion *region) (*region, error) {
+	var err error
+
+	region := new(region)
+	if _, ok := Groups[group]; !ok {
+		numGroups++
+		Groups[group] = numGroups
+	}
+	groupNum := Groups[group]
+	region.group = groupNum
+	region.parent = prevRegion
+
+	region.start, err = regexp.Compile(regionInfo["start"].(string))
+
+	if err != nil {
+		return nil, err
+	}
+
+	region.end, err = regexp.Compile(regionInfo["end"].(string))
+
+	if err != nil {
+		return nil, err
+	}
+
+	// skip is optional
+	if _, ok := regionInfo["skip"]; ok {
+		region.skip, err = regexp.Compile(regionInfo["skip"].(string))
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// limit-color is optional
+	if _, ok := regionInfo["limit-group"]; ok {
+		groupStr := regionInfo["limit-group"].(string)
+		if _, ok := Groups[groupStr]; !ok {
+			numGroups++
+			Groups[groupStr] = numGroups
+		}
+		groupNum := Groups[groupStr]
+		region.limitGroup = groupNum
+
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		region.limitGroup = region.group
+	}
+
+	region.rules, err = parseRules(regionInfo["rules"].([]interface{}), region)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return region, nil
+}
--- a/vendor/github.com/zyedidia/highlight/syntax_files/README.md
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/README.md
@ -0,0 +1,11 @@
+# Syntax Files
+
+Here are highlights's syntax files.
+
+Each yaml file specifies how to detect the filetype based on file extension or headers (first line of the file).
+Then there are patterns and regions linked to highlight groups which tell micro how to highlight that filetype.
+
+Making your own syntax files is very simple. I recommend you check the file after you are finished with the
+[`syntax_checker.go`](./syntax_checker.go) program (located in this directory). Just place your yaml syntax
+file in the current directory and run `go run syntax_checker.go` and it will check every file. If there are no
+errors it will print `No issues!`.
--- a/vendor/github.com/zyedidia/highlight/syntax_files/apacheconf.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/apacheconf.yaml
@ -0,0 +1,59 @@
+filetype: apacheconf
+
+detect:
+    filename: "httpd\\.conf|mime\\.types|vhosts\\.d\\\\*|\\.htaccess"
+
+rules:
+    - identifier: "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
+    - identifier: "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)"
+    - identifier: "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)"
+    - identifier: "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
+    - identifier: "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
+    - identifier: "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
+    - identifier: "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
+    - identifier: "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
+    - identifier: "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
+    - identifier: "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
+    - identifier: "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
+    - identifier: "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
+    - identifier: "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
+    - identifier: "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
+    - identifier: "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)"
+    - identifier: "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
+    - identifier: "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
+    - identifier: "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
+    - identifier: "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
+    - identifier: "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
+    - identifier: "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
+    - identifier: "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
+    - identifier: "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)"
+    - identifier: "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
+    - identifier: "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
+    - identifier: "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
+    - identifier: "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)"
+    - identifier: "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)"
+    - identifier: "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)"
+    - identifier: "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
+    - identifier: "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
+    - identifier: "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
+    - identifier: "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
+    - identifier: "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
+    - identifier: "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
+    - identifier: "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
+    - symbol.tag: "<[^>]+>"
+    - identifier: "</?[A-Za-z]+"
+    - identifier: "(<|</|>)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/arduino.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/arduino.yaml
@ -0,0 +1,101 @@
+filetype: ino
+
+detect:
+    filename: "\\.?ino$"
+
+rules:
+    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b" 
+
+      ## 
+    - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
+
+      ## Constants
+    - constant: "(?i)\\b(HIGH|LOW|INPUT|OUTPUT)\\b"
+
+      ## Serial Print
+    - constant: "(?i)\\b(DEC|BIN|HEX|OCT|BYTE)\\b"
+
+      ## PI Constants
+    - constant: "(?i)\\b(PI|HALF_PI|TWO_PI)\\b"
+
+      ## ShiftOut
+    - constant: "(?i)\\b(LSBFIRST|MSBFIRST)\\b"
+
+      ## Attach Interrupt
+    - constant: "(?i)\\b(CHANGE|FALLING|RISING)\\b"
+
+      ## Analog Reference
+    - constant: "(?i)\\b(DEFAULT|EXTERNAL|INTERNAL|INTERNAL1V1|INTERNAL2V56)\\b"
+
+      ## === FUNCTIONS === ##
+
+      ## Data Types
+    - type: "\\b(boolean|byte|char|float|int|long|word)\\b"
+
+      ## Control Structions
+    - statement: "\\b(case|class|default|do|double|else|false|for|if|new|null|private|protected|public|short|signed|static|String|switch|this|throw|try|true|unsigned|void|while)\\b" 
+    - statement: "\\b(goto|continue|break|return)\\b"
+
+      ## Math
+    - identifier: "\\b(abs|acos|asin|atan|atan2|ceil|constrain|cos|degrees|exp|floor|log|map|max|min|radians|random|randomSeed|round|sin|sq|sqrt|tan)\\b"
+
+      ## Bits & Bytes
+    - identifier: "\\b(bitRead|bitWrite|bitSet|bitClear|bit|highByte|lowByte)\\b"
+
+      ## Analog I/O
+    - identifier: "\\b(analogReference|analogRead|analogWrite)\\b"
+
+      ## External Interrupts
+    - identifier: "\\b(attachInterrupt|detachInterrupt)\\b"
+
+      ## Time
+    - identifier: "\\b(delay|delayMicroseconds|millis|micros)\\b"
+
+      ## Digital I/O
+    - identifier: "\\b(pinMode|digitalWrite|digitalRead)\\b"
+
+      ## Interrupts
+    - identifier: "\\b(interrupts|noInterrupts)\\b"
+
+      ## Advanced I/O
+    - identifier: "\\b(noTone|pulseIn|shiftIn|shiftOut|tone)\\b"
+
+      ## Serial
+    - identifier: "\\b(Serial|Serial1|Serial2|Serial3|begin|end|peek|read|print|println|available|flush)\\b"
+
+      ## Structure
+    - identifier: "\\b(setup|loop)\\b"
+
+      ## 
+    - statement: "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
+
+      ## GCC builtins
+    - constant: "(__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - preproc: "..+"
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/asciidoc.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/asciidoc.yaml
@ -0,0 +1,51 @@
+filetype: asciidoc
+
+detect:
+    filename: "\\.(asc|asciidoc|adoc)$"
+
+rules:
+    # main header
+    - preproc: "^====+$"
+      # h1
+    - statement: "^==[[:space:]].*$"
+    - statement: "^----+$"
+      # h2
+    - symbol: "^===[[:space:]].*$"
+    - symbol: "^~~~~+$"
+      # h4
+    - type: "^====[[:space:]].*$"
+    - type: "^\\^\\^\\^\\^+$"
+      # h5
+    - constant: "^=====[[:space:]].*$"
+    - constant: "^\\+\\+\\+\\++$"
+
+      # attributes
+    - type.keyword: ":.*:"
+    - identifier.macro: "\\{[a-z0-9]*\\}"
+    - identifier: "\\\\\\{[a-z0-9]*\\}"
+    - identifier: "\\+\\+\\+\\{[a-z0-9]*\\}\\+\\+\\+"
+
+      # Paragraph Title
+    - statement: "^\\..*$"
+
+      # source 
+    - identifier: "^\\[(source,.+|NOTE|TIP|IMPORTANT|WARNING|CAUTION)\\]"
+
+      # Other markup
+    - constant.string: ".*[[:space:]]\\+$"
+    - constant.string: "_[^_]+_"
+    - constant.string: "\\*[^\\*]+\\*"
+    - constant.string: "\\+[^\\+]+\\+"
+    - constant.string: "`[^`]+`"
+    - constant.string: "\\^[^\\^]+\\^"
+    - constant.string: "~[^~]+~"
+    - constant.string: "'[^']+'"
+
+    - constant: "`{1,2}[^']+'{1,2}"
+
+      # bullets
+    - symbol: "^[[:space:]]*[\\*\\.-]{1,5}[[:space:]]"
+
+      # anchors
+    - "bold default": "\\[\\[.*\\]\\]"
+    - "bold default": "<<.*>>"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/asm.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/asm.yaml
@ -0,0 +1,110 @@
+filetype: asm
+
+detect:
+    filename: "\\.(S|s|asm)$"
+
+rules:
+    # This file is made for NASM assembly
+
+    ## Instructions
+    # x86
+    - 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"
+    - statement: "\\b(?i)(bound|enter|ins|leave|outs|popa|pusha)(?-i)\\b"
+    - statement: "\\b(?i)(arpl|clts|lar|lgdt|lidt|lldt|lmsw|loadall|lsl|ltr|sgdt|sidt|sldt|smsw|str|verr|verw)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(bswap|cmpxcgh|invd|invlpg|wbinvd|xadd)(?-i)\\b"
+    - statement: "\\b(?i)(cpuid|cmpxchg8b|rdmsr|rdtsc|wrmsr|rsm)(?-i)\\b"
+    - statement: "\\b(?i)(rdpmc)(?-i)\\b"
+    - statement: "\\b(?i)(syscall|sysret)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(maskmovq|movntps|movntq|prefetch0|prefetch1|prefetch2|prefetchnta|sfence)(?-i)\\b"
+    - statement: "\\b(?i)(clflush|lfence|maskmovdqu|mfence|movntdq|movnti|movntpd|pause)(?-i)\\b"
+    - statement: "\\b(?i)(monitor|mwait)(?-i)\\b"
+    - statement: "\\b(?i)(cdqe|cqo|cmpsq|cmpxchg16b|iretq|jrcxz|lodsq|movsdx|popfq|pushfq|rdtscp|scasq|stosq|swapgs)(?-i)\\b"
+    - statement: "\\b(?i)(clgi|invlpga|skinit|stgi|vmload|vmmcall|vmrun|vmsave)(?-i)\\b"
+    - statement: "\\b(?i)(vmptrdl|vmptrst|vmclear|vmread|vmwrite|vmcall|vmlaunch|vmresume|vmxoff|vmxon)(?-i)\\b"
+    - statement: "\\b(?i)(lzcnt|popcnt)(?-i)\\b"
+    - statement: "\\b(?i)(bextr|blcfill|blci|blcic|blcmask|blcs|blsfill|blsic|t1mskc|tzmsk)(?-i)\\b"
+
+      # x87
+    - 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"
+    - statement: "\\b(?i)(fsetpm)(?-i)\\b"
+    - statement: "\\b(?i)(fcos|fldenvd|fsaved|fstenvd|fprem1|frstord|fsin|fsincos|fstenvd|fucom|fucomp|fucompp)(?-i)\\b"
+    - statement: "\\b(?i)(fcmovb|fcmovbe|fcmove|fcmove|fcmovnb|fcmovnbe|fcmovne|fcmovnu|fcmovu)(?-i)\\b"
+    - statement: "\\b(?i)(fcomi|fcomip|fucomi|fucomip)(?-i)\\b"
+    - statement: "\\b(?i)(fxrstor|fxsave)(?-i)\\b"
+    - statement: "\\b(?i)(fisttp)(?-i)\\b"
+    - statement: "\\b(?i)(ffreep)(?-i)\\b"
+
+      # SIMD
+    - 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"
+    - statement: "\\b(?i)(paveb|paddsiw|pmagw|pdistib|psubsiw|pmwzb|pmulhrw|pmvnzb|pmvlzb|pmvgezb|pmulhriw|pmachriw)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(pf2iw|pfnacc|pfpnacc|pi2fw|pswapd)(?-i)\\b"
+    - statement: "\\b(?i)(pfrsqrtv|pfrcpv)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(andnps|andps|orps|pavgb|pavgw|pextrw|pinsrw|pmaxsw|pmaxub|pminsw|pminub|pmovmskb|pmulhuw|psadbw|pshufw|xorps)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(addpd|addsd|addnpd|cmppd|cmpsd)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(movdq2q|movdqa|movdqu|movq2dq|paddq|psubq|pmuludq|pshufhw|pshuflw|pshufd|pslldq|psrldq|punpckhqdq|punpcklqdq)(?-i)\\b"
+    - statement: "\\b(?i)(addsubpd|addsubps|haddpd|haddps|hsubpd|hsubps|movddup|movshdup|movsldu)(?-i)\\b"
+    - statement: "\\b(?i)(lddqu)(?-i)\\b"
+    - statement: "\\b(?i)(psignw|psignd|psignb|pshufb|pmulhrsw|pmaddubsw|phsubw|phsubsw|phsubd|phaddw|phaddsw|phaddd|palignr|pabsw|pabsd|pabsb)(?-i)\\b"
+    - statement: "\\b(?i)(dpps|dppd|blendps|blendpd|blendvps|blendvpd|roundps|roundss|roundpd|roundsd|insertps|extractps)(?-i)\\b"
+    - 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"
+    - statement: "\\b(?i)(extrq|insertq|movntsd|movntss)(?-i)\\b"
+    - statement: "\\b(?i)(crc32|pcmpestri|pcmpestrm|pcmpistri|pcmpistrm|pcmpgtq)(?-i)\\b"
+    - 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
+    - statement: "\\b(?i)(aesenc|aesenclast|aesdec|aesdeclast|aeskeygenassist|aesimc)(?-i)\\b"
+    - statement: "\\b(?i)(sha1rnds4|sha1nexte|sha1msg1|sha1msg2|sha256rnds2|sha256msg1|sha256msg2)(?-i)\\b"
+
+      # Undocumented
+    - statement: "\\b(?i)(aam|aad|salc|icebp|loadall|loadalld|ud1)(?-i)\\b"
+
+      ## Registers
+    - 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"
+    - 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"
+    - 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"
+    - 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"
+    - identifier: "\\b(?i)(st0|st1|st2|st3|st4|st5|st6|st7)(?-i)\\b"
+    - identifier: "\\b(?i)(xmm0|xmm1|xmm2|xmm3|xmm4|xmm5|xmm6|xmm7|xmm8|xmm9|xmm10|xmm11|xmm12|xmm13|xmm14|xmm15)(?-i)\\b"
+    - identifier: "\\b(?i)(ymm0|ymm1|ymm2|ymm3|ymm4|ymm5|ymm6|ymm7|ymm8|ymm9|ymm10|ymm11|ymm12|ymm13|ymm14|ymm15)(?-i)\\b"
+    - 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
+    - constant.number: "\\b(|h|A|0x)+[0-9]+(|h|A)+\\b"
+    - constant.number: "\\b0x[0-9 a-f A-F]+\\b"
+
+      ## Preprocessor (NASM)
+    - preproc: "%+(\\+|\\?|\\?\\?|)[a-z A-Z 0-9]+"
+    - preproc: "%\\[[. a-z A-Z 0-9]*\\]"
+
+      ## Other
+    - statement: "\\b(?i)(extern|global|section|segment|_start|\\.text|\\.data|\\.bss)(?-i)\\b"
+    - statement: "\\b(?i)(db|dw|dd|dq|dt|ddq|do)(?-i)\\b"
+    - identifier: "[a-z A-Z 0-9 _]+:"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: ";"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/awk.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/awk.yaml
@ -0,0 +1,44 @@
+filetype: awk
+
+detect:
+    filename: "\\.awk$"
+    header: "^#!.*bin/(env +)?awk( |$)"
+
+rules:
+    - preproc: "\\$[A-Za-z0-9_!@#$*?\\-]+"
+    - preproc: "\\b(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\\b"
+    - preproc: "\\b(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\\b"
+    - preproc: "\\b(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\\b"
+    - identifier.class: "\\b(function|extension|BEGIN|END)\\b"
+    - symbol.operator: "[\\-+*/%^|!=&<>?;:]|\\\\|\\[|\\]"
+    - statement:  "\\b(for|if|while|do|else|in|delete|exit)\\b"
+    - special:  "\\b(break|continue|return)\\b"
+    - statement: "\\b(close|getline|next|nextfile|print|printf|system|fflush)\\b"
+    - statement: "\\b(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\\b"
+    - statement: "\\b(asort|asorti|gensub|gsub|index|length|match)\\b"
+    - statement: "\\b(split|sprintf|strtonum|sub|substr|tolower|toupper)\\b"
+    - statement: "\\b(mktime|strftime|systime)\\b"
+    - statement: "\\b(and|compl|lshift|or|rshift|xor)\\b"
+    - statement: "\\b(bindtextdomain|dcgettext|dcngettext)\\b"
+    - special:   "/.*[^\\\\]/"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/c++.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/c++.yaml
@ -0,0 +1,28 @@
+filetype: c++
+
+detect: 
+    filename: "\\.c(c|pp|xx)$|\\.h(h|pp|xx)$|\\.ii?$|\\.(def)$"
+
+rules:
+    - 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"
+    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
+    - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
+    - special: "\\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}'"
+    - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+    - symbol.operator: "[.:;,+*|=!\\%]|<|>|/|-|&"
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    - constant.number: "\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b"
+    - constant.bool: "\\b(true|false)\\b|NULL"
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment: "//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - indent-char.whitespace: "[[:space:]]+$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/c.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/c.yaml
@ -0,0 +1,54 @@
+filetype: c
+
+detect:
+    filename: "(\\.(c|C)$|\\.(h|H)$|\\.ii?$|\\.(def)$)"
+
+rules:
+    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b" 
+    - type: "\\b(float|double|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\\b"
+    - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
+    - type.extended: "\\b(bool)\\b"
+    - statement: "\\b(typename|mutable|volatile|register|explicit)\\b"
+    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
+    - 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\\\\]))'"
+    - 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)__"
+      # Operator Color
+    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    - constant.number: "(\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b)"
+    - constant.number: "NULL"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - preproc: "..+"
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/caddyfile.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/caddyfile.yaml
@ -0,0 +1,23 @@
+filetype: caddyfile
+
+detect:
+    filename: "Caddyfile"
+
+rules:
+    - identifier: "^\\s*\\S+(\\s|$)"
+    - type: "^([\\w.:/-]+,? ?)+[,{]$"
+    - constant.specialChar: "\\s{$"
+    - constant.specialChar: "^\\s*}$"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - preproc: "\\{(\\w+|\\$\\w+|%\\w+%)\\}"
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/clojure.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/clojure.yaml
@ -0,0 +1,38 @@
+filetype: clojure
+
+detect:
+    filename: "\\.(clj)$"
+
+rules:
+
+    # Constants
+    - constant.bool: "\\b(true|false)\\b"
+    - constant.macro: "\\b(nil)\\b"
+      # Valid numbers
+    - constant.number: "[\\-]?[0-9]+?\\b"
+    - constant.number: "0x[0-9][A-Fa-f]+?\\b"
+    - constant.number: "[\\-]?(3[0-6]|2[0-9]|1[0-9]|[2-9])r[0-9A-Z]+?\\b"
+      # Invalid numbers
+    - error: "[\\-]?([4-9][0-9]|3[7-9]|1|0)r[0-9A-Z]+?\\b"
+
+      # Symbols
+    - symbol.operator: "[=>+\\-*/'?]"
+
+      # Types/casting
+    - type: "\\b(byte|short|(big)?int(eger)?|long|float|num|bigdec|rationalize)\\b"
+
+      # String highlighting
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "(\\\\u[0-9A-fa-f]{4,4}|\\\\newline|\\\\space|\\\\tab|\\\\formfeed|\\\\backspace|\\\\return|\\\\.)"
+
+      # Comments
+    - comment:
+        start: ";"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/cmake.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/cmake.yaml
@ -0,0 +1,42 @@
+filetype: cmake
+
+detect:
+    filename: "(CMakeLists\\.txt|\\.cmake)$"
+
+rules:
+    - identifier.var: "^[[:space:]]*[A-Z0-9_]+"
+    - preproc: "^[[:space:]]*(include|include_directories|include_external_msproject)\\b"
+
+    - statement: "^[[:space:]]*\\b((else|end)?if|else|(end)?while|(end)?foreach|break)\\b"
+    - statement: "\\b(COPY|NOT|COMMAND|PROPERTY|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\\b[[:space:]]"
+    - statement: "[[:space:]]\\b(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\\b[[:space:]]"
+
+    - special: "^[[:space:]]*\\b((end)?(function|macro)|return)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - preproc:
+        start: "\\$(\\{|ENV\\{)"
+        end: "\\}"
+        rules: []
+
+    - identifier.macro: "\\b(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\\b"
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/coffeescript.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/coffeescript.yaml
@ -0,0 +1,29 @@
+filetype: coffeescript
+
+detect:
+    filename: "\\.coffee$"
+
+rules:
+    - symbol.operator: "[!&|=/*+-<>]|\\b(and|or|is|isnt|not)\\b"
+    - identifier.class: "([A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\\()|->)"
+    - symbol.brackets: "[()]"
+    - statement:  "\\b(for|of|continue|break|isnt|null|unless|this|else|if|return)\\b"
+    - statement:  "\\b(try|catch|finally|throw|new|delete|typeof|in|instanceof)\\b"
+    - statement:  "\\b(debugger|switch|while|do|class|extends|super)\\b"
+    - statement:  "\\b(undefined|then|unless|until|loop|of|by|when)\\b"
+    - constant.bool:  "\\b(true|false|yes|no|on|off)\\b"
+    - identifier: "@[A-Za-z0-9_]*"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/colortest.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/colortest.yaml
@ -0,0 +1,19 @@
+filetype: colortest
+
+detect:
+    filename: "ColorTest$"
+
+rules:
+    - black: "\\bPLAIN\\b"
+    - red: "\\bred\\b"
+    - green: "\\bgreen\\b"
+    - yellow: "\\byellow\\b"
+    - blue: "\\bblue\\b"
+    - magenta: "\\bmagenta\\b"
+    - cyan: "\\bcyan\\b"
+    - brightred: "\\bbrightred\\b"
+    - brightgreen: "\\bbrightgreen\\b"
+    - brightyellow: "\\bbrightyellow\\b"
+    - brightblue: "\\bbrightblue\\b"
+    - brightmagenta: "\\bbrightmagenta\\b"
+    - brightcyan: "\\bbrightcyan\\b"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/conf.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/conf.yaml
@ -0,0 +1,17 @@
+filetype: conf
+
+detect:
+    filename: "\\.c[o]?nf$"
+
+rules:
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/conky.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/conky.yaml
@ -0,0 +1,17 @@
+filetype: conky
+
+detect:
+    filename: "(\\.*conkyrc.*$|conky.conf)"
+
+rules:
+    - type: "\\b(alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_height|default_bar_width|default_color|default_gauge_height|default_gauge_width|default_graph_height|default_graph_width|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|http_refresh|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|lua_shutdown_hook|lua_startup_hook|mail_spool|max_port_monitor_connections|max_text_width|max_user_text|maximum_width|minimum_height|minimum_width|mpd_host|mpd_password|mpd_port|music_player_interval|mysql_host|mysql_port|mysql_user|mysql_password|mysql_db|net_avg_samples|no_buffers|nvidia_display|out_to_console|out_to_http|out_to_ncurses|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|times_in_seconds|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\\b"
+
+      # Configuration item constants
+    - statement: "\\b(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|middle_middle|undecorated|yes)\\b"
+
+      # Variables
+    - preproc: "\\b(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|ioscheduler|irc|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\\b"
+
+    - identifier.var: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - symbol.operator: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - constant.macro: "^TEXT$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/cpp.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/cpp.yaml
@ -0,0 +1,55 @@
+filetype: c++
+
+detect:
+    filename: "(\\.c(c|pp|xx)$|\\.h(h|pp|xx)$|\\.ii?$|\\.(def)$)"
+
+rules:
+
+    - 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"
+    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
+    - 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: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+      # Parenthetical Color
+    - symbol.brackets: "[(){}]|\\[|\\]"
+
+    - constant.number: "(\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b)"
+    - constant.bool: "(\\b(true|false)\\b|NULL)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - preproc: "..+"
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/crystal.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/crystal.yaml
@ -0,0 +1,64 @@
+filetype: crystal
+
+detect:
+    filename: "\\.cr$"
+
+rules:
+    # Asciibetical list of reserved words
+    - statement: "\\b(BEGIN|END|abstract|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|enum|false|for|fun|if|in|include|lib|loop|macro|module|next|nil|not|of|or|pointerof|private|protected|raise|redo|require|rescue|retry|return|self|sizeof|spawn|struct|super|then|true|type|undef|union|uninitialized|unless|until|when|while|yield)\\b"
+      # Constants
+    - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - constant.number: "\\b[0-9]+\\b"
+      # Crystal "symbols"
+    - constant:  "([ 	]|^):[0-9A-Z_]+\\b"
+      # Some unique things we want to stand out
+    - constant: "\\b(__FILE__|__LINE__)\\b"
+      # Regular expressions
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+
+      # Shell command expansion is in `backticks` or like %x{this}.  These are
+      # "double-quotish" (to use a perlism).
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - constant.string:
+        start: "%x\\{"
+        end: "\\}"
+        rules: []
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+            - special: "#\\{[^}]*\\}"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment.bright:
+        start: "##"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/csharp.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/csharp.yaml
@ -0,0 +1,51 @@
+filetype: csharp
+
+detect:
+    filename: "\\.cs$"
+
+rules:
+    # Class
+    - identifier.class: "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
+
+      # Annotation
+    - identifier.var: "@[A-Za-z]+"
+
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+    - type: "\\b(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\\b"
+    - statement: "\\b(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\\b"
+    - statement: "\\b(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\\b"
+      # LINQ-only keywords (ones that cannot be used outside of a LINQ query - lots others can)
+    - statement: "\\b(from|where|select|group|info|orderby|join|let|in|on|equals|by|ascending|descending)\\b"
+    - special: "\\b(break|continue)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - symbol.operator: "[\\-+/*=<>?:!~%&|]"
+    - constant.number: "\\b([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\\b"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/css.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/css.yaml
--- a/vendor/github.com/zyedidia/highlight/syntax_files/cython.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/cython.yaml
@ -0,0 +1,52 @@
+filetype: cython
+
+detect:
+    filename: "\\.pyx$|\\.pxd$|\\.pyi$"
+
+rules:
+    # Python Keyword Color
+    - statement: "\\b(and|as|assert|class|def|DEF|del|elif|ELIF|else|ELSE|except|exec|finally|for|from|global|if|IF|import|in|is|lambda|map|not|or|pass|print|raise|try|while|with|yield)\\b"
+    - special: "\\b(continue|break|return)\\b"
+
+      # Cython Keyword Color
+    - identifier.macro: "\\b(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\\b"
+    - type: "\\b(bint|char|double|int|public|void|unsigned)\\b"
+
+      # Operator Color
+    - symbol: "[.:;,+*|=!\\%]|<|>|/|-|&"
+
+      # Parenthetical Color
+    - symbol.brackets: "[(){}]|\\[|\\]"
+
+    - constant.string:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'''"
+        end: "'''"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/d.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/d.yaml
@ -0,0 +1,120 @@
+filetype: d
+
+detect:
+    filename: "\\.(d(i|d)?)$"
+
+rules:
+    # Operators and punctuation
+    - statement: "(\\*|/|%|\\+|-|>>|<<|>>>|&|\\^(\\^)?|\\||~)?="
+    - statement: "\\.\\.(\\.)?|!|\\*|&|~|\\(|\\)|\\[|\\]|\\\\|/|\\+|-|%|<|>|\\?|:|;"
+    # Octal integer literals are deprecated
+    - error: "(0[0-7_]*)(L[uU]?|[uU]L?)?"
+    # Decimal integer literals
+    - constant.number: "([0-9]|[1-9][0-9_]*)(L[uU]?|[uU]L?)?"
+    # Binary integer literals
+    - constant: "(0[bB][01_]*)(L[uU]?|[uU]L?)?"
+    # Decimal float literals
+    - constant.number: "[0-9][0-9_]*\\.([0-9][0-9_]*)([eE][+-]?([0-9][0-9_]*))?[fFL]?i?"
+    - constant.number: "[0-9][0-9_]*([eE][+-]?([0-9][0-9_]*))[fFL]?i?"
+    - constant.number: "[^.]\\.([0-9][0-9_]*)([eE][+-]?([0-9][0-9_]*))?[fFL]?i?"
+    - constant.number: "[0-9][0-9_]*([fFL]?i|[fF])"
+    # Hexadecimal integer literals
+    - constant.number: "(0[xX]([0-9a-fA-F][0-9a-fA-F_]*|[0-9a-fA-F_]*[0-9a-fA-F]))(L[uU]?|[uU]L?)?"
+    # Hexadecimal float literals
+    - constant.number: "0[xX]([0-9a-fA-F][0-9a-fA-F_]*|[0-9a-fA-F_]*[0-9a-fA-F])(\\.[0-9a-fA-F][0-9a-fA-F_]*|[0-9a-fA-F_]*[0-9a-fA-F])?[pP][+-]?([0-9][0-9_]*)[fFL]?i?"
+    - constant.number: "0[xX]\\.([0-9a-fA-F][0-9a-fA-F_]*|[0-9a-fA-F_]*[0-9a-fA-F])[pP][+-]?([0-9][0-9_]*)[fFL]?i?"
+    # Character literals
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules:
+            - constant.specialChar: "\\\\."
+    # Keywords
+    # a-e
+    - statement: "\\b(abstract|alias|align|asm|assert|auto|body|break|case|cast|catch|class|const|continue|debug|default|delegate|do|else|enum|export|extern)\\b"
+    # f-l
+    - statement: "\\b(false|final|finally|for|foreach|foreach_reverse|function|goto|if|immutable|import|in|inout|interface|invariant|is|lazy)\\b"
+    # m-r
+    - statement: "\\b(macro|mixin|module|new|nothrow|null|out|override|package|pragma|private|protected|public|pure|ref|return)\\b"
+    # s-w
+    - statement: "\\b(scope|shared|static|struct|super|switch|synchronized|template|this|throw|true|try|typeid|typeof|union|unittest|version|while|with)\\b"
+    # __
+    - statement: "\\b(__FILE__|__MODULE__|__LINE__|__FUNCTION__|__PRETTY_FUNCTION__|__gshared|__traits|__vector|__parameters)\\b"
+    # Deprecated keywords
+    - error: "\\b(delete|deprecated|typedef|volatile)\\b"
+    # Primitive types
+    - type: "\\b(bool|byte|cdouble|cent|cfloat|char|creal|dchar|double|float|idouble|ifloat|int|ireal|long|real|short|ubyte|ucent|uint|ulong|ushort|void|wchar)\\b"
+    # Globally defined symbols
+    - type: "\\b(string|wstring|dstring|size_t|ptrdiff_t)\\b"
+    # Special tokens
+    - constant: "\\b(__DATE__|__EOF__|__TIME__|__TIMESTAMP__|__VENDOR__|__VERSION__)\\b"
+    # String literals
+    # DoubleQuotedString
+    - constant.string: 
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules: 
+            - constant.specialChar: "\\\\."
+    # WysiwygString
+    - constant.string:
+        start: "r\""
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules:
+            - constant.specialChar: "\\\\."
+    # HexString
+    - constant.string:
+        start: "x\""
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+    # DelimitedString
+    - constant.string:
+        start: "q\"\\("
+        end: "\\)\""
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "q\"\\{"
+        end: "q\"\\}"
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "q\"\\["
+        end: "q\"\\]"
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "q\"<"
+        end: "q\">"
+        rules: 
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "q\"[^({[<\"][^\"]*$"
+        end: "^[^\"]+\""
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "q\"([^({[<\"])"
+        end: "\""
+        rules:
+            - constant.specialChar: "\\\\."
+    # Comments
+    - comment: 
+        start: "//"
+        end: "$"
+        rules: []
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+    - comment:
+        start: "/\\+"
+        end: "\\+/"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/dart.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/dart.yaml
@ -0,0 +1,46 @@
+filetype: dart
+
+detect:
+    filename: "\\.dart$"
+
+rules:
+    - constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
+    - constant.number: "\\b[-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+    - constant.number: "\\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
+    - statement: "\\b(break|case|catch|continue|default|else|finally)\\b"
+    - statement: "\\b(for|function|get|if|in|as|is|new|return|set|switch|final|await|async|sync)\\b"
+    - statement: "\\b(switch|this|throw|try|var|void|while|with|import|library|part|const|export)\\b"
+    - constant: "\\b(true|false|null)\\b"
+    - type: "\\b(List|String)\\b"
+    - type: "\\b(int|num|double|bool)\\b"
+    - statement: "[-+/*=<>!~%?:&|]"
+    - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
+    - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "TODO:?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "TODO:?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/dockerfile.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/dockerfile.yaml
@ -0,0 +1,36 @@
+filetype: dockerfile
+
+detect:
+    filename: "(Dockerfile[^/]*$|\\.dockerfile$)"
+
+rules:
+    ## Keywords
+    - keyword: "(?i)^(FROM|MAINTAINER|RUN|CMD|LABEL|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD|ARG|HEALTHCHECK|STOPSIGNAL|SHELL)[[:space:]]"
+
+      ## Brackets & parenthesis
+    - statement: "(\\(|\\)|\\[|\\])"
+
+      ## Double ampersand
+    - special: "&&"
+
+      ## Comments
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/dot.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/dot.yaml
@ -0,0 +1,29 @@
+filetype: dot
+
+detect:
+    filename: "\\.(dot|gv)$"
+
+rules:
+    - type:   "\\b(digraph|edge|graph|node|subgraph)\\b"
+    - statement: "\\b(arrow(head|size|tail)|(bg|fill|font)?color|center|constraint|decorateP|dir|distortion|font(name|size)|head(clip|label)|height|label(angle|distance|font(color|name|size))?|layer(s)?|margin|mclimit|minlen|name|nodesep|nslimit|ordering|orientation|page(dir)?|peripheries|port_label_distance|rank(dir|sep)?|ratio|regular|rotate|same(head|tail)|shape(file)?|sides|size|skew|style|tail(clip|label)|URL|weight|width)\\b"
+    - symbol:  "=|->|--"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/erb.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/erb.yaml
@ -0,0 +1,42 @@
+filetype: erb
+
+detect: 
+    filename: "\\.erb$|\\.rhtml$"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*|>)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*|>)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|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: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"
+    - default:
+        start: "<%"
+        end: "%>"
+        rules: []
+
+    - preproc: "<%|%>"
+    - red: "&[^;[[:space:]]]*;"
+    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\\b"
+    - identifier.var: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - magenta: "(?i)([  ]|^):[0-9A-Z_]+\\b"
+    - identifier.macro: "\\b(__FILE__|__LINE__)\\b"
+    - brightmagenta: "!/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - brightblue: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - brightgreen: "#\\{[^}]*\\}"
+    - green: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment.bright: "##[^{].*$|##$"
+    - identifier.macro:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/fish.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/fish.yaml
@ -0,0 +1,48 @@
+filetype: fish
+
+detect:
+    filename: "\\.fish$"
+    header: "^#!.*/(env +)?fish( |$)"
+
+rules:
+      # Numbers
+    - constant: "\\b[0-9]+\\b"
+
+      # Conditionals and control flow
+    - statement: "\\b(and|begin|break|case|continue|else|end|for|function|if|in|not|or|return|select|shift|switch|while)\\b"
+    - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|^|!|=|&|\\|)"
+
+      # Fish commands
+    - type: "\\b(bg|bind|block|breakpoint|builtin|cd|count|command|commandline|complete|dirh|dirs|echo|emit|eval|exec|exit|fg|fish|fish_config|fish_ident|fish_pager|fish_prompt|fish_right_prompt|fish_update_completions|fishd|funced|funcsave|functions|help|history|jobs|math|mimedb|nextd|open|popd|prevd|psub|pushd|pwd|random|read|set|set_color|source|status|string|trap|type|ulimit|umask|vared)\\b"
+
+      # Common linux commands
+    - type: "\\b((g|ig)?awk|bash|dash|find|\\w{0,4}grep|kill|killall|\\w{0,4}less|make|pkill|sed|sh|tar)\\b"
+
+      # Coreutils commands
+    - type: "\\b(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|time|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\\b"
+
+      # Conditional flags
+    - statement: "--[a-z-]+"
+    - statement: "\\ -[a-z]+"
+
+    - identifier: "(?i)\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/fortran.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/fortran.yaml
@ -0,0 +1,63 @@
+filetype: fortran
+
+detect:
+    filename: "\\.([Ff]|[Ff]90|[Ff]95|[Ff][Oo][Rr])$"
+
+rules:
+    - type:  "(?i)\\b(action|advance|all|allocatable|allocated|any|apostrophe)\\b"
+    - type:  "(?i)\\b(append|asis|assign|assignment|associated|character|common)\\b"
+    - type:  "(?i)\\b(complex|data|default|delim|dimension|double precision)\\b"
+    - type:  "(?i)\\b(elemental|epsilon|external|file|fmt|form|format|huge)\\b"
+    - type:  "(?i)\\b(implicit|include|index|inquire|integer|intent|interface)\\b"
+    - type:  "(?i)\\b(intrinsic|iostat|kind|logical|module|none|null|only)\\\\b"
+    - type:  "(?i)\\b(operator|optional|pack|parameter|pointer|position|private)\\b"
+    - type:  "(?i)\\b(program|public|real|recl|recursive|selected_int_kind)\\b"
+    - type:  "(?i)\\b(selected_real_kind|subroutine|status)\\b"
+
+    - constant:  "(?i)\\b(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\\b" 
+    - constant:  "(?i)\\b(close|contains|count|cpu_time|cshift|date_and_time)\\b" 
+    - constant:  "(?i)\\b(deallocate|digits|dot_product|eor|eoshift|function|iachar)\\b" 
+    - constant:  "(?i)\\b(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\\b" 
+    - constant:  "(?i)\\b(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\\b" 
+    - constant:  "(?i)\\b(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\\b" 
+    - constant:  "(?i)\\b(open|pad|present|print|product|pure|quote|radix)\\b" 
+    - constant:  "(?i)\\b(random_number|random_seed|range|read|readwrite|replace)\\b" 
+    - constant:  "(?i)\\b(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\\b" 
+    - constant:  "(?i)\\b(spread|sum|system_clock|target|transfer|transpose|trim)\\b" 
+    - constant:  "(?i)\\b(ubound|unpack|verify|write|tiny|type|use|yes)\\b"
+
+    - statement: "(?i)\\b(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\\b"
+    - statement: "(?i)\\b(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\\b"
+    - statement: "(?i)\\b(.or.|repeat|select case|then|where|while)\\b"
+
+    - special: "(?i)\\b(continue|cycle|exit|go?to|result|return)\\b"
+
+      #Operator Color
+    - symbol.operator: "[.:;,+*|=!\\%]|/|-|&"
+
+      #Parenthetical Color
+    - symbol.bracket: "[(){}]|\\[|\\]"
+
+      # Add preprocessor commands.
+    - preproc: "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "!"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/gdscript.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/gdscript.yaml
@ -0,0 +1,71 @@
+filetype: gdscript
+
+detect:
+    filename: "\\.gd$"
+
+rules:
+    # built-in objects
+    - constant: "\\b(null|self|true|false)\\b"
+      # built-in attributes
+      # color constant "\\b()\\b"
+      # built-in functions
+    - identifier: "\\b(abs|acos|asin|atan|atan2|ceil|clamp|convert|cos|cosh|db2linear|decimals|deg2rad|ease|exp|float|floor|fmod|fposmod|hash|int|isinf|isnan|lerp|linear2db|load|log|max|min|nearest_po2|pow|preload|print|printerr|printraw|prints|printt|rad2deg|rand_range|rand_seed|randomize|randi|randf|range|round|seed|sin|slerp|sqrt|str|str2var|tan|typeof|var2str|weakref)\\b"
+      # special method names
+    - identifier: "\\b(AnimationPlayer|AnimationTreePlayer|Button|Control|HTTPClient|HTTPRequest|Input|InputEvent|MainLoop|Node|Node2D|SceneTree|Spatial|SteamPeer|PacketPeer|PacketPeerUDP|Timer|Tween)\\b"
+      # types
+    - type: "\\b(Vector2|Vector3)\\b"
+      # definitions
+    - identifier: "func [a-zA-Z_0-9]+" 
+      # keywords
+    - statement: "\\b(and|as|assert|break|breakpoint|class|const|continue|elif|else|export|extends|for|func|if|in|map|not|onready|or|pass|return|signal|var|while|yield)\\b" 
+
+      # decorators
+    - special: "@.*[(]"
+
+      # operators
+    - statement: "[.:;,+*|=!\\%@]|<|>|/|-|&"
+
+      # parentheses
+    - statement: "[(){}]|\\[|\\]"
+
+      # numbers
+    - constant: "\\b[0-9]+\\b"
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - comment:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "'''"
+        end: "'''"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/gentoo-ebuild.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/gentoo-ebuild.yaml
@ -0,0 +1,48 @@
+filetype: ebuild
+
+detect:
+    filename: "\\.e(build|class)$"
+
+rules:
+    # All the standard portage functions
+    - identifier: "^src_(unpack|compile|install|test)|^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+      # Highlight bash related syntax
+    - 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"
+    - statement: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - statement: "-(e|d|f|r|g|u|w|x|L)\\b"
+    - statement: "-(eq|ne|gt|lt|ge|le|s|n|z)\\b"
+      # Highlight variables ... official portage ones in red, all others in bright red
+    - preproc: "\\$\\{?[a-zA-Z_0-9]+\\}?"
+    - special: "\\b(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\\b"
+    - 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
+    - identifier: "\\buse(_(with|enable))?\\b [!a-zA-Z0-9_+ -]*|inherit.*"
+    - statement: "\\be(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\\b"
+    - statement: "\\bdie\\b|\\buse(_(with|enable))?\\b|\\binherit\\b|\\bhas\\b|\\b(has|best)_version\\b|\\bunpack\\b"
+    - statement: "\\b(do|new)(ins|s?bin|doc|lib(\\.so|\\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\\b"
+    - statement: "\\bdo(python|sed|dir|hard|sym|html|jar|mo)\\b|\\bkeepdir\\b"
+    - statement: "prepall(docs|info|man|strip)|prep(info|lib|lib\\.(so|a)|man|strip)"
+    - statement: "\\b(doc|ins|exe)into\\b|\\bf(owners|perms)\\b|\\b(exe|ins|dir)opts\\b"
+      # Highlight common commands used in ebuilds
+    - type: "\\bmake\\b|\\b(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\\b"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/gentoo-etc-portage.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/gentoo-etc-portage.yaml
@ -0,0 +1,23 @@
+filetype: etc-portage
+
+detect:
+    filename: "\\.(keywords|mask|unmask|use)$"
+
+rules:
+    # Use flags:
+    - constant.bool.false: "[[:space:]]+\\+?[a-zA-Z0-9_-]+"
+    - constant.bool.true: "[[:space:]]+-[a-zA-Z0-9_-]+"
+    # Likely version numbers:
+    - special: "-[[:digit:]].*([[:space:]]|$)"
+    # Accepted arches:
+    - identifier.class: "[~-]?\\b(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\\b"
+    - identifier.class: "[[:space:]][~-]?\\*"
+    # Categories:
+    - statement: "^[[:space:]]*.*/"
+    # Masking regulators:
+    - symbol: "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+    # Comments:
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/git-commit.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/git-commit.yaml
@ -0,0 +1,28 @@
+filetype: git-commit
+
+detect:
+    filename: "COMMIT_EDITMSG|TAG_EDITMSG"
+
+rules:
+    # Commit message
+    - ignore: ".*"
+    # Comments
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+    # File changes
+    - keyword: "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
+    - keyword: "#[[:space:]]deleted:"
+    - keyword: "#[[:space:]]modified:"
+    - keyword: "#[[:space:]]new file:"
+    - keyword: "#[[:space:]]renamed:"
+    # Untracked filenames
+    - error: "^#	[^/?*:;{}\\\\]+\\.[^/?*:;{}\\\\]+$"
+    - keyword: "^#[[:space:]]Changes.*[:]"
+    - keyword: "^#[[:space:]]Your branch and '[^']+"
+    - keyword: "^#[[:space:]]Your branch and '"
+    - keyword: "^#[[:space:]]On branch [^ ]+"
+    - keyword: "^#[[:space:]]On branch"
+    # Recolor hash symbols
+    - special: "#"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/git-config.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/git-config.yaml
@ -0,0 +1,14 @@
+filetype: git-config
+
+detect:
+    filename: "git(config|modules)$|\\.git/config$"
+
+rules:
+    - constant: "\\<(true|false)\\>"
+    - keyword: "^[[:space:]]*[^=]*="
+    - constant: "^[[:space:]]*\\[.*\\]$"
+    - constant: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/git-rebase-todo.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/git-rebase-todo.yaml
@ -0,0 +1,28 @@
+filetype: git-rebase-todo
+
+detect:
+    filename: "git-rebase-todo"
+
+rules:
+    # Comments
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+    # Rebase commands
+    - statement: "^(e|edit) [0-9a-f]{7,40}"
+    - statement: "^#  (e, edit)"
+    - statement: "^(f|fixup) [0-9a-f]{7,40}"
+    - statement: "^#  (f, fixup)"
+    - statement: "^(p|pick) [0-9a-f]{7,40}"
+    - statement: "^#  (p, pick)"
+    - statement: "^(r|reword) [0-9a-f]{7,40}"
+    - statement: "^#  (r, reword)"
+    - statement: "^(s|squash) [0-9a-f]{7,40}"
+    - statement: "^#  (s, squash)"
+    - statement: "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+    - statement: "^#  (x, exec)"
+    # Recolor hash symbols
+    - special: "#"
+    # Commit IDs
+    - identifier: "[0-9a-f]{7,40}"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/glsl.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/glsl.yaml
@ -0,0 +1,26 @@
+filetype: glsl
+
+detect:
+    filename: "\\.(frag|vert|fp|vp|glsl)$"
+
+rules:
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+    - type: "\\b(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\b"
+    - identifier: "\\bgl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\b"
+    - statement: "\\b(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\b"
+    - statement: "\\b(break|continue)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - symbol.operator: "[-+/*=<>?:!~%&|^]"
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b"
+
+    - comment: 
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "TODO:?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "TODO:?"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/go.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/go.yaml
@ -0,0 +1,64 @@
+filetype: go
+
+detect:
+    filename: "\\.go$"
+
+rules:
+    # Conditionals and control flow
+    - special: "\\b(break|case|continue|default|go|goto|range|return)\\b"
+    - statement: "\\b(else|for|if|switch)\\b"
+    - preproc: "\\b(package|import|const|var|type|struct|func|go|defer|iota)\\b"
+    - symbol.operator: "[-+/*=<>!~%&|^]|:="
+
+      # Types
+    - special: "[a-zA-Z0-9]*\\("
+    - symbol: "(,|\\.)"
+    - type: "\\b(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\\b"
+    - type: "\\b(uintptr|byte|rune|string|interface|bool|map|chan|error)\\b"
+      ##I'm... not sure, but aren't structs a type?
+    - type.keyword: "\\b(struct)\\b"
+    - constant.bool: "\\b(true|false|nil)\\b"
+
+      # Brackets
+    - symbol.brackets: "(\\{|\\})"
+    - symbol.brackets: "(\\(|\\))"
+    - symbol.brackets: "(\\[|\\])"
+
+      # Numbers and strings
+    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - error: "..+"
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
+        rules: []
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/golo.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/golo.yaml
@ -0,0 +1,73 @@
+filetype: golo
+
+detect:
+    filename: "\\.golo$"
+
+rules:
+    - type: "\\b(function|fun|)\\b"
+    - type: "\\b(struct|DynamicObject|union|AdapterFabric|Adapter|DynamicVariable|Observable)\\b"
+    - type: "\\b(list|set|array|vector|tuple|map)\\b"
+    - type: "\\b(Ok|Error|Empty|None|Some|Option|Result|Result.ok|Result.fail|Result.error|Result.empty|Optional.empty|Optional.of)\\b"
+
+    - identifier.class: "\\b(augment|pimp)\\b"
+    - identifier.class: "\\b(interfaces|implements|extends|overrides|maker|newInstance)\\b"
+    - identifier.class: "\\b(isEmpty|isNone|isPresent|isSome|iterator|flattened|toList|flatMap|`and|orElseGet|`or|toResult|apply|either)\\b"
+    - identifier.class: "\\b(result|option|trying|raising|nullify|catching)\\b"
+    - identifier.class: "\\b(promise|setFuture|failedFuture|all|any)\\b"
+    - identifier.class: "\\b(initialize|initializeWithinThread|start|future|fallbackTo|onSet|onFail|cancel|enqueue)\\b"
+    - identifier.class: "\\b(println|print|raise|readln|readPassword|secureReadPassword|requireNotNull|require|newTypedArray|range|reversedRange|mapEntry|asInterfaceInstance|asFunctionalInterface|isClosure|fileToText|textToFile|fileExists|currentDir|sleep|uuid|isArray|arrayTypeOf|charValue|intValue|longValue|doubleValue|floatValue|removeByIndex|box)\\b"
+    - identifier.class: "\\b(likelySupported|reset|bold|underscore|blink|reverse_video|concealed|fg_black|fg_red|fg_green|fg_yellow|fg_blue|fg_magenta|fg_cyan|fg_white|bg_black|bg_red|bg_green|bg_yellow|bg_blue|bg_magenta|bg_cyan|bg_white|cursor_position|cursor_save_position|cursor_restore_position|cursor_up|cursor_down|cursor_forward|cursor_backward|erase_display|erase_line)\\b"
+    - identifier.class: "\\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\\b"
+    - identifier.class: "\\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\\b"
+    - identifier.class: "\\b(import)\\b"
+    - identifier.class: "\\b(module)\\b"
+    - identifier.class: "\\b(JSON)\\b"
+    - identifier.class: "\\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\\b"
+    - identifier.class: "\\b(newInstance|define|getKey|getValue|properties|fallback)\\b"
+    - identifier.class: "\\b(times|upTo|downTo)\\b"
+    - identifier.class: "\\b(format|toInt|toInteger|toDouble|toFloat|toLong)\\b"
+    - identifier.class: "\\b(head|tail|isEmpty|reduce|each|count|exists)\\b"
+    - identifier.class: "\\b(newWithSameType|destruct|append|add|addIfAbsent|prepend|insert|last|unmodifiableView|find|filter|map|join|reverse|reversed|order|ordered|removeAt|include|exclude|remove|delete|has|contains|getOrElse|toArray)\\b"
+    - identifier.class: "\\b(add|addTo|succ|pred|mul|neg|sub|rsub|div|rdiv|mod|rmod|pow|rpow|str|lt|gt|eq|ne|ge|le|`and|`or|`not|xor|even|odd|contains|isEmpty|`is|`isnt|`oftype|`orIfNull|fst|snd|getitem|setitem|getter|id|const|False|True|Null|curry|uncurry|unary|spreader|varargs|swapArgs|swapCurry|swapCouple|swap|invokeWith|pipe|compose|io|andThen|until|recur|cond)\\b"
+    - identifier.class: "\\b(toUpperCase|equals|startsWith)\\b"
+
+    - statement: "\\b(if|else|then|when|case|match|otherwise)\\b"
+    - special: "\\b(with|break|continue|return)\\b"
+    - error: "\\b(try|catch|finally|throw)\\b"
+    - identifier: "\\b(super|this|let|var|local)\\b"
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    - statement: "\\b(for|while|foreach|in)\\b"
+    - constant: "\\b(and|in|is|not|or|isnt|orIfNull)\\b"
+
+    - constant.bool: "\\b(true|false)\\b"
+    - constant:  "\\b(null|undefined)\\b"
+
+    - symbol.operator: "[\\-+/*=<>!~%&|^]|:="
+    - constant.number:   "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "----"
+        end: "----"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/groff.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/groff.yaml
@ -0,0 +1,30 @@
+filetype: groff
+
+detect: 
+    filename: "\\.m[ems]$|\\.rof|\\.tmac$|^tmac."
+
+rules:
+    - statement: "^\\.(ds|nr) [^[[:space:]]]*"
+    - constant.specialChar: "\\\\."
+    - constant.specialChar: "\\\\f.|\\\\f\\(..|\\\\s(\\+|\\-)?[0-9]"
+    - constant: "(\\\\|\\\\\\\\)n(.|\\(..)"
+    - constant:
+        start: "(\\\\|\\\\\\\\)n\\["
+        end: "]"
+        rules: []
+
+    - type: "^\\.[[:space:]]*[^[[:space:]]]*"
+    - comment: "^\\.\\\\\".*$"
+    - constant.string: "(\\\\|\\\\\\\\)\\*(.|\\(..)"
+    - constant.string:
+        start: "(\\\\|\\\\\\\\)\\*\\["
+        end: "]"
+        rules: []
+
+    - constant.specialChar: "\\\\\\(.."
+    - constant.specialChar:
+        start: "\\\\\\["
+        end: "]"
+        rules: []
+
+    - identifier.macro: "\\\\\\\\\\$[1-9]"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/haml.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/haml.yaml
@ -0,0 +1,16 @@
+filetype: haml
+
+detect: 
+    filename: "\\.haml$"
+
+rules:
+    - symbol: "-|="
+    - default: "->|=>"
+    - constant: "([  ]|^)%[0-9A-Za-z_]+>"
+    - special: ":[0-9A-Za-z_]+>"
+    - type: "\\.[A-Za-z_]+>"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - identifier: "#\\{[^}]*\\}"
+    - identifier.var: "(@|@@)[0-9A-Z_a-z]+"
+    - comment: "#[^{].*$|#$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/haskell.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/haskell.yaml
@ -0,0 +1,50 @@
+filetype: haskell
+
+detect:
+    filename: "\\.hs$"
+
+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$)"
+
+      # Various symbols
+    - symbol: "(\\||@|!|:|_|~|=|\\\\|;|\\(\\)|,|\\[|\\]|\\{|\\})"
+
+      # Operators
+    - symbol.operator: "(==|/=|&&|\\|\\||<|>|<=|>=)"
+
+      # Various symbols
+    - special: "(->|<-)"
+    - symbol: "\\.|\\$"
+
+      # Data constructors
+    - constant.bool: "\\b(True|False)\\b"
+    - constant: "(Nothing|Just|Left|Right|LT|EQ|GT)"
+
+      # Data classes
+    - identifier.class: "[ ](Read|Show|Enum|Eq|Ord|Data|Bounded|Typeable|Num|Real|Fractional|Integral|RealFrac|Floating|RealFloat|Monad|MonadPlus|Functor)"
+
+      # Strings
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+      # Comments
+    - comment:
+        start: "--"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "\\{-"
+        end: "-\\}"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - identifier.micro: "undefined"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/html.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/html.yaml
@ -0,0 +1,44 @@
+filetype: html
+
+detect: 
+    filename: "\\.htm[l]?$"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|target|type|value|width)="
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    # - default:
+    #     start: ">"
+    #     end: "<"
+    #     rules: []
+
+    - symbol.tag: "<|>"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - default:
+        start: "<script.*?>"
+        end: "</script.*?>"
+        limit-group: symbol.tag
+        rules:
+            - include: "javascript"
+
+    - default:
+        start: "<style.*?>"
+        end: "</style.*?>"
+        limit-group: symbol.tag
+        rules:
+            - include: "css"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/html4.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/html4.yaml
@ -0,0 +1,25 @@
+filetype: html4
+
+detect: 
+    filename: "\\.htm[l]?4$"
+    header: "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN|http://www.w3.org/TR/html4/strict.dtd\">"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - default:
+        start: ">"
+        end: "<"
+        rules: []
+
+    - symbol.tag: "<|>"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/html5.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/html5.yaml
@ -0,0 +1,25 @@
+filetype: html5
+
+detect: 
+    filename: "\\.htm[l]?5$"
+    header: "<!DOCTYPE html5>"
+
+rules:
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a|a(bbr|ddress|rea|rticle|side|udio)|b|b(ase|d(i|o)|lockquote|r|utton)|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata|atalist|d|el|etails|fn|ialog|l|t)|em|embed|fieldset|fig(caption|ure)|form|iframe|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li|link|ma(in|p|rk)|menu|menuitem|met(a|er)|nav|noscript|o(bject|l|pt(group|ion)|utput)|p|param|picture|pre|progress|q|r(p|t|uby)|s|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u|ul|var|video|wbr)( .*)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*)*?>"
+    - special: "&[^;[[:space:]]]*;"
+    - symbol: "[:=]"
+    - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
+    - constant.string: "\"[^\"]*\""
+    - constant.number: "(?i)#[0-9A-F]{6,6}"
+    - default:
+        start: ">"
+        end: "<"
+        rules: []
+
+    - symbol.tag: "<|>"
+    - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
+    - comment: "<!--.+?-->"
+    - preproc: "<!DOCTYPE.+?>"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/ini.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/ini.yaml
@ -0,0 +1,14 @@
+filetype: ini
+
+detect: 
+    filename: "\\.(ini|desktop|lfl|override)$|(mimeapps\\.list|pinforc|setup\\.cfg)$|weechat/.+\\.conf$"
+    header: "^\\[[A-Za-z]+\\]$"
+
+rules:
+    - constant.bool.true: "\\btrue\\b"
+    - constant.bool.false: "\\bfalse\\b"
+    - identifier: "^[[:space:]]*[^=]*="
+    - special: "^[[:space:]]*\\[.*\\]$"
+    - statement: "[=;]"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/inputrc.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/inputrc.yaml
@ -0,0 +1,14 @@
+filetype: inputrc
+
+detect: 
+    filename: "inputrc$"
+
+rules:
+    - constant.bool.false: "\\b(off|none)\\b"
+    - constant.bool.true: "\\bon\\b"
+    - preproc: "\\bset|\\$include\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/java.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/java.yaml
@ -0,0 +1,37 @@
+filetype: java
+
+detect:
+    filename: "\\.java$"
+
+rules:
+    - type: "\\b(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\\b"
+    - statement: "\\b(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\\b"
+    - type: "\\b(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\\b"
+    - constant: "\\b(true|false|null)\\b"
+    - constant.number: "\\b[0-9]+\\b"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - preproc: "..+"
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/javascript.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/javascript.yaml
@ -0,0 +1,45 @@
+filetype: javascript
+
+detect:
+    filename: "\\.js$"
+
+rules:
+    - constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
+    - constant.number: "\\b[-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+    - constant.number: "\\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
+    - statement: "\\b(break|case|catch|continue|default|delete|do|else|finally)\\b"
+    - statement: "\\b(for|function|get|if|in|instanceof|new|return|set|switch)\\b"
+    - statement: "\\b(switch|this|throw|try|typeof|var|void|while|with)\\b"
+    - constant: "\\b(null|undefined|NaN)\\b"
+    - constant: "\\b(true|false)\\b"
+    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Math)\\b"
+    - type: "\\b(Number|Object|RegExp|String)\\b"
+    - statement: "[-+/*=<>!~%?:&|]"
+    - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
+    - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/json.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/json.yaml
@ -0,0 +1,27 @@
+filetype: json
+
+detect:
+    filename: "\\.json$"
+    header: "^\\{$"
+
+rules:
+    - constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
+    - constant.number: "\\b[-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+    - constant.number: "\\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+    - constant: "\\b(null)\\b"
+    - constant: "\\b(true|false)\\b"
+    - constant.string: 
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - statement: "\\\"(\\\\\"|[^\"])*\\\"[[:space:]]*:\"  \"'(\\'|[^'])*'[[:space:]]*:"
+    - constant: "\\\\u[0-9a-fA-F]{4}|\\\\[bfnrt'\"/\\\\]"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/keymap.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/keymap.yaml
@ -0,0 +1,27 @@
+filetype: keymap
+
+detect:
+    filename: "\\.(k|key)?map$|Xmodmap$"
+
+rules:
+    - statement: "\\b(add|clear|compose|keycode|keymaps|keysym|remove|string)\\b"
+    - statement: "\\b(control|alt|shift)\\b"
+    - constant.number: "\\b[0-9]+\\b"
+    - special: "="
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - comment:
+        start: "^!"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/kickstart.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/kickstart.yaml
@ -0,0 +1,16 @@
+filetype: kickstart
+
+detect: 
+    filename: "\\.ks$|\\.kickstart$"
+
+rules:
+    - special: "%[a-z]+"
+    - statement: "^[[:space:]]*(install|cdrom|text|graphical|volgroup|logvol|reboot|timezone|lang|keyboard|authconfig|firstboot|rootpw|user|firewall|selinux|repo|part|partition|clearpart|bootloader)"
+    - constant: "--(name|mirrorlist|baseurl|utc)(=|\\>)"
+    - statement: "\\$(releasever|basearch)\\>"
+    - brightblack: "^@[A-Za-z][A-Za-z-]*"
+    - brightred: "^-@[a-zA-Z0-9*-]+"
+    - red: "^-[a-zA-Z0-9*-]+"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/ledger.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/ledger.yaml
@ -0,0 +1,14 @@
+filetype: ledger
+
+detect: 
+    filename: "(^|\\.|/)ledger|ldgr|beancount|bnct$"
+
+rules:
+    - special: "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
+    - constant: "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
+    - statement: "^~ .*"
+    - identifier.var: "^= .*"
+    - identifier: "^[[:space:]]+(![[:space:]]+)?\\(?[A-Za-z ]+(:[A-Za-z ]+)*\\)?"
+    - identifier: "^[[:space:]]+(![[:space:]]+)?\\(?[A-Za-z_\\-]+(:[A-Za-z_\\-]+)*\\)?"
+    - symbol: "[*!]"
+    - comment: "^[[:space:]]*;.*"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/lfe.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/lfe.yaml
@ -0,0 +1,17 @@
+filetype: lfe
+
+detect: 
+    filename: "lfe$|\\.lfe$"
+
+rules:
+    - symbol.brackets: "\\(|\\)"
+    - type: "defun|define-syntax|define|defmacro|defmodule|export"
+    - constant: "\\ [A-Za-z][A-Za-z0-9_-]+\\ "
+    - symbol.operator: "\\(([\\-+*/<>]|<=|>=)|'"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant.string: "\\\"(\\\\.|[^\"])*\\\""
+    - special: "['|`][A-Za-z][A-Za-z0-9_\\-]+"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]]);.*"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/lilypond.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/lilypond.yaml
@ -0,0 +1,26 @@
+filetype: lilypond
+
+detect:
+    filename: "\\.ly$|\\.ily$|\\.lly$"
+
+rules:
+    - constant.number: "\\d+"
+    - identifier: "\\b(staff|spacing|signature|routine|notes|handler|corrected|beams|arpeggios|Volta_engraver|Voice|Vertical_align_engraver|Vaticana_ligature_engraver|VaticanaVoice|VaticanaStaff|Tweak_engraver|Tuplet_engraver|Trill_spanner_engraver|Timing_translator|Time_signature_performer|Time_signature_engraver|Tie_performer|Tie_engraver|Text_spanner_engraver|Text_engraver|Tempo_performer|Tab_tie_follow_engraver|Tab_staff_symbol_engraver|Tab_note_heads_engraver|TabVoice|TabStaff|System_start_delimiter_engraver|Stem_engraver|Stanza_number_engraver|Stanza_number_align_engraver|Staff_symbol_engraver|Staff_performer|Staff_collecting_engraver|StaffGroup|Staff|Spanner_break_forbid_engraver|Span_bar_stub_engraver|Span_bar_engraver|Span_arpeggio_engraver|Spacing_engraver|Slur_performer|Slur_engraver|Slash_repeat_engraver|Separating_line_group_engraver|Script_row_engraver|Script_engraver|Script_column_engraver|Score|Rhythmic_column_engraver|RhythmicStaff|Rest_engraver|Rest_collision_engraver|Repeat_tie_engraver|Repeat_acknowledge_engraver|Pure_from_neighbor_engraver|Pitched_trill_engraver|Pitch_squash_engraver|Piano_pedal_performer|Piano_pedal_engraver|Piano_pedal_align_engraver|PianoStaff|Phrasing_slur_engraver|PetrucciVoice|PetrucciStaff|Percent_repeat_engraver|Part_combine_engraver|Parenthesis_engraver|Paper_column_engraver|Output_property_engraver|Ottava_spanner_engraver|OneStaff|NullVoice|Note_spacing_engraver|Note_performer|Note_name_engraver|Note_heads_engraver|Note_head_line_engraver|NoteName\\|NoteHead|New_fingering_engraver|Multi_measure_rest_engraver|Midi_control_function_performer|Metronome_mark_engraver|Mensural_ligature_engraver|MensuralVoice|MensuralStaff|Mark_engraver|Lyrics|Lyric_performer|Lyric_engraver|Ligature_bracket_engraver|Ledger_line_engraver|Laissez_vibrer_engraver|Kievan_ligature_engraver|KievanVoice|KievanStaff|Key_performer|Key_engraver|Keep_alive_together_engraver|Instrument_switch_engraver|Instrument_name_engraver|Hyphen_engraver|Grob_pq_engraver|GregorianTranscriptionVoice|GregorianTranscriptionStaff|GrandStaff|Grace_spacing_engraver|Grace_engraver|Grace_beam_engraver|Grace_auto_beam_engraver|Global|Glissando_engraver|Fretboard_engraver|FretBoards|Forbid_line_break_engraver|Footnote_engraver|Font_size_engraver|Fingering_engraver|Fingering_column_engraver|Figured_bass_position_engraver|Figured_bass_engraver|FiguredBass|Extender_engraver|Episema_engraver|Dynamics|Dynamic_performer|Dynamic_engraver|Dynamic_align_engraver|Drum_notes_engraver|Drum_note_performer|DrumVoice|DrumStaff|Double_percent_repeat_engraver|Dots_engraver|Dot_column_engraver|Devnull|Default_bar_line_engraver|Custos_engraver|Cue_clef_engraver|CueVoice|Control_track_performer|Concurrent_hairpin_engraver|Collision_engraver|Cluster_spanner_engraver|Clef_engraver|Chord_tremolo_engraver|Chord_name_engraver|ChordNames|ChoirStaff|Breathing_sign_engraver|Break_align_engraver|Bend_engraver|Beam_performer|Beam_engraver|Beam_collision_engraver|Bar_number_engraver|Bar_engraver|Axis_group_engraver|Auto_beam_engraver|Arpeggio_engraver|Accidental_engraver|Score)\\b"
+    - statement: "[-_^]?\\\\[-A-Za-z_]+"
+    - preproc: "\\b(((gisis|gis|geses|ges|g|fisis|fis|feses|fes|f|eisis|eis|eeses|ees|e|disis|dis|deses|des|d|cisis|cis|ceses|ces|c|bisis|bis|beses|bes|b|aisis|ais|aeses|aes|a)[,']*[?!]?)|s|r|R|q)(128|64|32|16|8|4|2|1|\\\\breve|\\\\longa|\\\\maxima)?([^\\\\\\w]|_|\\b)"
+    - special: "[(){}<>]|\\[|\\]"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - comment:
+        start: "%\\{"
+        end: "%\\}"
+        rules: []
+    - comment:
+        start: "%"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/lisp.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/lisp.yaml
@ -0,0 +1,17 @@
+filetype: lisp
+
+detect: 
+    filename: "(emacs|zile)$|\\.(el|li?sp|scm|ss)$"
+
+rules:
+    - default: "\\([a-z-]+"
+    - symbol: "\\(([\\-+*/<>]|<=|>=)|'"
+    - constant.number: "\\b[0-9]+b>"
+    - special: "\\bnil\\b"
+    - preproc: "\\b[tT]b>"
+    - constant.string: "\\\"(\\\\.|[^\"])*\\\""
+    - constant.specialChar: "'[A-Za-z][A-Za-z0-9_-]+"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]]);.*"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/lua.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/lua.yaml
@ -0,0 +1,63 @@
+filetype: lua
+
+detect:
+    filename: "\\.lua$"
+
+rules:
+    - statement: "\\b(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return)\\b"
+    - statement: "\\b(not|and|or)\\b"
+    - statement: "\\b(debug|string|math|table|io|coroutine|os|utf8|bit32)\\b\\."
+    - statement: "\\b(_ENV|_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawlen|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\\s*\\("
+    - identifier: "io\\.\\b(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)\\b"
+    - identifier: "math\\.\\b(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log|max|maxinteger|min|mininteger|modf|pi|pow|rad|random|randomseed|sinh|sqrt|tan|tointeger|type|ult)\\b"
+    - identifier: "os\\.\\b(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\\b"
+    - identifier: "package\\.\\b(config|cpath|loaded|loadlib|path|preload|seeall|searchers|searchpath)\\b"
+    - identifier: "string\\.\\b(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)\\b"
+    - identifier: "table\\.\\b(concat|insert|maxn|move|pack|remove|sort|unpack)\\b"
+    - identifier: "utf8\\.\\b(char|charpattern|codes|codepoint|len|offset)\\b"
+    - identifier: "coroutine\\.\\b(create|isyieldable|resume|running|status|wrap|yield)\\b"
+    - identifier: "debug\\.\\b(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue|getuservalue|setfenv|sethook|setlocal|setmetatable|setupvalue|setuservalue|traceback|upvalueid|upvaluejoin)\\b"
+    - identifier: "bit32\\.\\b(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)\\b"
+    - identifier: "\\:\\b(close|flush|lines|read|seek|setvbuf|write)\\b"
+    - constant: "\\b(false|nil|true)\\b"
+    - statement: "(\\b(dofile|require|include)|%q|%!|%Q|%r|%x)\\b"
+    - constant.number: "\\b([0-9]+)\\b"
+    - symbol: "(\\(|\\)|\\[|\\]|\\{|\\}|\\*\\*|\\*|/|%|\\+|-|\\^|>|>=|<|<=|~=|=|\\.\\.)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "\\[\\["
+        end: "\\]\\]"
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - special: "\\\\[0-7][0-7][0-7]|\\\\x[0-9a-fA-F][0-9a-fA-F]|\\\\[abefnrs]|(\\\\c|\\\\C-|\\\\M-|\\\\M-\\\\C-)."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
+    - comment: 
+        start: "\\-\\-"
+        end: "$"
+        rules: []
+
+    - comment: 
+        start: "\\-\\-\\[\\["
+        end: "\\]\\]"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/mail.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/mail.yaml
@ -0,0 +1,25 @@
+filetype: mail
+
+detect:
+    filename: "(.*/mutt-.*|\\.eml)$"
+    header: "^From .* \\d+:\\d+:\\d+ \\d+"
+
+rules:
+    - type: "^From .*"
+    - identifier: "^[^[:space:]]+:"
+    - preproc: "^List-(Id|Archive|Subscribe|Unsubscribe|Post|Help):"
+    - constant: "^(To|From):"
+    - constant.string:
+        start: "^Subject:.*"
+        end: "$"
+        rules: 
+            - constant.specialChar: "\\\\."
+    - statement: "<?[^@[:space:]]+@[^[:space:]]+>?"
+    - default:
+        start: "^\\n\\n"
+        end: ".*"
+        rules: []
+    - comment:
+        start: "^>.*"
+        end: "$"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/makefile.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/makefile.yaml
@ -0,0 +1,38 @@
+filetype: makefile
+
+detect:
+    filename: "([Mm]akefile|\\.ma?k)$"
+    header: "^#!.*/(env +)?[bg]?make( |$)"
+
+rules:
+    - preproc: "\\<(ifeq|ifdef|ifneq|ifndef|else|endif)\\>"
+    - statement: "^(export|include|override)\\>"
+    - operator: "^[^:=	]+:"
+    - operator: "([=,%]|\\+=|\\?=|:=|&&|\\|\\|)"
+    - statement: "\\$\\((abspath|addprefix|addsuffix|and|basename|call|dir)[[:space:]]"
+    - statement: "\\$\\((error|eval|filter|filter-out|findstring|firstword)[[:space:]]"
+    - statement: "\\$\\((flavor|foreach|if|info|join|lastword|notdir|or)[[:space:]]"
+    - statement: "\\$\\((origin|patsubst|realpath|shell|sort|strip|suffix)[[:space:]]"
+    - statement: "\\$\\((value|warning|wildcard|word|wordlist|words)[[:space:]]"
+    - identifier: "^.+:"
+    - identifier: "[()$]"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - identifier: "\\$+(\\{[^} ]+\\}|\\([^) ]+\\))"
+    - identifier: "\\$[@^<*?%|+]|\\$\\([@^<*?%+-][DF]\\)"
+    - identifier: "\\$\\$|\\\\.?"
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/man.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/man.yaml
@ -0,0 +1,12 @@
+filetype: man
+
+detect: 
+    filename: "\\.[1-9]x?$"
+
+rules:
+    - green: "\\.(S|T)H.*$"
+    - brightgreen: "\\.(S|T)H|\\.TP"
+    - brightred: "\\.(BR?|I[PR]?).*$"
+    - brightblue: "\\.(BR?|I[PR]?|PP)"
+    - brightwhite: "\\\\f[BIPR]"
+    - yellow: "\\.(br|DS|RS|RE|PD)"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/markdown.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/markdown.yaml
@ -0,0 +1,49 @@
+filetype: markdown
+
+detect:
+    filename: "\\.(md|mkd|mkdn|markdown)$"
+
+rules:
+    # Tables (Github extension)
+    - type: ".*[ :]\\|[ :].*"
+
+      # quotes
+    - statement:  "^>.*"
+
+      # Emphasis
+    - type: "(^|[[:space:]])(_[^ ][^_]*_|\\*[^ ][^*]*\\*)"
+
+      # Strong emphasis
+    - type: "(^|[[:space:]])(__[^ ][^_]*__|\\*\\*[^ ][^*]*\\*\\*)"
+
+      # strike-through
+    - type: "(^|[[:space:]])~~[^ ][^~]*~~"
+
+      # horizontal rules
+    - special: "^(---+|===+|___+|\\*\\*\\*+)\\s*$"
+
+      # headlines
+    - special:  "^#{1,6}.*"
+
+      # lists
+    - identifier:   "^[[:space:]]*[\\*+-] |^[[:space:]]*[0-9]+\\. "
+
+      # misc
+    - preproc:   "(\\(([CcRr]|[Tt][Mm])\\)|\\.{3}|(^|[[:space:]])\\-\\-($|[[:space:]]))"
+
+      # links
+    - constant: "\\[[^]]+\\]"
+    - constant: "\\[([^][]|\\[[^]]*\\])*\\]\\([^)]+\\)"
+
+      # images
+    - underlined: "!\\[[^][]*\\](\\([^)]+\\)|\\[[^]]+\\])"
+
+      # urls
+    - underlined: "https?://[^ )>]+"
+
+    - special: "^```$"
+
+    - special:
+        start: "`"
+        end: "`"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/micro.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/micro.yaml
@ -0,0 +1,23 @@
+filetype: micro
+
+detect:
+    filename: "\\.(micro)$"
+
+rules:
+    - statement: "\\b(syntax|color(-link)?)\\b"
+    - statement: "\\b(start=|end=)\\b"
+    - identifier: "\\b(default|comment|symbol|identifier|constant(.string(.char)?|.number)?|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|(current-)?line-number|gutter-error|gutter-warning|cursor-line|color-column)\\b"
+    - constant.number: "\\b(|h|A|0x)+[0-9]+(|h|A)+\\b"
+    - constant.number: "\\b0x[0-9 a-f A-F]+\\b"
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.number: "#[0-9 A-F a-f]+"
+    
--- a/vendor/github.com/zyedidia/highlight/syntax_files/mpdconf.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/mpdconf.yaml
@ -0,0 +1,13 @@
+filetype: mpd
+
+detect: 
+    filename: "mpd\\.conf$"
+
+rules:
+    - statement: "\\b(user|group|bind_to_address|host|port|plugin|name|type)\\b"
+    - statement: "\\b((music|playlist)_directory|(db|log|state|pid|sticker)_file)\\b"
+    - special: "^(input|audio_output|decoder)[[:space:]]*\\{|\\}"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/nanorc.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/nanorc.yaml
@ -0,0 +1,16 @@
+filetype: nanorc
+
+detect: 
+    filename: "\\.?nanorc$"
+
+rules:
+    - default: "(?i)^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+    - type: "(?i)^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\\>|^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\\b"
+    - preproc: "(?i)^[[:space:]]*(set|unset|include|syntax|header)\\b"
+    - constant.bool.true: "(?i)(set)\\b"
+    - constant.bool.false: "(?i)(unset)\\b"
+    - identifier: "(?i)^[[:space:]]*(i)?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\\b"
+    - special: "(?i)^[[:space:]]*(i)?color\\b|\\b(start|end)="
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment: "^[[:space:]]*#.*$"
+    - comment.bright: "^[[:space:]]*##.*$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/nginx.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/nginx.yaml
@ -0,0 +1,22 @@
+filetype: nginx
+
+detect: 
+    filename: "nginx.*\\.conf$|\\.nginx$"
+    header: "^(server|upstream)[a-z ]*\\{$"
+
+rules:
+    - preproc: "\\b(events|server|http|location|upstream)[[:space:]]*\\{"
+    - statement: "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
+    - constant.bool.true: "\\b(on)\\b"
+    - constant.bool.false: "\\b(off)\\b"
+    - identifier: "\\$[A-Za-z][A-Za-z0-9_]*"
+    - symbol: "[*]"
+    - constant-string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.string:
+        start: "'$"
+        end: "';$"
+        rules: []
+
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/nim.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/nim.yaml
@ -0,0 +1,27 @@
+filetype: nim
+
+detect: 
+    filename: "\\.nim$"
+
+rules:
+    - preproc: "[\\{\\|]\\b(atom|lit|sym|ident|call|lvalue|sideeffect|nosideeffect|param|genericparam|module|type|let|var|const|result|proc|method|iterator|converter|macro|template|field|enumfield|forvar|label|nk[a-zA-Z]+|alias|noalias)\\b[\\}\\|]"
+    - statement: "\\b(addr|and|as|asm|atomic|bind|block|break|case|cast|concept|const|continue|converter|defer|discard|distinct|div|do|elif|else|end|enum|except|export|finally|for|from|func|generic|if|import|in|include|interface|is|isnot|iterator|let|macro|method|mixin|mod|nil|not|notin|object|of|or|out|proc|ptr|raise|ref|return|shl|shr|static|template|try|tuple|type|using|var|when|while|with|without|xor|yield)\\b"
+    - statement: "\\b(deprecated|noSideEffect|constructor|destructor|override|procvar|compileTime|noReturn|acyclic|final|shallow|pure|asmNoStackFrame|error|fatal|warning|hint|line|linearScanEnd|computedGoto|unroll|immediate|checks|boundsChecks|overflowChecks|nilChecks|assertations|warnings|hints|optimization|patterns|callconv|push|pop|global|pragma|experimental|bitsize|volatile|noDecl|header|incompleteStruct|compile|link|passC|passL|emit|importc|importcpp|importobjc|codegenDecl|injectStmt|intdefine|strdefine|varargs|exportc|extern|bycopy|byref|union|packed|unchecked|dynlib|cdecl|thread|gcsafe|threadvar|guard|locks|compileTime)\\b"
+    - symbol.operator: "[=\\+\\-\\*/<>@\\$~&%\\|!\\?\\^\\.:\\\\]+"
+    - special: "\\{\\.|\\.\\}|\\[\\.|\\.\\]|\\(\\.|\\.\\)|;|,|`"
+    - statement: "\\.\\."
+    - type: "\\b(int|cint|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|float|float32|float64|bool|char|enum|string|cstring|array|openarray|seq|varargs|tuple|object|set|void|auto|cshort|range|nil|T|untyped|typedesc)\\b"
+    - type: "'[iI](8|16|32|64)?\\b|'[uU](8|16|32|64)?\\b|'[fF](32|64|128)?\\b|'[dD]\\b"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant.number: "\\b0[xX][0-9A-Fa-f][0-9_A-Fa-f]+\\b"
+    - constant.number: "\\b0[ocC][0-7][0-7_]+\\b"
+    - constant.number: "\\b0[bB][01][01_]+\\b"
+    - constant.number: "\\b[0-9_]((\\.?)[0-9_]+)?[eE][+\\-][0-9][0-9_]+\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "[[:space:]]*#.*$"
+    - comment:
+        start: "\\#\\["
+        end: "\\]\\#"
+        rules: []
+
+    - todo: "(TODO|FIXME|XXX):?"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/objc.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/objc.yaml
@ -0,0 +1,60 @@
+filetype: objective-c
+
+detect:
+    filename: "\\.(m|mm|h)$"
+
+rules:
+    - type: "\\b(float|double|CGFloat|id|bool|BOOL|Boolean|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline|Class|SEL|IMP|NS(U)?Integer)\\b"
+    - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
+    - type: "\\b[A-Z][A-Z][[:alnum:]]*\\b"
+    - type: "\\b[A-Za-z0-9_]*_t\\b"
+    - type: "\\bdispatch_[a-zA-Z0-9_]*_t\\b"
+
+    - statement: "(__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__|__unused|_Nonnull|_Nullable|__block|__builtin.*)"
+    - statement: "\\b(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\\b"
+    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
+    - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
+    - statement: "\\b(goto|continue|break|return)\\b"
+    - statement: "\\b(nonatomic|atomic|readonly|readwrite|strong|weak|assign)\\b"
+    - statement: "@(encode|end|interface|implementation|class|selector|protocol|synchronized|try|catch|finally|property|optional|required|import|autoreleasepool)"
+
+    - preproc: "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma).*$"
+    - preproc: "__[A-Z0-9_]*__"
+
+    - special: "^[[:space:]]*[#|@][[:space:]]*(import|include)[[:space:]]*[\"|<].*\\/?[>|\"][[:space:]]*$"
+
+    - statement: "([.:;,+*|=!\\%\\[\\]]|<|>|/|-|&)"
+
+    - constant.number: "(\\b(-?)?[0-9]+\\b|\\b\\[0-9]+\\.[0-9]+\\b|\\b0x[0-9A-F]+\\b)"
+    - constant: "(@\\[(\\\\.|[^\\]])*\\]|@\\{(\\\\.|[^\\}])*\\}|@\\((\\\\.|[^\\)])*\\))"
+    - constant: "\\b<(\\\\.[^\\>])*\\>\\b"
+    - constant: "\\b(nil|NULL|YES|NO|TRUE|true|FALSE|false|self)\\b"
+    - constant: "\\bk[[:alnum]]*\\b"
+    - constant.string: "'.'"
+
+    - constant.string:
+        start: "@\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/ocaml.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/ocaml.yaml
@ -0,0 +1,26 @@
+filetype: ocaml
+
+detect:
+    filename: "\\.mli?$"
+
+rules:
+    # Numbers
+    ## Integers
+    ### Binary
+    - constant.number: "-?0[bB][01][01_]*"
+    ### Octal
+    - constant.number: "-?0[oO][0-7][0-7_]*"
+    ### Decimal
+    - constant.number: "-?\\d[\\d_]*"
+    ### Hexadecimal
+    - constant.number: "-?0[xX][0-9a-fA-F][0-9a-fA-F_]*"
+    ## Real
+    ### Decimal
+    - constant.number: "-?\\d[\\d_]*.\\d[\\d_]*([eE][+-]\\d[\\d_]*.\\d[\\d_]*)?"
+    ### Hexadecimal
+    - constant.number: "-?0[xX][0-9a-fA-F][0-9a-fA-F_]*.[0-9a-fA-F][0-9a-fA-F_]*([pP][+-][0-9a-fA-F][0-9a-fA-F_]*.[0-9a-fA-F][0-9a-fA-F_]*)?"
+    # Comments
+    - comment:
+        start: "\\(\\*"
+        end: "\\*\\)"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/pascal.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/pascal.yaml
@ -0,0 +1,45 @@
+filetype: pascal
+
+detect:
+    filename: "\\.pas$"
+
+rules:
+    - type: "\\b(?i:(string|ansistring|widestring|shortstring|char|ansichar|widechar|boolean|byte|shortint|word|smallint|longword|cardinal|longint|integer|int64|single|currency|double|extended))\\b"
+    - statement: "\\b(?i:(and|asm|array|begin|break|case|const|constructor|continue|destructor|div|do|downto|else|end|file|for|function|goto|if|implementation|in|inline|interface|label|mod|not|object|of|on|operator|or|packed|procedure|program|record|repeat|resourcestring|set|shl|shr|then|to|type|unit|until|uses|var|while|with|xor))\\b"
+    - statement: "\\b(?i:(as|class|dispose|except|exit|exports|finalization|finally|inherited|initialization|is|library|new|on|out|property|raise|self|threadvar|try))\\b"
+    - statement: "\\b(?i:(absolute|abstract|alias|assembler|cdecl|cppdecl|default|export|external|forward|generic|index|local|name|nostackframe|oldfpccall|override|pascal|private|protected|public|published|read|register|reintroduce|safecall|softfloat|specialize|stdcall|virtual|write))\\b"
+    - constant: "\\b(?i:(false|true|nil))\\b"
+    - special:
+        start: "asm"
+        end: "end"
+        rules: []
+    - constant.number: "\\$[0-9A-Fa-f]+"
+    - constant.number: "\\b[+-]?[0-9]+([.]?[0-9]+)?(?i:e[+-]?[0-9]+)?"
+    - constant.string:
+        start: "#[0-9]{1,}"
+        end: "$"
+        rules: 
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - preproc:
+        start: "{\\$"
+        end: "}"
+        rules: []
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+    - comment:
+        start: "\\(\\*"
+        end: "\\*\\)"
+        rules: []
+    - comment:
+        start: "({)(?:[^$])"
+        end: "}"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/patch.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/patch.yaml
@ -0,0 +1,13 @@
+filetype: patch
+
+detect: 
+    filename: "\\.(patch|diff)$"
+
+rules:
+    - brightgreen: "^\\+.*"
+    - green: "^\\+\\+\\+.*"
+    - brightblue: "^ .*"
+    - brightred: "^-.*"
+    - red: "^---.*"
+    - brightyellow: "^@@.*"
+    - magenta: "^diff.*"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/peg.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/peg.yaml
@ -0,0 +1,16 @@
+filetype: peg
+
+detect: 
+    filename: "\\.l?peg$"
+
+rules:
+    - identifier: "^[[:space:]]*[A-Za-z][A-Za-z0-9_]*[[:space:]]*<-"
+    - constant.number: "\\^[+-]?[0-9]+"
+    - symbol.operator: "[-+*?^/!&]|->|<-|=>"
+    - identifier.var: "%[A-Za-z][A-Za-z0-9_]*"
+    - special: "\\[[^]]*\\]"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - comment: "(^|[[:space:]])\\-\\-.*$"
+    - todo: "TODO:?"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/perl.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/perl.yaml
@ -0,0 +1,27 @@
+filetype: perl
+
+detect: 
+    filename: "\\.p[lm]$"
+    header: "^#!.*/(env +)?perl( |$)"
+
+rules:
+    - type: "\\b(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\\b|\\b(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\\b|\\b(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\\b|\\b(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\\b|\\b(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\\b"
+    - statement: "\\b(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\\b"
+    - identifier:
+        start: "[$@%]"
+        end: "((?i) |[^0-9A-Z_]|-)"
+        rules: []
+
+    - constant.string: "\".*\"|qq\\|.*\\|"
+    - default: "[sm]/.*/"
+    - preproc:
+        start: "(^use| = new)"
+        end: ";"
+        rules: []
+
+    - comment: "#.*"
+    - identifier.macro:
+        start: "<< 'STOP'"
+        end: "STOP"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/perl6.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/perl6.yaml
@ -0,0 +1,27 @@
+filetype: perl6
+
+detect: 
+    filename: "\\.p6$"
+
+rules:
+    - type: "\\b(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\\b"
+    - statement: "\\b(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\\b"
+    - special: "\\b(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\\b"
+    - identifier:
+        start: "[$@%]"
+        end: "( |\\\\W|-)"
+        rules: []
+
+    - constant.string: "\".*\"|qq\\|.*\\|"
+    - default: "[sm]/.*/"
+    - preproc:
+        start: "(^use| = new)"
+        end: ";"
+        rules: []
+
+    - comment: "#.*"
+    - identifier.macro:
+        start: "<<EOSQL"
+        end: "EOSQL"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/php.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/php.yaml
@ -0,0 +1,49 @@
+filetype: php
+
+detect: 
+    filename: "\\.php[2345s~]?$"
+
+rules:
+    - symbol.operator: "<|>"
+    - error: "<[^!].*?>"
+    - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
+    - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*|>)*?>"
+    - preproc: "(?i)<[/]?(script|style)( .*|>)*?>"
+    - 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: "<!--.+?-->"
+    - default: "<\\?(php|=)\" end=\"\\?>"
+    - identifier.class: "([a-zA-Z0-9_-]+)\\("
+    - preproc: "(require|include|require_once|include_once)"
+    - type: "\\b(var|class|extends|function|echo|case|default|exit|switch|extends|as|define|do|declare|in|trait|interface|[E|e]xception|array|int|string|bool|iterable|void)\\b"
+    - identifier.class: "[a-zA-Z\\\\]+::"
+    - identifier: "([A-Z][a-zA-Z0-9_]+)\\s"
+    - identifier: "([A-Z0-9_]+)[;|\\s|\\)|,]"
+    - type.keyword: "(global|public|private|protected|static|const)"
+    - statement: "(implements|abstract|instanceof|if|else(if)?|endif|namespace|use|as|new|throw|catch|try|while|print|(end)?(foreach)?)\\b"
+    - identifier: "new\\s([a-zA-Z0-9\\\\]+)"
+    - special: "(break|continue|goto|return)"
+    - constant.bool: "(true|false|null|TRUE|FALSE|NULL)"
+    - constant: "[\\s|=|\\s|\\(|/|+|-|\\*|\\[]"
+    - constant.number: "[0-9]"
+    - identifier: "(\\$this|parent|self|\\$this->)"
+    - symbol.operator: "(=>|===|!==|==|!=|&&|\\|\\||::|=|->|\\!)"
+    - identifier.var: "(\\$[a-zA-Z0-9\\-_]+)"
+    - symbol.operator: "[\\(|\\)|/|+|\\-|\\*|\\[|.|,|;]"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+    - symbol.brackets: "(\\[|\\]|\\{|\\}|[()])"
+    - comment: "(^|[[:space:]])//.*"
+    - comment: "(^|[[:space:]])#.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - preproc: "<\\?(php|=)?"
+    - preproc: "\\?>"
+    - preproc: "<!DOCTYPE.+?>"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/pkg-config.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/pkg-config.yaml
@ -0,0 +1,12 @@
+filetype: pc
+
+detect: 
+    filename: "\\.pc$"
+
+rules:
+    - preproc: "^(Name|Description|URL|Version|Conflicts|Cflags):"
+    - preproc: "^(Requires|Libs)(\\.private)?:"
+    - symbol.operator: "="
+    - identifier.var: "\\$\\{[A-Za-z_][A-Za-z0-9_]*\\}"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/po.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/po.yaml
@ -0,0 +1,12 @@
+filetype: po
+
+detect: 
+    filename: "\\.pot?$"
+
+rules:
+    - preproc: "\\b(msgid|msgstr)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - special: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/pony.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/pony.yaml
@ -0,0 +1,37 @@
+filetype: pony
+
+detect: 
+    filename: "\\.pony$"
+
+rules:
+    - statement: "\\b(type|interface|trait|primitive|class|struct|actor)\\b"
+    - statement: "\\b(compiler_intrinsic)\\b"
+    - statement: "\\b(use)\\b"
+    - statement: "\\b(var|let|embed)\\b"
+    - statement: "\\b(new|be|fun)\\b"
+    - statement: "\\b(iso|trn|ref|val|box|tag|consume)\\b"
+    - statement: "\\b(break|continue|return|error)\\b"
+    - statement: "\\b(if|then|elseif|else|end|match|where|try|with|as|recover|object|lambda|as|digestof|ifdef)\\b"
+    - statement: "\\b(while|do|repeat|until|for|in)\\b"
+    - statement: "(\\?|=>)"
+    - statement: "(\\||\\&|\\,|\\^)"
+    - symbol.operator: "(\\-|\\+|\\*|/|\\!|%|<<|>>)"
+    - symbol.operator: "(==|!=|<=|>=|<|>)"
+    - statement: "\\b(is|isnt|not|and|or|xor)\\b"
+    - type: "\\b(_*[A-Z][_a-zA-Z0-9\\']*)\\b"
+    - constant: "\\b(this)\\b"
+    - constant.bool: "\\b(true|false)\\b"
+    - constant.number: "\\b((0b[0-1_]*)|(0o[0-7_]*)|(0x[0-9a-fA-F_]*)|([0-9_]+(\\.[0-9_]+)?((e|E)(\\\\+|-)?[0-9_]+)?))\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\""
+    - comment:
+        start: "\"\"\"[^\"]*"
+        end: "\"\"\""
+        rules: []
+
+    - comment: "(^|[[:space:]])//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
+    - todo: "TODO:?"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/pov.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/pov.yaml
@ -0,0 +1,21 @@
+filetype: pov
+
+detect: 
+    filename: "\\.(pov|POV|povray|POVRAY)$"
+
+rules:
+    - preproc: "^[[:space:]]*#[[:space:]]*(declare)"
+    - statement: "\\b(sphere|cylinder|translate|matrix|rotate|scale)\\b"
+    - statement: "\\b(orthographic|location|up|right|direction|clipped_by)\\b"
+    - statement: "\\b(fog_type|fog_offset|fog_alt|rgb|distance|transform)\\b"
+    - identifier: "^\\b(texture)\\b"
+    - identifier: "\\b(light_source|background)\\b"
+    - identifier: "\\b(fog|object|camera)\\b"
+    - symbol.operator: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+    - special: "\\b(union|group|subgroup)\\b"
+    - comment: "//.*"
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-action.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-action.yaml
@ -0,0 +1,14 @@
+filetype: privoxy-action
+
+detect: 
+    filename: "\\.action$"
+
+rules:
+    - constant.bool.false: "[{[:space:]]\\-block([[:space:]{}]|$)"
+    - constant.bool.true: "[{[:space:]]\\+block([[:space:]{}]|$)"
+    - constant.bool.false: "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+    - constant.bool.true: "\\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-config.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-config.yaml
@ -0,0 +1,10 @@
+filetype: privoxy-config
+
+detect: 
+    filename: "privoxy/config$"
+
+rules:
+    - statement: "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-filter.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/privoxy-filter.yaml
@ -0,0 +1,12 @@
+filetype: privoxy-filter
+
+detect: 
+    filename: "\\.filter$"
+
+rules:
+    - statement: "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
+    - identifier: "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
+    - constant.specialChar: "\\\\.?"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/puppet.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/puppet.yaml
@ -0,0 +1,22 @@
+filetype: puppet
+
+detect: 
+    filename: "\\.pp$"
+
+rules:
+    - default: "^[[:space:]]([a-z][a-z0-9_]+)"
+    - identifier.var: "\\$[a-z:][a-z0-9_:]+"
+    - type: "\\b(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|anchor)\\b"
+    - statement: "\\b(class|define|if|else|undef|inherits)\\b"
+    - symbol: "(=|-|~|>)"
+    - identifier.var: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - symbol: "([      ]|^):[0-9A-Z_]+\\b"
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - special: "\\$\\{[^}]*\\}"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment.bright: "##[^{].*$|##$"
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
+    - indent-char.whitespace: "[[:space:]]+$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/python2.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/python2.yaml
@ -0,0 +1,60 @@
+filetype: python
+
+detect:
+    filename: "\\.py$"
+    header: "^#!.*/(env +)?python( |$)"
+
+rules:
+
+    # built-in objects
+    - constant: "\\b(None|self|True|False)\\b"
+      # built-in attributes
+    - constant: "\\b(__bases__|__builtin__|__class__|__debug__|__dict__|__doc__|__file__|__members__|__methods__|__name__|__self__)\\b"
+      # built-in functions
+    - identifier: "\\b(abs|apply|callable|chr|cmp|compile|delattr|dir|divmod|eval|exec|execfile|filter|format|getattr|globals|hasattr|hash|help|hex|id|input|intern|isinstance|issubclass|len|locals|max|min|next|oct|open|ord|pow|range|raw_input|reduce|reload|repr|round|setattr|unichr|vars|zip|__import__)\\b"
+      # special method names
+    - identifier: "\\b(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__dict__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__long__|__lshift__|__mod__|__mul__|__neg__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__)\\b"
+      # types
+    - type: "\\b(basestring|bool|buffer|bytearray|bytes|classmethod|complex|dict|enumerate|file|float|frozenset|int|list|long|map|memoryview|object|property|reversed|set|slice|staticmethod|str|super|tuple|type|unicode|xrange)\\b"
+      # definitions
+    - identifier: "def [a-zA-Z_0-9]+"
+      # keywords
+    - statement: "\\b(and|as|assert|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\\b"
+      # decorators
+    - brightgreen: "@.*[(]"
+      # operators
+    - statement: "([.:;,+*|=!\\%@]|<|>|/|-|&)"
+      # parentheses
+    - statement: "([(){}]|\\[|\\])"
+      # numbers
+    - constant.number: "\\b[0-9]+\\b"
+
+    - comment:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules: []
+
+    - comment:
+        start: "'''"
+        end: "'''"
+        rules: []
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/python3.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/python3.yaml
@ -0,0 +1,59 @@
+filename: python3
+
+detect:
+    filename: "\\.py3$"
+    header: "^#!.*/(env +)?python3$"
+
+rules:
+    # built-in objects
+    - constant: "\\b(None|self|True|False)\\b"
+      # built-in attributes
+    - constant: "\\b(__bases__|__builtin__|__class__|__debug__|__dict__|__doc__|__file__|__members__|__methods__|__name__|__self__)\\b"
+      # built-in functions
+    - identifier: "\\b(abs|all|any|ascii|bin|callable|chr|compile|delattr|dir|divmod|eval|exec|format|getattr|globals|hasattr|hash|help|hex|id|input|isinstance|issubclass|iter|len|locals|max|min|next|oct|open|ord|pow|print|repr|round|setattr|sorted|sum|vars|__import__)\\b"
+      # special method names
+    - identifier: "\\b(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__dict__|__long__|__lshift__|__mod__|__mul__|__neg__|__next__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__)\\b"
+      # types
+    - type: "\\b(bool|bytearray|bytes|classmethod|complex|dict|enumerate|filter|float|frozenset|int|list|map|memoryview|object|property|range|reversed|set|slice|staticmethod|str|super|tuple|type|zip)\\b"
+      # definitions
+    - identifier: "def [a-zA-Z_0-9]+" 
+      # keywords
+    - statement: "\\b(and|as|assert|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|raise|return|try|while|with|yield)\\b" 
+      # decorators
+    - brightgreen: "@.*[(]"
+      # operators
+    - statement: "([.:;,+*|=!\\%@]|<|>|/|-|&)"
+      # parentheses
+    - statement: "([(){}]|\\[|\\])"
+      # numbers
+    - constant.number: "\\b[0-9]+\\b"
+
+    - comment:
+        start: "\"\"\""
+        end: "\"\"\""
+        rules: []
+
+    - comment:
+        start: "'''"
+        end: "'''"
+        rules: []
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/r.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/r.yaml
@ -0,0 +1,12 @@
+filetype: r
+
+detect:
+    filename: "\\.(r|R)$"
+
+rules:
+    - statement: "\\b(break|else|for|function|if|in|next|repeat|return|while)\\b"
+    - constant: "\\b(TRUE|FALSE|NULL|Inf|NaN|NA|NA_integer_|NA_real_|NA_complex_|NA_character_)\\b"
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []
--- a/vendor/github.com/zyedidia/highlight/syntax_files/reST.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/reST.yaml
@ -0,0 +1,18 @@
+filetype: rst
+
+detect:
+    filename: "\\.rest$|\\.rst$"
+
+rules:
+    - statement: "\\*\\*[^*]+\\*\\*"
+    - preproc: "::"
+    - constant.string: "`[^`]+`_{1,2}"
+    - constant.string: "``[^`]+``"
+    - identifier: "^\\.\\. .*$"
+    - identifier: "^__ .*$"
+    - type: "^###+$"
+    - type: "^\\*\\*\\*+$"
+    - special: "^===+$"
+    - special: "^---+$"
+    - special: "^\\^\\^\\^+$"
+    - special: "^\"\"\"+$"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/rpmspec.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/rpmspec.yaml
@ -0,0 +1,43 @@
+filetype: rpmspec
+
+detect: 
+    filename: "\\.spec$|\\.rpmspec$"
+
+rules:
+    - preproc: "\\b(Icon|ExclusiveOs|ExcludeOs):"
+    - preproc: "\\b(BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):"
+    - preproc: "\\b(Conflicts|Obsoletes|Provides|Requires|Requires\\(.*\\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements):"
+    - preproc: "\\b(Epoch|Serial|Nosource|Nopatch):"
+    - preproc: "\\b(AutoReq|AutoProv|AutoReqProv):"
+    - preproc: "\\b(Copyright|License|Summary|Summary\\(.*\\)|Distribution|Vendor|Packager|Group|Source[0-9]*|Patch[0-9]*|BuildRoot|Prefix):"
+    - preproc: "\\b(Name|Version|Release|Url|URL):"
+    - preproc:
+        start: "^(Source|Patch)"
+        end: ":"
+        rules: []
+
+    - preproc: "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
+    - preproc: "(ifarch|ifnarch|ifos|ifnos)"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - statement: "%(if|else|endif|define|global|undefine)"
+    - statement: "%_?([A-Z_a-z_0-9_]*)"
+    - statement:
+        start: "%\\{"
+        end: "\\}"
+        rules: []
+
+    - statement:
+        start: "%\\{__"
+        end: "\\}"
+        rules: []
+
+    - statement: "\\$(RPM_BUILD_ROOT)\\>"
+    - special: "^%(build$|changelog|check$|clean$|description)"
+    - special: "^%(files|install$|package|prep$)"
+    - special: "^%(pre|preun|pretrans|post|postun|posttrans)"
+    - special: "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)"
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - constant: "^\\*.*$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
+    - todo: "TODO:?"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/ruby.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/ruby.yaml
@ -0,0 +1,30 @@
+filetype: ruby
+
+detect: 
+    filename: "\\.rb$|\\.ru|\\.rbx|\\.rake|\\.gemspec$|Gemfile|Rakefile|Capfile|Vagrantfile"
+    header: "^#!.*/(env +)?ruby( |$)"
+
+rules:
+    - statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\\b"
+    - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - constant.number: "\\b[0-9]+\\b"
+    - constant: "(i?)([ 	]|^):[0-9A-Z_]+\\b"
+    - constant: "\\b(__FILE__|__LINE__)\\b"
+    - constant: "/([^/]|(\\\\/))*/[iomx]*|%r\\{([^}]|(\\\\}))*\\}[iomx]*"
+    - constant.string: "`[^`]*`|%x\\{[^}]*\\}"
+    - constant.string: "\"([^\"]|(\\\\\"))*\"|%[QW]?\\{[^}]*\\}|%[QW]?\\([^)]*\\)|%[QW]?<[^>]*>|%[QW]?\\[[^]]*\\]|%[QW]?\\$[^$]*\\$|%[QW]?\\^[^^]*\\^|%[QW]?![^!]*!"
+    - special: "#\\{[^}]*\\}"
+    - constant.string: "'([^']|(\\\\'))*'|%[qw]\\{[^}]*\\}|%[qw]\\([^)]*\\)|%[qw]<[^>]*>|%[qw]\\[[^]]*\\]|%[qw]\\$[^$]*\\$|%[qw]\\^[^^]*\\^|%[qw]![^!]*!"
+    - comment: "#[^{].*$|#$"
+    - comment:
+        start: "=begin"
+        end: "=end"
+        rules: []
+    - comment.bright: "##[^{].*$|##$"
+    - constant.macro:
+        start: "<<-?'?EOT'?"
+        end: "^EOT"
+        rules: []
+
+    - todo: "(XXX|TODO|FIXME|\\?\\?\\?)"
+    - preproc.shebang: "^#!.+?( |$)"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/rust.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/rust.yaml
@ -0,0 +1,48 @@
+filetype: rust
+
+detect:
+    filename: "\\.rs$"
+
+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"
+      # macros
+    - special: "[a-z_]+!"
+      # Constants
+    - constant: "[A-Z][A-Z_]+"
+      # Numbers
+    - constant.number: "\\b[0-9]+\\b"
+      # Traits/Enums/Structs/Types/etc.
+    - type: "[A-Z][a-z]+"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "r#+\""
+        end: "\"#+"
+        rules: []
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - special:
+        start: "#!\\["
+        end: "\\]"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/scala.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/scala.yaml
@ -0,0 +1,29 @@
+filetype: scala
+
+detect:
+    filename: "\\.scala$"
+
+rules:
+    - type: "\\b(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\\b"
+    - statement: "\\b(match|val|var|break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\\b"
+    - statement: "\\b(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile|sealed)\\b"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant: "\\b(true|false|null)\\b"
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+    - comment:
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+    - comment:
+        start: "/\\*\\*"
+        end: "\\*/"
+        rules: []
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/sed.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/sed.yaml
@ -0,0 +1,13 @@
+filetype: sed
+
+detect: 
+    filename: "\\.sed$"
+    header: "^#!.*bin/(env +)?sed( |$)"
+
+rules:
+    - symbol.operator: "[|^$.*+]"
+    - constant.number: "\\{[0-9]+,?[0-9]*\\}"
+    - constant.specialChar: "\\\\."
+    - comment: "(^|[[:space:]])#([^{].*)?$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/sh.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/sh.yaml
@ -0,0 +1,43 @@
+filetype: shell
+
+detect:
+    filename: "(\\.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( |$)"
+
+rules:
+    # Numbers
+    - constant.number: "\\b[0-9]+\\b"
+      # Conditionals and control flow
+    - statement: "\\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\\b"
+    - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|!|=|&|\\|)"
+      # Shell commands
+    - type: "\\b(cd|echo|export|let|set|umask|unset)\\b"
+      # Common linux commands
+    - type: "\\b((g|ig)?awk|bash|dash|find|\\w{0,4}grep|kill|killall|\\w{0,4}less|make|pkill|sed|sh|tar)\\b"
+      # Coreutils commands
+    - type: "\\b(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|time|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\\b"
+      # Conditional flags
+    - statement: "--[a-z-]+"
+    - statement: "\\ -[a-z]+"
+
+    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+    - identifier: "\\$\\{?[0-9A-Z_!@#$*?-]+\\}?"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/sls.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/sls.yaml
@ -0,0 +1,15 @@
+filetype: salt
+
+detect: 
+    filename: "\\.sls$"
+
+rules:
+    - identifier.var: "^[^ -].*:$"
+    - identifier.var: ".*:"
+    - default: "salt:"
+    - constant.number: "/*[0-9]/*"
+    - constant.bool: "\\b(True|False)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - special: "\\b(grain|grains|compound|pcre|grain_pcre|list|pillar)\\b"
+    - comment: "^#.*"
+    - statement: "\\b(if|elif|else|or|not|and|endif|end)\\b"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/solidity.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/solidity.yaml
@ -0,0 +1,41 @@
+filetype: solidity
+
+detect:
+    filename: "\\.sol$"
+
+rules:
+    - preproc: "\\b(contract|library|pragma)\\b"
+    - constant.number: "\\b[-]?([0-9]+|0x[0-9a-fA-F]+)\\b"
+    - identifier: "[a-zA-Z][_a-zA-Z0-9]*[[:space:]]*"
+    - statement: "\\b(assembly|break|continue|do|for|function|if|else|new|return|returns|while)\\b"
+    - special: "\\b(\\.send|throw)\\b" # make sure they are very visible
+    - keyword: "\\b(anonymous|constant|indexed|payable|public|private|external|internal)\\b"
+    - constant: "\\b(block(\\.(blockhash|coinbase|difficulty|gaslimit|number|timestamp))?|msg(\\.(data|gas|sender|value))?|now|tx(\\.(gasprice|origin))?)\\b"
+    - constant: "\\b(keccak256|sha3|sha256|ripemd160|ecrecover|addmod|mulmod|this|super|selfdestruct|\\.balance)\\b"
+    - constant: "\\b(true|false)\\b"
+    - constant: "\\b(wei|szabo|finney|ether|seconds|minutes|hours|days|weeks|years)\\b"
+    - type: "\\b(address|bool|mapping|string|var|int(\\d*)|uint(\\d*)|byte(\\d*)|fixed(\\d*)|ufixed(\\d*))\\b"
+    - error: "\\b(abstract|after|case|catch|default|final|in|inline|interface|let|match|null|of|pure|relocatable|static|switch|try|type|typeof|view)\\b"
+    - operator: "[-+/*=<>!~%?:&|]"
+    - comment:
+        start: "//"
+        end: "$"
+        rules: []
+    - comment: 
+        start: "/\\*"
+        end: "\\*/"
+        rules: []
+    - todo: "TODO:?"
+    - constant.string: 
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
--- a/vendor/github.com/zyedidia/highlight/syntax_files/sql.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/sql.yaml
@ -0,0 +1,35 @@
+filetype: sql
+
+detect: 
+    filename: "\\.sql$|sqliterc$"
+
+rules:
+    - statement: "(?i)\\b(ALL|ASC|AS|ALTER|AND|ADD|AUTO_INCREMENT)\\b"
+    - statement: "(?i)\\b(BETWEEN|BINARY|BOTH|BY|BOOLEAN)\\b"
+    - statement: "(?i)\\b(CHANGE|CHECK|COLUMNS|COLUMN|CROSS|CREATE)\\b"
+    - statement: "(?i)\\b(DATABASES|DATABASE|DATA|DELAYED|DESCRIBE|DESC|DISTINCT|DELETE|DROP|DEFAULT)\\b"
+    - statement: "(?i)\\b(ENCLOSED|ESCAPED|EXISTS|EXPLAIN)\\b"
+    - statement: "(?i)\\b(FIELDS|FIELD|FLUSH|FOR|FOREIGN|FUNCTION|FROM)\\b"
+    - statement: "(?i)\\b(GROUP|GRANT|HAVING)\\b"
+    - statement: "(?i)\\b(IGNORE|INDEX|INFILE|INSERT|INNER|INTO|IDENTIFIED|IN|IS|IF)\\b"
+    - statement: "(?i)\\b(JOIN|KEYS|KILL|KEY)\\b"
+    - statement: "(?i)\\b(LEADING|LIKE|LIMIT|LINES|LOAD|LOCAL|LOCK|LOW_PRIORITY|LEFT|LANGUAGE)\\b"
+    - statement: "(?i)\\b(MODIFY|NATURAL|NOT|NULL|NEXTVAL)\\b"
+    - statement: "(?i)\\b(OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUTFILE|OR|OUTER|ON)\\b"
+    - statement: "(?i)\\b(PROCEDURE|PROCEDURAL|PRIMARY)\\b"
+    - statement: "(?i)\\b(READ|REFERENCES|REGEXP|RENAME|REPLACE|RETURN|REVOKE|RLIKE|RIGHT)\\b"
+    - statement: "(?i)\\b(SHOW|SONAME|STATUS|STRAIGHT_JOIN|SELECT|SETVAL|SET)\\b"
+    - statement: "(?i)\\b(TABLES|TERMINATED|TO|TRAILING|TRUNCATE|TABLE|TEMPORARY|TRIGGER|TRUSTED)\\b"
+    - statement: "(?i)\\b(UNIQUE|UNLOCK|USE|USING|UPDATE|VALUES|VARIABLES|VIEW)\\b"
+    - statement: "(?i)\\b(WITH|WRITE|WHERE|ZEROFILL|TYPE|XOR)\\b"
+    - type: "(?i)\\b(VARCHAR|TINYINT|TEXT|DATE|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT|FLOAT|DOUBLE|DECIMAL|DATETIME|TIMESTAMP|TIME|YEAR|UNSIGNED|CHAR|TINYBLOB|TINYTEXT|BLOB|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|ENUM|BOOL|BINARY|VARBINARY)\\b"
+    - preproc: "(?i)\\.\\b(databases|dump|echo|exit|explain|header(s)?|help)\\b"
+    - preproc: "(?i)\\.\\b(import|indices|mode|nullvalue|output|prompt|quit|read)\\b"
+    - preproc: "(?i)\\.\\b(schema|separator|show|tables|timeout|width)\\b"
+    - constant.bool: "\\b(ON|OFF)\\b"
+    - constant.number: "\\b([0-9]+)\\b"
+    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - constant.string: "`(\\\\.|[^\\\\`])*`"
+    - comment: "\\-\\-.*$"
+    - indent-char.whitespace: "[[:space:]]+$"
+    - indent-char: "	+ +| +	+"
--- a/vendor/github.com/zyedidia/highlight/syntax_files/swift.yaml
+++ b/vendor/github.com/zyedidia/highlight/syntax_files/swift.yaml
@ -0,0 +1,51 @@
+filetype: swift
+
+detect:
+    filename: "\\.swift$"
+
+rules:
+    # Operators
+    - statement: "([.:;,+*|=!?\\%]|<|>|/|-|&)"
+
+      # Statements
+    - statement:  "(class|import|let|var|struct|enum|func|if|else|switch|case|default|for|in|internal|external|unowned|private|public|throws)\\ "
+    - statement:  "(prefix|postfix|operator|extension|lazy|get|set|self|willSet|didSet|override|super|convenience|weak|strong|mutating|return|guard)\\ "
+
+      # Keywords
+    - statement: "(print)"
+    - statement: "(init)"
+
+      # Numbers
+    - constant.number: "([0-9]+)"
+
+      # Standard Types
+    - type: "\\ ((U)?Int(8|16|32|64))"
+    - constant: "(true|false|nil)"
+    - type: "\\ (Double|String|Float|Boolean|Dictionary|Array|Int)"
+    - type: "\\ (AnyObject)"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "///"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - comment:
+        start: "/\\*\\*"
+        end: "\\*/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
--- a/Show More
+++ b/Show More