Skip to content

Commit e84d887

Browse files
committed
Avoid conflict
1 parent b2c1793 commit e84d887

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

autoload/syntax/postprocess.vim

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
if &filetype == 'javascript'
1010
syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions
1111
syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs
12-
syntax match javascriptLMethods /[0-9A-Za-z_$)]\@<=\.\h\w*(\@=/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryFuncs transparent
13-
syntax match javascriptLAttrs /[0-9A-Za-z_$)]\@<=\.\h\w*/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryAttrs transparent
12+
syntax match javascriptLMethods /[0-9A-Za-z_$)]\.\h\w*(\@=/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryFuncs transparent
13+
syntax match javascriptLAttrs /[0-9A-Za-z_$)]\.\h\w*/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryAttrs transparent
1414
endif
1515

1616
if &filetype == 'coffee'
1717
syntax cluster coffeeLibraryFuncs contains=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions
1818
syntax cluster coffeeLibraryAttrs contains=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs
19-
syntax match coffeeLMethods /[0-9A-Za-z_$)]\@<=\.\h\w*(\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs
20-
syntax match coffeeLMethods /[0-9A-Za-z_$)]\@<=\.\h\w* \+[0-9A-Za-z_$([{'"]\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs
21-
syntax match coffeeLMethods /[0-9A-Za-z_$)]\@<=\.\h\w* \([-=]>\)\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs
22-
syntax match coffeeLAttrs /[0-9A-Za-z_$)]\@<=\.\h\w*/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryAttrs
19+
syntax match coffeeLMethods /[0-9A-Za-z_$)]\.\h\w*(\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
20+
syntax match coffeeLMethods /[0-9A-Za-z_$)]\.\h\w* \+[0-9A-Za-z_$([{'"]\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
21+
syntax match coffeeLMethods /[0-9A-Za-z_$)]\.\h\w* \([-=]>\)\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
22+
syntax match coffeeLAttrs /[0-9A-Za-z_$)]\.\h\w*/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryAttrs transparent
2323
endif
2424

2525
if &filetype == 'ls'
@@ -31,16 +31,16 @@ if &filetype == 'ls'
3131
" fun0!fun()
3232
" obj.fun!
3333
" obj.fun()
34-
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\@<=\h\w*[(!]\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs
34+
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w*[(!]\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
3535
" ).fun arg
3636
" !fun arg
3737
" obj.fun arg
38-
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\@<=\h\w* \+[0-9A-Za-z_$([{\'"]\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs
38+
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w* \+[0-9A-Za-z_$([{\'"]\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
3939
" ).fun funarg
4040
" !fun funarg
4141
" obj.fun funarg
42-
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\@<=\h\w* \(!\?[~-]>\)\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs
42+
syntax match lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w* \(!\?[~-]>\)\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
4343
syntax match lsLPipe /|>/ containedin=ALLBUT,lsComment skipwhite nextgroup=@lspFunctions
4444
syntax match lsLCompose />>/ containedin=ALLBUT,lsComment skipwhite nextgroup=@lspFunctions
45-
syntax match lsLAttrs /\([0-9A-Za-z_$][.!]\|)\.\)\@<=\h\w*/ containedin=ALL contains=@lsLibraryAttrs
45+
syntax match lsLAttrs /\([0-9A-Za-z_$][.!]\|)\.\)\h\w*/ containedin=ALL contains=@lsLibraryAttrs transparent
4646
endif

0 commit comments

Comments
 (0)