Skip to content

for/each: use word delimiter in pattern #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seletskiy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

for/each: use word delimiter in pattern #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00cf253
for/each: use word delimiter in pattern
seletskiy Mar 2, 2020
286fab0
fix multiline strings highlighting
seletskiy May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions syntax/pug.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ syn region pugHtmlConditionalComment start="<!--\%(.*\)>" end="<!\%(.*\)-->" co
syn region pugAngular2 start="(" end=")" contains=htmlEvent
syn region pugJavascriptString start=+"+ skip=+\\\("\|$\)+ end=+"\|$+ contained
syn region pugJavascriptString start=+'+ skip=+\\\('\|$\)+ end=+'\|$+ contained
syn region pugJavascriptString start=+`+ skip=+\\\(`\|$\)+ end=+`\|$+ contains=javascriptInterpolation contained
syn region pugJavascriptString start=+`+ skip=+\\\(`\|$\)+ end=+`+ contains=javascriptInterpolation,pugJavascriptMultilineStringIndent contained
syn region pugAttributes matchgroup=pugAttributesDelimiter start="(" end="\(.\zs)\)\|)" contained contains=pugJavascriptString,pugHtmlArg,pugAngular2,htmlArg,htmlEvent,htmlCssDefinition nextgroup=@pugComponent
syn match pugClassChar "\." containedin=htmlTagName nextgroup=pugClass
syn match pugBlockExpansionChar ":\s\+" contained nextgroup=pugTag,pugClassChar,pugIdChar
Expand Down Expand Up @@ -70,11 +70,12 @@ syn region pugPlainFilter matchgroup=pugFilter start="^\z(\s*\):\%(sass\|less\|

syn match pugScriptConditional "^\s*\<\%(if\|else\|else if\|elif\|unless\|while\|until\|case\|when\|default\)\>[?!]\@!"
syn match pugScriptStatement "^\s*\<\%(each\|for\|block\|prepend\|append\|mixin\|extends\|include\)\>[?!]\@!"
syn region pugScriptLoopRegion start="^\s*\(for\|each\)" end="$" contains=pugScriptLoopKeywords
syn region pugScriptLoopRegion start="^\s*\<\(for\|each\)\>" end="$" contains=pugScriptLoopKeywords
syn keyword pugScriptLoopKeywords contained for each in

syn region pugJavascript start="^\z(\s*\)script\%(:\w\+\)\=" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlJavascript,pugJavascriptTag,pugCoffeescriptFilter keepend
syn region javascriptInterpolation start=/${/ end=/}/ contained
syn region pugJavascriptMultilineStringIndent start=/^/ end=/\ze\S/ contained

syn region pugCoffeescriptFilter matchgroup=pugFilter start="^\z(\s*\):coffee-\?script\s*$" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlCoffeescript contained
syn region pugJavascriptTag contained start="^\z(\s*\)script\%(:\w\+\)\=" end="$" contains=pugBegin,pugTag
Expand Down Expand Up @@ -106,6 +107,7 @@ hi def link pugCommentBlock Comment
hi def link pugHtmlConditionalComment pugComment
hi def link pugJavascriptString String
hi def link javascriptInterpolation Delimiter
hi def link pugJavascriptMultilineStringIndent Normal

let b:current_syntax = "pug"

Expand Down