Skip to content

Commit cb72fb4

Browse files
apap
committed
unify order and style of group name lists in syntaxes
This puts all of them in Comment,String order. It also changes the continuation line style to be nicer to edit during rearrangements.
1 parent 5687a79 commit cb72fb4

17 files changed

+34
-36
lines changed

Diff for: ‎after/syntax/csh.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
syn match cshCommentColor contained '\(#[^#]*\)\@<=\zs#\x\{3}\%(\x\{3}\)\?\>' containedin=cshComment
2-
call css_color#init( 'hex', 'none'
3-
\, 'cshDblQuote,cshSnglQuote,cshHereDoc,'
4-
\. 'cshCommentColor' )
2+
call css_color#init('hex', 'none',
3+
\ 'cshCommentColor,' .
4+
\ 'cshDblQuote,cshSnglQuote,cshHereDoc')

Diff for: ‎after/syntax/css.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('css', 'extended', 'cssMediaBlock,cssFunction,cssDefinition,cssAttrRegion,cssComment')
1+
call css_color#init('css', 'extended', 'cssComment,cssMediaBlock,cssFunction,cssDefinition,cssAttrRegion')

Diff for: ‎after/syntax/fish.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
" https://github.com/dag/vim-fish (and presumably its various forks)
22
syn match fishCommentColor contained '\(#[^#]*\)\@<=\zs#\x\{3}\%(\x\{3}\)\?\>' containedin=fishComment
3-
call css_color#init( 'hex', 'none', 'fishString,fishCommentColor' )
3+
call css_color#init( 'hex', 'none', 'fishCommentColor,fishString' )

Diff for: ‎after/syntax/html.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
" default html syntax should already be including the css syntax
2-
call css_color#init('none', 'none', 'htmlString,htmlCommentPart')
2+
call css_color#init('none', 'none', 'htmlCommentPart,htmlString')

Diff for: ‎after/syntax/javascript.vim

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ if &syntax =~# '\(^\|\.\)coffee\($\|\.\)' | finish | endif
77
" javaScriptX = default Vim syntax
88
" jsX = https://github.com/pangloss/vim-javascript
99
" javascriptX = https://github.com/othree/yajs.vim
10-
call css_color#init('hex', 'extended'
11-
\, 'javaScriptComment,javaScriptLineComment,javaScriptStringS,javaScriptStringD,javaScriptStringT'
12-
\. ',jsComment,jsString,jsTemplateString,jsObjectKeyString,jsObjectStringKey,jsClassStringKey'
13-
\. ',javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString,javascriptTemplate'
14-
\)
10+
call css_color#init('hex', 'extended',
11+
\ 'javaScriptComment,javaScriptLineComment,javaScriptStringS,javaScriptStringD,javaScriptStringT,' .
12+
\ 'jsComment,jsString,jsTemplateString,jsObjectKeyString,jsObjectStringKey,jsClassStringKey,' .
13+
\ 'javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString,javascriptTemplate')

Diff for: ‎after/syntax/kitty.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('hex', 'none', 'kittyColor,kittyComment')
1+
call css_color#init('hex', 'none', 'kittyComment,kittyColor')

Diff for: ‎after/syntax/less.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
" lessVariableValue | lessDefinition | cssComment | lessComment | https://github.com/groenewege/vim-less
66
" lessVariableDefinition | cssDefinition | cssComment | lessComment | https://github.com/lunaru/vim-less
77

8-
call css_color#init('css', 'extended', 'lessVariableValue,lessVariableDefinition,lessDefinition,lessCssAttribute,lessAttribute,cssDefinition,cssComment,lessCssComment,lessComment')
8+
call css_color#init('css', 'extended', 'lessComment,lessCssComment,cssComment,lessVariableValue,lessVariableDefinition,lessDefinition,lessCssAttribute,lessAttribute,cssDefinition')

Diff for: ‎after/syntax/rasi.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
" https://github.com/Fymyte/rasi.vim
2-
call css_color#init('css', 'extended'
3-
\, 'rasiHexColor,rasiRGBColor,rasiRGBAColor,rasiHSLColor,rasiHSLAColor,rasiNamedColor'
4-
\. ',rasiPropertyVal,rasiComment,rasiCommentL,rasiEnvVar,rasiVarReference')
2+
call css_color#init('css', 'extended',
3+
\ 'rasiComment,rasiCommentL,rasiPropertyVal,rasiEnvVar,rasiVarReference,' .
4+
\ 'rasiHexColor,rasiRGBColor,rasiRGBAColor,rasiHSLColor,rasiHSLAColor,rasiNamedColor')

Diff for: ‎after/syntax/sass.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('css', 'extended', 'sassCssAttribute,sassComment,sassCssComment')
1+
call css_color#init('css', 'extended', 'sassComment,sassCssComment,sassCssAttribute')

Diff for: ‎after/syntax/scss.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('css', 'extended', 'scssAttribute,scssComment,scssVariableValue,scssMap,scssMapValue,sassCssAttribute,cssComment')
1+
call css_color#init('css', 'extended', 'scssComment,cssComment,scssAttribute,scssVariableValue,scssMap,scssMapValue,sassCssAttribute')

Diff for: ‎after/syntax/sh.vim

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
syn match shCommentColor contained '\(#[^#]*\)\@<=\zs#\x\{3}\%(\x\{3}\)\?\>' containedin=shQuickComment,shBQComment,shComment
2-
call css_color#init( 'hex', 'none'
3-
\, 'shSingleQuote,shDoubleQuote,shHereDoc,'
4-
\. 'shTestSingleQuote,shTestDoubleQuote,'
5-
\. 'shEchoQuote,shEmbeddedEcho,shEcho,'
6-
\. 'shCommentColor' )
2+
call css_color#init('hex', 'none',
3+
\ 'shCommentColor,' .
4+
\ 'shEchoQuote,shEmbeddedEcho,shEcho,' .
5+
\ 'shTestSingleQuote,shTestDoubleQuote,' .
6+
\ 'shSingleQuote,shDoubleQuote,shHereDoc')

Diff for: ‎after/syntax/stylus.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('css', 'extended', 'stylusCssAttribute,stylusComment,cssComment')
1+
call css_color#init('css', 'extended', 'stylusComment,cssComment,stylusCssAttribute')

Diff for: ‎after/syntax/tcsh.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
syn match tcshCommentColor contained '\(#[^#]*\)\@<=\zs#\x\{3}\%(\x\{3}\)\?\>' containedin=tcshComment
2-
call css_color#init( 'hex', 'none'
3-
\, 'tcshSQuote,tcshDQuote,tcshHereDoc,'
4-
\. 'tcshCommentColor' )
2+
call css_color#init('hex', 'none',
3+
\ 'tcshCommentColor,' .
4+
\ 'tcshSQuote,tcshDQuote,tcshHereDoc' )

Diff for: ‎after/syntax/tmux.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('css', 'none', 'tmuxString,tmuxComment')
1+
call css_color#init('css', 'none', 'tmuxComment,tmuxString')

Diff for: ‎after/syntax/typescript.vim

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
" https://github.com/HerringtonDarkholme/yats.vim (stock Vim syntax)
22
" https://github.com/leafgarland/typescript-vim
3-
call css_color#init('css', 'extended'
4-
\, 'typescriptString,typescriptStringProperty,typescriptStringS,typescriptStringD,typescriptStringB,'
5-
\. 'typescriptComment,typescriptLineComment,typescriptCommentSkip,typescriptDocComment'
6-
\)
3+
call css_color#init('css', 'extended',
4+
\ 'typescriptComment,typescriptLineComment,typescriptCommentSkip,typescriptDocComment,' .
5+
\ 'typescriptString,typescriptStringProperty,typescriptStringS,typescriptStringD,typescriptStringB')

Diff for: ‎after/syntax/vim.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
call css_color#init('hex', 'none', 'vimHiGuiRgb,vimString,vimComment,vimLineComment')
1+
call css_color#init('hex', 'none', 'vimComment,vimLineComment,vimString,vimHiGuiRgb')

Diff for: ‎after/syntax/zsh.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
syn match zshCommentColor contained '\(#[^#]*\)\@<=\zs#\x\{3}\%(\x\{3}\)\?\>' containedin=zshComment
2-
call css_color#init( 'hex', 'none'
3-
\, 'zshString,zshPOSIXString,zshHereDoc,'
4-
\. 'zshCommentColor' )
2+
call css_color#init('hex', 'none',
3+
\ 'zshCommentColor,' .
4+
\ 'zshString,zshPOSIXString,zshHereDoc')

0 commit comments

Comments
 (0)