Merge

cmd/micro/highlighter.go

@@ -80,6 +80,7 @@ var preInstalledSynFiles = []string{
 	"man",
 	"markdown",
 	"mpdconf",
+	"micro",
 	"nanorc",
 	"nginx",
 	"ocaml",

cmd/micro/runtime.go

@@ -70,6 +70,7 @@
 // runtime/syntax/makefile.micro
 // runtime/syntax/man.micro
 // runtime/syntax/markdown.micro
+// runtime/syntax/micro.micro
 // runtime/syntax/mpdconf.micro
 // runtime/syntax/nanorc.micro
 // runtime/syntax/nginx.micro
@@ -1576,6 +1577,26 @@ func runtimeSyntaxMarkdownMicro() (*asset, error) {
 	return a, nil
 }
 
+var _runtimeSyntaxMicroMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x6c\x91\x4f\x6f\xb3\x30\x0c\xc6\xef\x7c\x8a\x28\x7d\x0f\xa5\x15\x08\xbd\xb7\x49\xeb\xb4\x5e\x76\xdb\x27\x28\x9d\x14\x82\xdb\x46\x05\x07\x19\xa3\x81\xe4\x0f\x3f\x91\x74\xa3\xd3\x7a\x41\xfe\xf3\x7b\xec\x07\x67\xa5\xde\x9d\x25\xaf\xfa\x09\xd9\x8c\xaa\x9a\xd4\x33\x3a\x7b\xf5\x8d\x99\x8a\xff\xaf\x0e\x2b\x3f\xe6\x34\xbc\x24\xb7\xbe\x6e\x67\x5a\x2b\x5d\xe6\xeb\x10\xa6\xff\x74\x92\x58\xdf\x78\x52\x3d\x1b\x86\x16\x90\x95\x2e\xab\x75\x14\x48\x68\xc5\x6f\xd6\x38\xbc\xa6\x65\xa5\x1f\xf3\x6c\x88\x77\x02\x58\xef\xee\x18\x57\x03\xb2\x3b\x39\xa0\x00\xd5\x70\x32\x43\xc3\x62\x7d\x3b\x0b\x65\x69\x8b\xf5\xd8\xb3\x41\x5e\x82\x9e\xc9\xe1\x79\xc9\x71\x68\x2b\x20\xf9\x59\x2b\x1d\x41\x47\xde\x0a\x4f\x1d\x48\xdf\x81\x75\xa6\x91\x01\x6b\xa0\xc6\x21\xd4\x02\x44\x9e\x84\x7d\xed\x83\x68\xe8\xe7\xb2\x38\x9c\x97\x66\xf6\x62\x48\xe6\xc2\xee\x36\xf7\x3c\x30\x03\x65\x51\x74\x4b\x3e\x0d\x61\xf0\x30\x50\x1f\x0f\x00\x77\x3f\xf7\xed\x2c\x8f\x4e\x95\xd6\xeb\xb2\xcc\xe5\xf0\xa1\x8f\xe9\x46\xff\xa1\xe2\x9e\x70\x07\xb9\xc8\x5e\x8a\x31\xdd\x1e\x8a\xec\xe9\xb8\x0d\x79\xba\x7d\x30\x79\xd1\x14\xe3\xcc\x2a\x93\x9d\xd4\x3e\x7b\x3b\xfe\x82\xdb\xf8\x0a\xab\x7c\xa3\x93\xaf\x00\x00\x00\xff\xff\xee\xb2\xfb\x8e\x11\x02\x00\x00")
+
+func runtimeSyntaxMicroMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxMicroMicro,
+		"runtime/syntax/micro.micro",
+	)
+}
+
+func runtimeSyntaxMicroMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxMicroMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/micro.micro", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 var _runtimeSyntaxMpdconfMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x5c\xcd\x61\x6a\xe3\x30\x10\x05\xe0\xdf\xc9\x29\xc4\x6c\x20\x96\xbd\xe4\x00\x61\xd9\x3d\x88\x65\x1b\x59\x9a\x38\x22\xb2\x24\xa4\x11\x5b\x93\xe9\xdd\x4b\x4b\x43\xd3\xfe\x19\x78\xcc\xe3\x7b\x65\x0b\xa4\x5f\x04\xac\xc9\xc2\xc7\x55\x27\x13\xc3\xe5\x00\xfb\xbd\x89\x3e\x66\x61\x36\x1d\x04\xa8\x3f\x4d\x2d\x98\x79\xc9\xb1\x26\x9e\x5d\xb0\x13\xc5\x49\x5b\x9b\xb1\x14\xbe\xc6\x42\x9c\x62\x26\x4e\xbe\x2e\x2e\x70\xd0\x2b\x32\x6d\x09\xa5\xfa\x0b\x3f\xa1\x66\xad\xc5\x19\x4e\x5e\x6f\xde\x15\x92\x93\x75\x19\x0d\xc5\xbc\x71\x63\x67\xf6\x71\xe1\x42\x9a\x90\x93\xb3\x5c\xc8\x99\x1b\x66\x39\x5d\x9c\x7f\xd6\xe6\xec\x96\x2b\xad\x7a\xc1\x40\x5a\xc0\xd8\xb8\x90\x2a\xb1\xae\xd6\xc5\x29\x56\x7a\x0f\x16\x4d\xb4\x98\x65\xdf\x9f\x4b\xd2\x06\xcf\xc3\xd0\xaa\x3b\xab\xd7\x07\xb2\xa1\xf7\xf1\xbf\x00\x68\x94\x3a\x71\x3f\xc2\x20\x5b\xe0\xe3\x67\x3a\x0e\xb2\x3d\x7e\xdf\x9b\xbd\x36\x37\x01\xcd\xc8\x4f\xa6\xfc\xd5\xf4\xe3\x7d\x38\xb5\xf2\xdf\xe1\x51\xff\xbd\x64\xc4\x20\xe0\xa9\xd6\x7d\x3d\x33\x5a\x01\xbb\x4e\x74\x2c\xba\x5d\x07\xfb\xb7\x00\x00\x00\xff\xff\x77\xa4\x45\x84\x85\x01\x00\x00")
 
 func runtimeSyntaxMpdconfMicroBytes() ([]byte, error) {
@@ -2478,6 +2499,7 @@ var _bindata = map[string]func() (*asset, error){
 	"runtime/syntax/makefile.micro": runtimeSyntaxMakefileMicro,
 	"runtime/syntax/man.micro": runtimeSyntaxManMicro,
 	"runtime/syntax/markdown.micro": runtimeSyntaxMarkdownMicro,
+	"runtime/syntax/micro.micro": runtimeSyntaxMicroMicro,
 	"runtime/syntax/mpdconf.micro": runtimeSyntaxMpdconfMicro,
 	"runtime/syntax/nanorc.micro": runtimeSyntaxNanorcMicro,
 	"runtime/syntax/nginx.micro": runtimeSyntaxNginxMicro,
@@ -2643,6 +2665,7 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"makefile.micro": &bintree{runtimeSyntaxMakefileMicro, map[string]*bintree{}},
 			"man.micro": &bintree{runtimeSyntaxManMicro, map[string]*bintree{}},
 			"markdown.micro": &bintree{runtimeSyntaxMarkdownMicro, map[string]*bintree{}},
+			"micro.micro": &bintree{runtimeSyntaxMicroMicro, map[string]*bintree{}},
 			"mpdconf.micro": &bintree{runtimeSyntaxMpdconfMicro, map[string]*bintree{}},
 			"nanorc.micro": &bintree{runtimeSyntaxNanorcMicro, map[string]*bintree{}},
 			"nginx.micro": &bintree{runtimeSyntaxNginxMicro, map[string]*bintree{}},

runtime/syntax/ini.micro

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

runtime/syntax/micro.micro

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