mirror of
https://github.com/zyedidia/micro.git
synced 2026-03-15 21:37:09 +09:00
Merge branch 'john-batch-master'
This commit is contained in:
@@ -12,7 +12,7 @@ rules:
|
|||||||
- symbol: "[:=]"
|
- symbol: "[:=]"
|
||||||
- identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
|
- identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
|
||||||
- constant.string: "\"[^\"]*\""
|
- constant.string: "\"[^\"]*\""
|
||||||
- constant.number: "(?i)#[0-9A-F]{6,6}"
|
- constant.number: "(?i)#[0-9a-fA-F]{6,6}"
|
||||||
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
||||||
- comment: "<!--.+?-->"
|
- comment: "<!--.+?-->"
|
||||||
- preproc: "<!DOCTYPE.+?>"
|
- preproc: "<!DOCTYPE.+?>"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ rules:
|
|||||||
# Rebase commands
|
# Rebase commands
|
||||||
- statement: "^(p(ick)?|r(eword)?|e(dit)?|s(quash)?|f(ixup)?|x|exec|b(reak)?|d(rop)?|l(abel)?|t|reset|m(erge)?)\\b"
|
- statement: "^(p(ick)?|r(eword)?|e(dit)?|s(quash)?|f(ixup)?|x|exec|b(reak)?|d(rop)?|l(abel)?|t|reset|m(erge)?)\\b"
|
||||||
# Commit IDs
|
# Commit IDs
|
||||||
- identifier: "\\b([0-9a-f]{7,40})\\b"
|
- identifier: "\\b([0-9a-fA-F]{7,40})\\b"
|
||||||
|
|
||||||
# Color keywords for Github (and others)
|
# Color keywords for Github (and others)
|
||||||
- type.keyword: "\\b(?i)((fix(es|ed)?|close(s|d)?) #[0-9]+)\\b"
|
- type.keyword: "\\b(?i)((fix(es|ed)?|close(s|d)?) #[0-9]+)\\b"
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ rules:
|
|||||||
# Octal integer literal
|
# Octal integer literal
|
||||||
- constant.number: "(?i)\\b0[0-7]([0-7_]*[0-7])?[GLIDF]?\\b"
|
- constant.number: "(?i)\\b0[0-7]([0-7_]*[0-7])?[GLIDF]?\\b"
|
||||||
# Hexadecimal integer literal
|
# Hexadecimal integer literal
|
||||||
- constant.number: "(?i)\\b0x[0-9a-f]([0-9a-f_]*[0-9a-f])?[GLIDF]?\\b"
|
- constant.number: "(?i)\\b0x[0-9a-fA-F]([0-9a-f_]*[0-9a-fA-F])?[GLIDF]?\\b"
|
||||||
# Floating-point literal
|
# Floating-point literal
|
||||||
- constant.number: "(?i)\\b[0-9]([0-9_]*[0-9])?([.][0-9]([0-9_]*[0-9])?)?(e[+-]?[0-9]([0-9_]*[0-9])?)?[DF]?\\b"
|
- constant.number: "(?i)\\b[0-9]([0-9_]*[0-9])?([.][0-9]([0-9_]*[0-9])?)?(e[+-]?[0-9]([0-9_]*[0-9])?)?[DF]?\\b"
|
||||||
- constant.bool: "\\b(true|false|null)\\b"
|
- constant.bool: "\\b(true|false|null)\\b"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ rules:
|
|||||||
- symbol: "[:=]"
|
- symbol: "[:=]"
|
||||||
- identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
|
- 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.string: "\"[^\"]*\""
|
||||||
- constant.number: "(?i)#[0-9A-F]{6,6}"
|
- constant.number: "(?i)#[0-9a-fA-F]{6,6}"
|
||||||
- default:
|
- default:
|
||||||
start: ">"
|
start: ">"
|
||||||
end: "<"
|
end: "<"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ rules:
|
|||||||
- symbol: "[:=]"
|
- symbol: "[:=]"
|
||||||
- identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|style|target|type|value|width)="
|
- 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.string: "\"[^\"]*\""
|
||||||
- constant.number: "(?i)#[0-9A-F]{6,6}"
|
- constant.number: "(?i)#[0-9a-fA-F]{6,6}"
|
||||||
- default:
|
- default:
|
||||||
start: ">"
|
start: ">"
|
||||||
end: "<"
|
end: "<"
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ rules:
|
|||||||
|
|
||||||
- statement: "([.:;,+*|=!\\%\\[\\]]|<|>|/|-|&)"
|
- statement: "([.:;,+*|=!\\%\\[\\]]|<|>|/|-|&)"
|
||||||
|
|
||||||
- constant.number: "(\\b(-?)?[0-9]+\\b|\\b\\[0-9]+\\.[0-9]+\\b|\\b0x[0-9A-F]+\\b)"
|
- constant.number: "(\\b(-?)?[0-9]+\\b|\\b\\[0-9]+\\.[0-9]+\\b|\\b0x[0-9a-fA-F]+\\b)"
|
||||||
- constant: "(@\\[(\\\\.|[^\\]])*\\]|@\\{(\\\\.|[^\\}])*\\}|@\\((\\\\.|[^\\)])*\\))"
|
- constant: "(@\\[(\\\\.|[^\\]])*\\]|@\\{(\\\\.|[^\\}])*\\}|@\\((\\\\.|[^\\)])*\\))"
|
||||||
- constant: "\\b<(\\\\.[^\\>])*\\>\\b"
|
- constant: "\\b<(\\\\.[^\\>])*\\>\\b"
|
||||||
- constant: "\\b(nil|NULL|YES|NO|TRUE|true|FALSE|false|self)\\b"
|
- constant: "\\b(nil|NULL|YES|NO|TRUE|true|FALSE|false|self)\\b"
|
||||||
@@ -57,4 +57,3 @@ rules:
|
|||||||
end: "\\*/"
|
end: "\\*/"
|
||||||
rules:
|
rules:
|
||||||
- todo: "(TODO|XXX|FIXME):?"
|
- todo: "(TODO|XXX|FIXME):?"
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ rules:
|
|||||||
- special: "&[^;[[:space:]]]*;"
|
- special: "&[^;[[:space:]]]*;"
|
||||||
- symbol: "[:=]"
|
- symbol: "[:=]"
|
||||||
- identifier: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
|
- identifier: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
|
||||||
- constant.number: "(?i)#[0-9A-F]{6,6}"
|
- constant.number: "(?i)#[0-9a-fA-F]{6,6}"
|
||||||
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
||||||
- comment: "<!--.+?-->"
|
- comment: "<!--.+?-->"
|
||||||
- default: "<\\?(php|=)\" end=\"\\?>"
|
- default: "<\\?(php|=)\" end=\"\\?>"
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ rules:
|
|||||||
- constant.number: "\\b[0-9](_?[0-9])*(\\.([0-9](_?[0-9])*)?)?(e[0-9](_?[0-9])*)?\\b" # decimal
|
- constant.number: "\\b[0-9](_?[0-9])*(\\.([0-9](_?[0-9])*)?)?(e[0-9](_?[0-9])*)?\\b" # decimal
|
||||||
- constant.number: "\\b0b(_?[01])+\\b" # bin
|
- constant.number: "\\b0b(_?[01])+\\b" # bin
|
||||||
- constant.number: "\\b0o(_?[0-7])+\\b" # oct
|
- constant.number: "\\b0o(_?[0-7])+\\b" # oct
|
||||||
- constant.number: "\\b0x(_?[0-9a-f])+\\b" # hex
|
- constant.number: "\\b0x(_?[0-9a-fA-F])+\\b" # hex
|
||||||
|
|
||||||
- constant.string:
|
- constant.string:
|
||||||
start: "\"\"\""
|
start: "\"\"\""
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ rules:
|
|||||||
|
|
||||||
- statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|for|if|in|module|next|nil|not|or|private|protected|public|redo|rescue|retry|return|self|super|then|undef|unless|until|when|while|yield)\\b"
|
- statement: "\\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|for|if|in|module|next|nil|not|or|private|protected|public|redo|rescue|retry|return|self|super|then|undef|unless|until|when|while|yield)\\b"
|
||||||
- constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
|
- constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
|
||||||
- constant.number: "(?i)\\b0x[0-9a-f][0-9a-f_]*\\b"
|
- constant.number: "(?i)\\b0x[0-9a-fA-F][0-9a-f_]*\\b"
|
||||||
- constant.number: "(?i)\\b0b[01][01_]*\\b"
|
- constant.number: "(?i)\\b0b[01][01_]*\\b"
|
||||||
- constant.number: "(?i)\\b[0-9][0-9_]*(['.'][0-9_]+)?(e[\\-]?[0-9_]+)?\\b"
|
- constant.number: "(?i)\\b[0-9][0-9_]*(['.'][0-9_]+)?(e[\\-]?[0-9_]+)?\\b"
|
||||||
# Ruby "Symbols"
|
# Ruby "Symbols"
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ rules:
|
|||||||
- identifier: "(alt|bgcolor|class|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|placeholder|size|span|src|style|target|type|value|width)="
|
- identifier: "(alt|bgcolor|class|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|placeholder|size|span|src|style|target|type|value|width)="
|
||||||
- symbol: "[:=]"
|
- symbol: "[:=]"
|
||||||
- constant.string: "\"[^\"]*\""
|
- constant.string: "\"[^\"]*\""
|
||||||
- constant.number: "(?i)#[0-9A-F]{6,6}"
|
- constant.number: "(?i)#[0-9a-fA-F]{6,6}"
|
||||||
|
|
||||||
- symbol.tag: "<|>"
|
- symbol.tag: "<|>"
|
||||||
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
- constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+"
|
||||||
@@ -62,6 +62,3 @@ rules:
|
|||||||
limit-group: symbol.tag
|
limit-group: symbol.tag
|
||||||
rules:
|
rules:
|
||||||
- include: "css"
|
- include: "css"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user