-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into tabsidebar
- Loading branch information
Showing
15 changed files
with
898 additions
and
6,050 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| " Vim syntax file | ||
| " Language: Jinja | ||
| " Maintainer: Gregory Anders | ||
| " Upstream: https://gitlab.com/HiPhish/jinja.vim | ||
|
|
||
| if exists('b:current_syntax') | ||
| finish | ||
| endif | ||
|
|
||
| syntax case match | ||
| syntax sync fromstart | ||
|
|
||
| " Jinja template built-in tags and parameters (without filter, macro, is and raw, they | ||
| " have special threatment) | ||
| syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import | ||
|
|
||
| syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter | ||
| syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction | ||
| syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName | ||
|
|
||
| " Variable Names | ||
| syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[a-zA-Z_][a-zA-Z0-9_]*/ | ||
| syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none False True None loop super caller varargs kwargs | ||
|
|
||
| " Filters | ||
| syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite nextgroup=jinjaFilter | ||
| syn match jinjaFilter contained /[a-zA-Z_][a-zA-Z0-9_]*/ | ||
| syn match jinjaFunction contained /[a-zA-Z_][a-zA-Z0-9_]*/ | ||
| syn match jinjaBlockName contained /[a-zA-Z_][a-zA-Z0-9_]*/ | ||
|
|
||
| " Jinja template constants | ||
| syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\(\\\)\@<!\(\(\\\\\)\@>\)*\\"/ end=/"/ | ||
| syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\(\\\)\@<!\(\(\\\\\)\@>\)*\\'/ end=/'/ | ||
| syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/ | ||
|
|
||
| " Operators | ||
| syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/ | ||
| syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/ | ||
| syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute | ||
| syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/ | ||
|
|
||
| " Jinja template tag and variable blocks | ||
| syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained | ||
| syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained | ||
| syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained | ||
| syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment | ||
|
|
||
| syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment | ||
|
|
||
| " Jinja template 'raw' tag | ||
| syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment | ||
|
|
||
| " Jinja comments | ||
| syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString | ||
|
|
||
| " Block start keywords. A bit tricker. We only highlight at the start of a | ||
| " tag block and only if the name is not followed by a comma or equals sign | ||
| " which usually means that we have to deal with an assignment. | ||
| syn match jinjaStatement containedin=jinjaTagBlock contained /\({%-\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/ | ||
|
|
||
| " and context modifiers | ||
| syn match jinjaStatement containedin=jinjaTagBlock contained /\<with\(out\)\?\s\+context\>/ | ||
|
|
||
| hi def link jinjaPunctuation jinjaOperator | ||
| hi def link jinjaAttribute jinjaVariable | ||
| hi def link jinjaFunction jinjaFilter | ||
|
|
||
| hi def link jinjaTagDelim jinjaTagBlock | ||
| hi def link jinjaVarDelim jinjaVarBlock | ||
| hi def link jinjaCommentDelim jinjaComment | ||
| hi def link jinjaRawDelim jinja | ||
|
|
||
| hi def link jinjaSpecial Special | ||
| hi def link jinjaOperator Normal | ||
| hi def link jinjaRaw Normal | ||
| hi def link jinjaTagBlock PreProc | ||
| hi def link jinjaVarBlock PreProc | ||
| hi def link jinjaStatement Statement | ||
| hi def link jinjaFilter Function | ||
| hi def link jinjaBlockName Function | ||
| hi def link jinjaVariable Identifier | ||
| hi def link jinjaString Constant | ||
| hi def link jinjaNumber Constant | ||
| hi def link jinjaComment Comment | ||
|
|
||
| let b:current_syntax = 'jinja' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| " Vim syntax file | ||
| " Maintainer: Gregory Anders | ||
| " Last Changed: 2024-09-16 | ||
|
|
||
| if exists('b:current_syntax') | ||
| finish | ||
| endif | ||
|
|
||
| " Salt state files are just YAML with embedded Jinja | ||
| runtime! syntax/yaml.vim | ||
| unlet! b:current_syntax | ||
|
|
||
| runtime! syntax/jinja.vim | ||
| unlet! b:current_syntax | ||
|
|
||
| let b:current_syntax = 'salt' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| " Maintainer: Wu, Zhenyu <[email protected]> | ||
| " Documentation: https://pwmt.org/projects/zathura/documentation/ | ||
| " Upstream: https://github.com/Freed-Wu/zathurarc.vim | ||
| " Latest Revision: 2024-04-02 | ||
| " Latest Revision: 2024-09-16 | ||
|
|
||
| if exists('b:current_syntax') | ||
| finish | ||
|
|
@@ -22,7 +22,7 @@ syntax region zathurarcString start=`'` skip=`\\'` end=`'` | |
| syntax keyword zathurarcMode normal fullscreen presentation index | ||
| syntax keyword zathurarcBoolean true false | ||
| syntax keyword zathurarcCommand include map set unmap | ||
| syntax keyword zathurarcOption abort-clear-search adjust-open advance-pages-per-row completion-bg completion-fg completion-group-bg completion-group-fg completion-highlight-bg completion-highlight-fg continuous-hist-save database dbus-raise-window dbus-service default-bg default-fg exec-command filemonitor first-page-column font guioptions highlight-active-color highlight-color highlight-fg highlight-transparency incremental-search index-active-bg index-active-fg index-bg index-fg inputbar-bg inputbar-fg link-hadjust link-zoom n-completion-items notification-bg notification-error-bg notification-error-fg notification-fg notification-warning-bg notification-warning-fg page-cache-size page-padding page-right-to-left page-thumbnail-size pages-per-row recolor recolor-darkcolor recolor-keephue recolor-lightcolor recolor-reverse-video render-loading render-loading-bg render-loading-fg sandbox scroll-full-overlap scroll-hstep scroll-page-aware scroll-step scroll-wrap search-hadjust selection-clipboard selection-notification show-directories show-hidden show-recent statusbar-basename statusbar-bg statusbar-fg statusbar-h-padding statusbar-home-tilde statusbar-page-percent statusbar-v-padding synctex synctex-editor-command vertical-center window-height window-icon window-icon-document window-title-basename window-title-home-tilde window-title-page window-width zoom-center zoom-max zoom-min zoom-step | ||
| syntax keyword zathurarcOption abort-clear-search adjust-open advance-pages-per-row completion-bg completion-fg completion-group-bg completion-group-fg completion-highlight-bg completion-highlight-fg continuous-hist-save database dbus-raise-window dbus-service default-bg default-fg double-click-follow exec-command filemonitor first-page-column font guioptions highlight-active-color highlight-color highlight-fg highlight-transparency incremental-search index-active-bg index-active-fg index-bg index-fg inputbar-bg inputbar-fg link-hadjust link-zoom n-completion-items notification-bg notification-error-bg notification-error-fg notification-fg notification-warning-bg notification-warning-fg page-cache-size page-padding page-right-to-left page-thumbnail-size pages-per-row recolor recolor-darkcolor recolor-keephue recolor-lightcolor recolor-reverse-video render-loading render-loading-bg render-loading-fg sandbox scroll-full-overlap scroll-hstep scroll-page-aware scroll-step scroll-wrap search-hadjust selection-clipboard selection-notification show-directories show-hidden show-recent statusbar-basename statusbar-bg statusbar-fg statusbar-h-padding statusbar-home-tilde statusbar-page-percent statusbar-v-padding synctex synctex-editor-command vertical-center window-height window-icon window-icon-document window-title-basename window-title-home-tilde window-title-page window-width zoom-center zoom-max zoom-min zoom-step | ||
|
|
||
| highlight default link zathurarcComment Comment | ||
| highlight default link zathurarcNumber Number | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.