Merge branch 'master' of http://github.com/nunzioc/kakoune
This commit is contained in:
commit
dabe4c3d92
|
@ -80,7 +80,7 @@ define-command -hidden init-javascript-filetype -params 1 %~
|
|||
add-highlighter "shared/%arg{1}/comment" region /\* \*/ fill comment
|
||||
add-highlighter "shared/%arg{1}/shebang" region ^#! $ fill meta
|
||||
add-highlighter "shared/%arg{1}/regex" region / (?<!\\)(\\\\)*/[gimuy]* fill meta
|
||||
add-highlighter "shared/%arg{1}/jsx" region -recurse (?<![\w<])<[a-zA-Z][\w:.-]* (?<![\w<])<[a-zA-Z][\w:.-]*(?!\hextends)(?=[\s/>])(?!>\()) (</.*?>|/>) regions
|
||||
add-highlighter "shared/%arg{1}/jsx" region -recurse (?<![\w<])<[a-zA-Z>][\w:.-]* (?<![\w<])<[a-zA-Z>][\w:.-]*(?!\hextends)(?=[\s/>])(?!>\()) (</.*?>|/>) regions
|
||||
add-highlighter "shared/%arg{1}/division" region '[\w\)\]]\K(/|(\h+/\h+))' '(?=\w)' group # Help Kakoune to better detect /…/ literals
|
||||
|
||||
# Regular expression flags are: g → global match, i → ignore case, m → multi-lines, u → unicode, y → sticky
|
||||
|
@ -98,7 +98,7 @@ define-command -hidden init-javascript-filetype -params 1 %~
|
|||
# We inline a small XML highlighter here since it anyway need to recurse back up to the starting highlighter.
|
||||
# To make things simple we assume that jsx is always enabled.
|
||||
|
||||
add-highlighter "shared/%arg{1}/jsx/tag" region -recurse < <(?=[/a-zA-Z]) (?<!=)> regions
|
||||
add-highlighter "shared/%arg{1}/jsx/tag" region -recurse < <(?=[/a-zA-Z>]) (?<!=)> regions
|
||||
add-highlighter "shared/%arg{1}/jsx/expr" region -recurse \{ \{ \} ref %arg{1}
|
||||
|
||||
add-highlighter "shared/%arg{1}/jsx/tag/base" default-region group
|
||||
|
|
Loading…
Reference in New Issue
Block a user