github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-02-05 14:40:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve html syntax rules

Browse Source
This commit is contained in:
Zachary Yedidia
2017-03-29 10:08:37 -04:00
parent 1c2b57dfe8
commit 05aa30d1be
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/micro/runtime.go
View File

@@ -660,7 +660,7 @@ func runtimeColorschemesMonochromeMicro() (*asset, error) {
return a, nil
}
var _runtimeColorschemesMonokaiMicro = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x93\xc1\xae\x9b\x30\x10\x45\xf7\xfd\x0a\xcb\xde\x06\xd4\x90\xc4\x10\x75\x05\x05\x96\x55\x7f\xc1\xe0\x49\x6a\xc5\xd8\x68\x6c\xab\xcd\xdf\x57\xa6\xa4\x4d\x2a\x3f\xde\xcb\x6c\x2c\xe5\xcc\x9d\xf1\xf5\x65\xb4\xda\x62\xa6\x95\xb9\x11\x09\x17\x11\xb4\x27\x94\xf5\x55\x5f\xf5\xc5\x8e\x15\x55\x2c\xfa\xe9\x09\x1a\xed\x34\x81\x89\x50\x79\x2a\xf7\xa7\x2e\x09\x29\x09\xc6\xab\x8b\x02\x24\x94\x71\xde\x9e\xbb\xfe\x0d\x31\xe3\xbc\x58\xd4\xea\xae\xda\xf7\xdb\x54\xee\x3c\x2a\x73\x25\x94\x75\xbc\x6d\xca\xe3\x47\xe0\x7c\xfc\x21\xe2\x12\x4d\xdb\xf1\xba\x4d\x76\x38\x2f\x3c\xac\x77\xea\xcf\x05\x2f\xd3\x17\x77\xf7\x69\xb0\x7a\x9b\x99\x11\x66\xb4\x23\xa1\xec\x6b\x73\x6c\xf6\x3c\x09\xf9\xfb\x0c\xdb\xb6\xb8\x19\x46\x25\xe2\xac\x9a\x77\x45\x91\xf6\x38\x18\x09\xa8\x95\x01\x49\x28\x6b\x0f\x07\x5e\xa5\x77\x02\x44\x8b\x84\x0e\x56\x4b\xb2\xb9\x96\x95\xf6\x81\x6d\xc8\x45\xb7\x82\x8b\x73\x09\x5d\xff\xdf\xad\x79\x79\x95\x13\xc3\xb0\x38\xbf\xc1\x28\x13\x73\x92\xad\x4f\x74\xfa\x1c\x2b\x39\x34\x8e\xcb\x4c\x98\x86\x25\x50\xf5\xf2\xdb\xb1\x43\x11\xeb\xf5\xf5\x03\x62\x94\x4c\x37\x24\x94\xaf\xc1\x7b\xc0\x6c\x35\x69\xcb\x9f\x95\xfc\x29\xd0\xbc\x1f\xc2\x80\xee\xcf\x39\xba\x94\xda\x73\x39\x8e\x56\x87\xc9\x3c\x11\xec\x9b\x25\xf0\xcb\x83\x91\x20\x97\x9c\xb8\x2f\xe4\xbb\x16\xca\x90\x01\xc5\x78\x03\xef\xf2\xff\x93\x94\xff\xe5\xe9\xfa\xfd\x26\x52\x9b\x3f\xda\xff\x41\xbf\x03\x00\x00\xff\xff\xf7\xc7\x12\x52\xf8\x03\x00\x00")
var _runtimeColorschemesMonokaiMicro = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x93\xcd\x6e\xe3\x20\x14\x85\xf7\xf3\x14\x08\xb6\xb1\x35\x71\x12\xec\x68\x56\xf6\xd8\x5e\x56\x7d\x05\x6c\x6e\x52\x14\x0c\x16\x3f\x6a\xf3\xf6\x15\xae\x53\x25\x15\xa5\x35\x1b\x24\x7f\xf7\xdc\xcb\xe1\x30\x6a\xa9\x4d\x26\x85\xba\x20\x0e\x27\xe6\xa5\x43\x98\xf4\x55\x5f\xf5\xc5\x86\x14\x55\x58\xf8\xcf\x1d\x34\xea\x69\x02\x15\xa0\xf2\x50\x6e\x0f\x5d\x14\x12\x1c\x94\x13\x27\x01\x06\x61\x42\x69\x7b\xec\xfa\x6f\xc4\x94\x75\x6c\x51\xab\xbb\x6a\xdb\xa7\xa9\xdc\x3a\x23\xd4\x19\x61\xd2\xd1\xb6\x29\xf7\xbf\x81\xf3\xf1\x85\x85\x21\x9a\xb6\xa3\x75\x1b\xad\xb0\x8e\x39\x58\xcf\xd4\x1f\x0b\x5a\xc6\x0f\x6e\xaf\xd3\xa0\x65\x9a\x99\x0d\xcc\x46\x8f\x08\x93\xff\xcd\xbe\xd9\xd2\x28\xe4\xae\x33\xa4\x6d\xb1\x33\x8c\x82\x85\x5e\x35\xed\x8a\x22\xee\xb1\x57\x1c\x8c\x14\x0a\x38\xc2\xa4\xdd\xed\x68\x15\x9f\x09\x8c\xd1\x06\xe1\x41\x4b\x8e\x92\x63\x69\xae\x6f\x58\x42\x2e\xb8\xe5\x6d\xe8\x8b\xf0\xfa\x7f\xb3\xe6\xe5\x51\x8e\x0d\xc3\xe2\x7c\x82\x11\x2a\xe4\x24\x5b\xaf\xe8\xf0\x37\xac\x68\xd3\xd0\x2e\x53\x7e\x1a\x96\x40\xd5\xcb\xb7\x21\xbb\x22\xac\xc7\xdb\xf7\xc6\x04\xc9\x78\x41\x44\xf9\xec\x9d\x03\x93\xad\x26\xa5\xfc\x59\xc9\x57\x66\xd4\xcf\x21\xf4\xc6\x7e\xec\x83\x4b\xb1\x39\x97\xed\xa8\xa5\x9f\xd4\x1d\x41\x9e\x34\x82\x37\x07\x8a\x03\x5f\x72\x62\xff\xa1\x67\xc9\x84\x42\x83\x61\xe3\x05\x9c\xcd\xbf\x26\x29\xff\xe4\xf1\xfa\x7e\x23\xa9\xcd\x6f\xe5\x49\xc8\xb1\x73\xe4\x21\xbe\x07\x00\x00\xff\xff\x8a\xbc\x94\x3f\x21\x04\x00\x00")
func runtimeColorschemesMonokaiMicroBytes() ([]byte, error) {
return bindataRead(
@@ -1900,7 +1900,7 @@ func runtimeSyntaxHaskellYaml() (*asset, error) {
return a, nil
}
var _runtimeSyntaxHtmlYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x92\xdf\x6e\xd5\x30\x0c\xc6\xef\xf3\x14\x51\x84\x10\x4c\x5a\xb9\xcf\x0e\xec\x82\xc7\x68\x8b\xe4\x25\x6e\x1b\xe6\x26\x55\xec\x1e\x34\xe4\x87\x47\xa5\x87\xf5\x88\xf1\x67\xbe\xfc\x3e\x27\xfe\xf9\x4b\x86\x44\x28\x4f\x0b\x7a\x3b\xc9\x4c\xc6\x44\x14\x0c\xe2\x8d\xb5\xd6\x6e\x5e\x86\x19\xbd\x75\x5d\xd7\x4c\x32\xb7\xd4\xdf\xbf\x71\xc6\xd4\x95\x90\xf7\x9e\x5b\x9b\x22\x66\x49\x43\xc2\xea\xad\x3b\x35\x37\xf7\x9f\xdc\xc5\xe1\x05\x43\x02\xf2\xd6\xbd\x6d\xbf\xdc\xb5\xad\xe7\x05\x02\xfa\xbe\xef\x6f\xee\x9e\x7b\x04\x04\x67\xcc\xe2\xad\x7b\x07\x24\xfa\x30\x86\x42\xa5\xea\x84\x69\x9c\x44\xa7\x8a\x83\x12\x3c\x20\x29\x95\x3c\x46\xe4\xa0\x1b\x93\x96\x1c\x28\x85\x47\x2d\x79\x28\x61\x65\x2d\x99\x0a\x44\x2d\x79\x2e\x2b\x63\x39\x63\x55\x4e\xdf\x51\x79\x81\xac\x5c\x83\xb2\x3c\x11\xaa\x40\x1d\x51\x74\x5b\x59\xcf\x40\x2b\xea\xb7\x14\x65\x7a\xff\xd1\x99\x0b\x51\x28\x99\x05\xb2\x34\x2c\x35\xe5\x71\x5f\x73\x2b\x16\xa8\x1b\x66\xe7\xdc\xb3\x86\x39\xfe\xa6\xf0\x63\x5a\x7e\x06\xd6\x75\xcd\xa1\x5e\x25\xf6\xab\xae\x27\xed\x41\x7d\x9e\xa0\x1e\x47\x2f\x38\x11\x07\x58\x49\x5e\x62\x9c\x38\xd4\xb4\xc8\x11\xf8\xc1\x73\xfa\xf0\x27\x8f\xd2\x9c\xe4\x76\xac\x65\x5d\xfc\xd5\xab\xfd\x9b\x31\xe5\x40\x6b\xdc\xbe\xc0\x57\x38\xc3\x7e\xed\x6b\xd8\xb6\xb0\xff\x82\xf6\xd2\xfa\xcf\xe4\xc0\xec\x8c\xf9\x11\x00\x00\xff\xff\x2e\xf2\xcb\xf0\xaa\x02\x00\x00")
var _runtimeSyntaxHtmlYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x54\xdd\x6e\xdb\x46\x13\xbd\xfe\xf4\x14\x8c\xf2\xa1\xd8\xb5\x2b\xb9\xbd\x31\x50\xc6\x31\x51\xa4\xed\x6d\x7b\xd1\x9b\x42\xa6\x81\xe5\xee\x90\xdc\x6a\x7f\x98\xdd\xa1\x12\xb5\xa7\xef\x5e\x2c\x65\xc7\x32\xe2\x14\x05\x4a\x08\x84\x70\x66\x38\x73\xe6\xcc\x4f\x6f\x1d\xf1\x71\xa2\xba\x1a\xd9\xbb\xd5\xca\x10\x93\xe6\xba\x5a\x55\x55\x55\x15\x63\x50\x9e\xea\x6a\x7d\x77\xb7\x1d\xd9\xef\x5c\xdb\xfc\x7f\xbd\x5a\xa5\xd9\x51\xae\x17\x9f\x4d\x45\x29\xc5\x54\x57\xeb\x9b\xdd\xfd\xab\x76\x7b\xd1\xdc\xae\x1f\x0c\xf9\xe8\xbb\xe8\xb6\xac\x86\x62\xfd\xa2\x45\x34\x56\xde\xec\xae\xda\x46\x28\xd1\x75\x09\x3a\xc5\x70\xf4\x30\x26\x51\xce\x98\x26\x47\x8c\x44\x0a\x89\xad\x76\x84\x6c\x0d\x61\x36\x36\xca\x06\x9d\x50\x99\x44\x1f\x03\xcb\x06\x46\x58\x44\x09\x3b\xc0\x45\xbd\x7f\x3f\x47\x26\x24\xd9\x40\x2b\x11\x0e\x2a\x63\x62\x1b\x83\x84\xa6\xc0\x94\xa0\x2d\x13\x74\x14\x86\xe0\xe0\x86\x14\xe7\x49\xc2\x08\xc5\x4a\x38\x9b\x97\x78\x20\x07\x62\x65\x5d\x46\x1f\x60\x95\x8b\x03\x6c\x82\x03\x4b\x90\x17\x1d\x19\xd9\xa0\xb7\xe4\x4c\x26\x46\x6f\x07\xa1\xd5\x92\x04\x73\x22\x89\x42\x0b\x7d\x4c\x1e\xc2\xca\xa6\x4f\xca\x13\x96\x77\xf1\x1e\x77\xdf\x6e\xae\x5b\x8c\x09\x16\xd6\x0f\xb0\x41\x4c\x33\x23\x4b\xec\x3b\x83\x3d\x1d\x07\x0a\x70\xaa\x23\x07\x47\x03\x05\x03\x67\x45\xd8\xcb\x06\x5e\x09\x1b\x30\x21\xed\x25\x3c\x85\x59\x58\x26\x5f\x70\x62\xa1\x40\x49\x22\xa8\x03\x42\x14\xa7\x5c\xc8\x3a\xd9\x89\x25\xa2\x70\x98\x58\x2c\x95\x62\x51\x62\xe6\x69\x66\x89\x49\xa8\xa4\x3c\xac\xe6\x39\x11\xca\x2f\x0e\x45\x7a\xd9\xe0\x3d\x92\x98\xc0\x98\xbb\xa3\x44\x16\x9c\xec\x9e\x64\x83\xac\xfc\x84\x4c\x42\x2f\xc5\x3a\xd2\x2c\x91\xbd\x72\x0e\x39\xce\x49\x13\xf2\xa4\x02\x32\xa7\x18\x06\xe4\x59\x74\x98\xe0\xbd\x4a\x47\x09\xa6\x8f\xac\x4a\x37\xd9\x7a\x02\x27\xa5\xf7\x98\x85\x93\x0d\x0e\x2a\xe1\x60\x0d\x45\x7c\xe8\x92\x14\xd5\xf6\x02\xb7\xf2\xc5\x99\xd9\xd2\x47\xa6\x60\xc8\x3c\x1b\x9e\x2e\x9a\x23\x8c\x3d\xa0\x0c\x32\x46\x52\x46\x50\x69\x7f\x1f\x63\xe9\x37\x5b\x76\x04\x56\x5d\x79\x3f\x38\x63\x14\xa4\x4a\x13\xd3\xe2\x25\x97\xac\xcf\x72\x4e\xa4\xad\x72\x75\xb5\xfe\x6a\x77\xff\x66\xb7\xab\xf3\xa4\x34\xd5\x6d\xdb\x5e\xbc\x79\xce\xab\xae\xd6\xbb\xfa\x6d\xfb\x08\x5a\x43\x81\x6d\x6f\xa9\x2c\x86\x50\x8e\xd1\x0d\x3a\xba\x98\x30\x92\x1d\x46\xc6\x98\xa8\x87\x35\x8f\x2d\x8e\x61\x30\x94\x35\xca\xb6\x21\x06\xa1\x9d\xd5\x7b\xf4\x51\xcf\x19\x2e\x2a\x03\x1f\xe7\x4c\xf1\x50\xda\x9b\xed\x1f\x8f\x0a\x27\x0d\x56\x69\x20\x46\xd9\x61\x1c\x94\x9b\x09\x1f\xac\xe1\x51\xbe\x7d\xa4\xa2\x63\xc8\xac\x02\x6f\xc3\xec\xbb\x13\x9f\xc6\xca\xd7\xbb\x6f\x36\xdf\x7d\xbf\xf9\xa9\xfd\xf3\xfa\xeb\xeb\xbf\x4e\xbe\xaf\xab\x4d\x65\xa8\x57\xb3\xe3\xfa\x01\x28\x4f\x66\x95\xb8\xae\xd6\xb7\xeb\x33\x90\x42\x51\xff\xe6\x1c\x3a\x1d\x85\x6a\xd7\xae\x5e\xdc\x7f\xdc\x7e\xc6\x28\x73\xb2\x61\xd8\xce\xa9\xc8\x27\x7a\x9e\x44\x19\xba\x91\x1f\xfe\x0c\x96\xa1\xc7\x14\x3d\xc9\xfa\xea\x6a\x77\x5f\xfd\xaf\xbd\x7c\x8a\xe1\x3d\x85\x42\xeb\xe6\xd5\x66\xb3\xbd\x6c\x36\x9b\x4f\xf1\xa7\x44\x53\x8a\x7a\xb1\xfd\xf0\xf3\xbb\x5f\x7f\xfb\xe5\xc7\xed\x65\x69\xea\xcb\xf9\x4f\xb5\x9e\x57\x7a\xb7\x5e\x7f\xc2\x4e\x85\x9e\x23\x79\x6f\xa7\xe5\x22\xde\xdd\x6d\x9f\xd0\xb3\x93\xf8\xf8\x9c\x67\x3a\x0d\xd2\xbb\x51\xa5\xa7\x4f\x1f\xe8\x3c\x93\xfc\x9c\xc6\xcd\x69\x75\x9f\x0e\xe7\x99\xf0\x57\x2f\xd9\x9c\xf5\x96\x37\xcb\x86\xd7\x67\xea\xff\x33\x47\x1b\xb4\x9b\x4d\xb9\xf1\xbf\xab\x83\x3a\x85\xfd\x37\xdc\xf8\xe8\xe8\x0b\xd4\x3e\x37\xfd\x47\x66\x3a\xe7\xf5\x6a\xf5\x77\x00\x00\x00\xff\xff\x90\x60\xbd\xba\xac\x06\x00\x00")
func runtimeSyntaxHtmlYamlBytes() ([]byte, error) {
return bindataRead(

3
runtime/colorschemes/monokai.micro
View File

@@ -23,4 +23,5 @@ color-link cursor-line "#323232"
color-link color-column "#323232"
#No extended types; Plain brackets.
color-link type.extended "default"
color-link symbol.brackets "default"
color-link symbol.brackets "default"
color-link symbol.tag "#AE81FF,#282828"

22
runtime/syntax/html.yaml
View File

@@ -1,12 +1,25 @@
filetype: html
detect:
detect:
filename: "\\.htm[l]?$"
rules:
- identifier: "<.*?>"
- 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:]]]*;"
- statement: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
- 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: "\""
@@ -18,13 +31,14 @@ rules:
- default:
start: "<script.*?>"
end: "</script.*?>"
limit-group: identifier
limit-group: symbol.tag
rules:
- include: "javascript"
- default:
start: "<style.*?>"
end: "</style.*?>"
limit-group: symbol.tag
rules:
- include: "css"