diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2015-10-18 16:07:12 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2015-10-18 16:07:12 +0200 |
| commit | ae882e85f81869dbf81b5c888c337aa4481fc8c3 (patch) | |
| tree | 0b9ad026b7927b1a6941b315504a65057e8281b1 | |
| parent | aec5e42bdbdb24bc816ae7a56ace189246c74097 (diff) | |
| download | vim-polyglot-ae882e85f81869dbf81b5c888c337aa4481fc8c3.tar.gz vim-polyglot-ae882e85f81869dbf81b5c888c337aa4481fc8c3.zip | |
Update
| -rw-r--r-- | after/syntax/jsx.vim | 4 | ||||
| -rw-r--r-- | indent/stylus.vim | 2 | ||||
| -rw-r--r-- | syntax/markdown.vim | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim index ff3c907e..7efb05bd 100644 --- a/after/syntax/jsx.vim +++ b/after/syntax/jsx.vim @@ -44,4 +44,8 @@ syn region xmlString contained start=+{+ end=++ contains=jsBlock,javascriptBlock " Add jsxRegion to the lowest-level JS syntax cluster. syn cluster jsExpression add=jsxRegion +" Allow jsxRegion to contain reserved words. +" See: https://github.com/othree/yajs.vim +syn cluster javascriptNoReserved add=jsxRegion + endif diff --git a/indent/stylus.vim b/indent/stylus.vim index eb958f04..7e089605 100644 --- a/indent/stylus.vim +++ b/indent/stylus.vim @@ -119,7 +119,7 @@ function! GetStylusIndent() " if group !~? 'css.*' && line =~? ')\s*$' " match user functions " return increase - if group =~? '\v^%(cssTagName|cssClassName|cssIdentifier|cssSelectorOp|cssSelectorOp2|cssBraces|cssAttributeSelector|cssPseudoClass|cssPseudoClassId|stylusId|stylusClass)$' + if group =~? '\v^%(cssTagName|cssClassName|cssIdentifier|cssSelectorOp|cssSelectorOp2|cssBraces|cssAttributeSelector|cssPseudo|stylusId|stylusClass)$' return increase elseif (group == 'stylusUserFunction') && (indent(lnum) == '0') " mixin definition return increase diff --git a/syntax/markdown.vim b/syntax/markdown.vim index d4c83cc7..b22bbf1b 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -87,14 +87,14 @@ exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start= syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepend contains=markdownLineStart syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart -syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*\z(\z(`\)\{3,}\|\z(\~\)\{3,}\)[^`]*$" end="^\s*\z1\%(\z2\z3\)*\ze\s*$" keepend +syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend syn match markdownFootnote "\[^[^\]]\+\]" syn match markdownFootnoteDefinition "^\[^[^\]]\+\]:" if main_syntax ==# 'markdown' for s:type in g:markdown_fenced_languages - exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*\z(\z(`\)\{3,}\|\z(\~\)\{3,}\)\s*'.matchstr(s:type,'[^=]*').'\>[^`]*$" end="^\s*\z1\%(\z2\z3\)*\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g') + exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```\s*'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g') endfor unlet! s:type endif |