Merge branch 'master' of github.com:othree/javascript-libraries-syntax.vim

Author: othree

autoload/syntax/postprocess.coffee.vim

@@ -8,7 +8,4 @@
 
 syntax cluster coffeeLibraryFuncs contains=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions
 syntax cluster coffeeLibraryAttrs contains=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs
-syntax match   coffeeLMethods /[0-9A-Za-z_$)]\.\h\w*(\@=/   containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
-syntax match   coffeeLMethods /[0-9A-Za-z_$)]\.\h\w* \+[0-9A-Za-z_$([{'"]\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
-syntax match   coffeeLMethods /[0-9A-Za-z_$)]\.\h\w* \([-=]>\)\@=/ containedin=ALLBUT,coffeeComment contains=@coffeeLibraryFuncs transparent
-syntax match   coffeeLAttrs /[0-9A-Za-z_$)]\.\h\w*/   containedin=ALLBUT,coffeeComment contains=@coffeeLibraryAttrs transparent
+syntax match   coffeeLDot /\./   containedin=ALLBUT,coffeeComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs

autoload/syntax/postprocess.javascript.vim

@@ -8,5 +8,4 @@
 
 syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions
 syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs
-syntax match   javascriptLMethods /[0-9A-Za-z_$)]\.\h\w*(\@=/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryFuncs transparent
-syntax match   javascriptLAttrs /[0-9A-Za-z_$)]\.\h\w*/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryAttrs transparent
+syntax match   javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptString contains=@javascriptLibraryFuncs,@javascriptLibraryAttrs

autoload/syntax/postprocess.ls.vim

@@ -14,15 +14,11 @@ syntax cluster lsLibraryAttrs contains=@lsQAttrs,@ls_Attrs,@lsBAttrs,@lspAttrs
 " fun0!fun()
 " obj.fun!
 " obj.fun()
-syntax match   lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w*[(!]\@=/   containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
 " ).fun arg
 " !fun arg
 " obj.fun arg
-syntax match   lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w* \+[0-9A-Za-z_$([{\'"]\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
-" ).fun funarg
-" !fun funarg
-" obj.fun funarg
-syntax match   lsLMethods /\([0-9A-Za-z_$][.!]\|)\.\)\h\w* \(!\?[~-]>\)\@=/ containedin=ALLBUT,lsComment contains=@lsLibraryFuncs transparent
-syntax match   lsLPipe /|>/ containedin=ALLBUT,lsComment skipwhite nextgroup=@lspFunctions
-syntax match   lsLCompose />>/ containedin=ALLBUT,lsComment skipwhite nextgroup=@lspFunctions
-syntax match   lsLAttrs /\([0-9A-Za-z_$][.!]\|)\.\)\h\w*/   containedin=ALL contains=@lsLibraryAttrs transparent
+syntax match   lsLDot /\./   containedin=ALLBUT,lsComment,lsString contains=@lsLibraryFuncs,@lsLibraryAttrs
+syntax match   lsLExp /!/   containedin=ALLBUT,lsComment,lsString contains=@lsLibraryFuncs,@lsLibraryAttrs
+
+syntax match   lsLPipe /|>/ containedin=ALLBUT,lsComment,lsString skipwhite nextgroup=@lspFunctions
+syntax match   lsLCompose />>/ containedin=ALLBUT,lsComment,lsString skipwhite nextgroup=@lspFunctions

autoload/syntax/postprocess.typescript.vim

@@ -6,7 +6,6 @@
 " URL:         https://github.com/othree/javascript-libraries-syntax.vim
 "
 
-syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions
-syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs
-syntax match   javascriptLMethods /[0-9A-Za-z_$)]\.\h\w*(\@=/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryFuncs transparent
-syntax match   javascriptLAttrs /[0-9A-Za-z_$)]\.\h\w*/ containedin=ALLBUT,javascriptComment contains=@javascriptLibraryAttrs transparent
+syntax cluster typescriptLibraryFuncs contains=@typescriptQFunctions,@typescript_Functions,@typescriptBFunctions,@typescriptpFunctions,@typescriptAFunctions
+syntax cluster typescriptLibraryAttrs contains=@typescriptQAttrs,@typescript_Attrs,@typescriptBAttrs,@typescriptpAttrs,@typescriptAAttrs
+syntax match   typescriptLDot /\./ containedin=ALLBUT,typescriptComment,typescriptString contains=@typescriptLibraryFuncs,@typescriptLibraryAttrs