From 4f63ea4f78027bf512a8f2aa2eb3eb0c7767d48b Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 29 Jul 2013 22:33:06 +0800 Subject: [PATCH 01/80] Typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2b6b1a..1454064 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ javascript-libraries-syntax.vim =============================== -Syntax file for JavaScript libraries. Supports JavaScript libraris I am using (patches welcome). +Syntax file for JavaScript libraries. Supports JavaScript libraries I am using (patches welcome). Should works well with other JavaScript syntax file. [SyntaxComplete][] also works well on all supported languages. From 7734817d4e14ecd59be3f3ecd2ce68221a4ed64f Mon Sep 17 00:00:00 2001 From: othree_kao Date: Mon, 26 Aug 2013 14:55:32 +0800 Subject: [PATCH 02/80] Use b:current_syntax instead of &filetype --- after/syntax/coffee.vim | 6 +++--- after/syntax/html.vim | 6 +++--- after/syntax/javascript.vim | 6 +++--- after/syntax/ls.vim | 6 +++--- after/syntax/typescript.vim | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim index f43d86d..f70de93 100644 --- a/after/syntax/coffee.vim +++ b/after/syntax/coffee.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/04/22 -" Version: 0.4 +" Last Change: 2013/08/26 +" Version: 0.4.1 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if &filetype == 'coffee' +if b:current_syntax == 'coffee' call jslibsyntax#load() endif diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 6442016..7f5ac1d 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/07/15 -" Version: 0.5 +" Last Change: 2013/08/26 +" Version: 0.5.1 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if &filetype == 'html' +if b:current_syntax == 'html' call jslibsyntax#load() endif diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim index cb09e8b..ff0e5a4 100644 --- a/after/syntax/javascript.vim +++ b/after/syntax/javascript.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/04/22 -" Version: 0.4 +" Last Change: 2013/08/26 +" Version: 0.4.1 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if &filetype == 'javascript' +if b:current_syntax == 'javascript' call jslibsyntax#load() endif diff --git a/after/syntax/ls.vim b/after/syntax/ls.vim index 87470f8..2d7e77c 100644 --- a/after/syntax/ls.vim +++ b/after/syntax/ls.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/04/22 -" Version: 0.4 +" Last Change: 2013/08/26 +" Version: 0.4.1 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if &filetype == 'ls' +if b:current_syntax == 'ls' call jslibsyntax#load() endif diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim index 400d063..69d3b06 100644 --- a/after/syntax/typescript.vim +++ b/after/syntax/typescript.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/04/22 -" Version: 0.4 +" Last Change: 2013/08/26 +" Version: 0.4.1 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if &filetype == 'typescript' +if b:current_syntax == 'typescript' call jslibsyntax#load() endif From a688a6b7a90ab54631ec5ed21a5a232309c9d159 Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 29 Aug 2013 11:51:27 +0800 Subject: [PATCH 03/80] Add all sugar stuff --- autoload/syntax/sugar.javascript.vim | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/autoload/syntax/sugar.javascript.vim b/autoload/syntax/sugar.javascript.vim index 93e3fa2..eb52c56 100644 --- a/autoload/syntax/sugar.javascript.vim +++ b/autoload/syntax/sugar.javascript.vim @@ -26,6 +26,30 @@ syntax keyword javascriptSFunction contained atan sqrt exp pow metric ordinalize syntax keyword javascriptSFunction contained millisecond milliseconds second seconds minute minutes hour hours day days syntax keyword javascriptSFunction contained week weeks month months year years upto +" Array + +syntax keyword javascriptSFunction contained create add all any at average clone compact count each +syntax keyword javascriptSFunction contained every exclude filter find findAll findFrom findIndex findIndexFrom first flatten +syntax keyword javascriptSFunction contained forEach from groupBy inGroups inGroupsOf include indexOf insert intersect isEmpty +syntax keyword javascriptSFunction contained last lastIndexOf least map max min most none randomize reduce +syntax keyword javascriptSFunction contained reduceRight remove removeAt sample some sortBy subtract sum to union +syntax keyword javascriptSFunction contained unique zip + +" Object + +syntax keyword javascriptSFunction contained extended fromQueryString isArray isObject isBoolean isDate isFunction isNaN isNumber isString +syntax keyword javascriptSFunction contained isRegExp toQueryString clone each map any all none count find +syntax keyword javascriptSFunction contained findAll reduce isEmpty sum average min max least most equal +syntax keyword javascriptSFunction contained has keys merge reject select size tap values watch + +" Function + +syntax keyword javascriptSFunction contained after bind cancel debounce delay everyfill lazyredrawonce throttle + +" RegExp + +syntax keyword javascriptSFunction contained escape addFlag getFlags removeFlag setFlags + " Date syntax keyword javascriptSFunction contained addLocale create future getLocale now past range setLocale addMilliseconds addSeconds syntax keyword javascriptSFunction contained addMinutes addHours addDays addWeeks addMonths addYears advance beginningOfDay beginningOfWeek beginningOfMonth @@ -43,6 +67,10 @@ syntax keyword javascriptSFunction contained hourBefore hoursBefore dayBefore da syntax keyword javascriptSFunction contained millisecondFromNow millisecondsFromNow secondFromNow secondsFromNow minuteFromNow minutesFromNow hourFromNow hoursFromNow dayFromNow daysFromNow syntax keyword javascriptSFunction contained weekFromNow weeksFromNow monthFromNow monthsFromNow yearFromNow yearsFromNow utc +" Range + +syntax keyword javascriptSFunction contained clamp clone contains every intersect isValid span toString union + " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet From 497c62ae605e216e0b75919fb2f64314e30b00f9 Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 29 Aug 2013 11:51:42 +0800 Subject: [PATCH 04/80] Sugar to all filetype --- autoload/syntax/sugar.coffee.vim | 28 ++++++++++++++++++++++++++++ autoload/syntax/sugar.ls.vim | 28 ++++++++++++++++++++++++++++ autoload/syntax/sugar.typescript.vim | 28 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/autoload/syntax/sugar.coffee.vim b/autoload/syntax/sugar.coffee.vim index 2a4c095..3933213 100644 --- a/autoload/syntax/sugar.coffee.vim +++ b/autoload/syntax/sugar.coffee.vim @@ -26,6 +26,30 @@ syntax keyword coffeeSFunction contained atan sqrt exp pow metric ordinalize pad syntax keyword coffeeSFunction contained millisecond milliseconds second seconds minute minutes hour hours day days syntax keyword coffeeSFunction contained week weeks month months year years upto +" Array + +syntax keyword coffeeSFunction contained create add all any at average clone compact count each +syntax keyword coffeeSFunction contained every exclude filter find findAll findFrom findIndex findIndexFrom first flatten +syntax keyword coffeeSFunction contained forEach from groupBy inGroups inGroupsOf include indexOf insert intersect isEmpty +syntax keyword coffeeSFunction contained last lastIndexOf least map max min most none randomize reduce +syntax keyword coffeeSFunction contained reduceRight remove removeAt sample some sortBy subtract sum to union +syntax keyword coffeeSFunction contained unique zip + +" Object + +syntax keyword coffeeSFunction contained extended fromQueryString isArray isObject isBoolean isDate isFunction isNaN isNumber isString +syntax keyword coffeeSFunction contained isRegExp toQueryString clone each map any all none count find +syntax keyword coffeeSFunction contained findAll reduce isEmpty sum average min max least most equal +syntax keyword coffeeSFunction contained has keys merge reject select size tap values watch + +" Function + +syntax keyword coffeeSFunction contained after bind cancel debounce delay everyfill lazyredrawonce throttle + +" RegExp + +syntax keyword coffeeSFunction contained escape addFlag getFlags removeFlag setFlags + " Date syntax keyword coffeeSFunction contained addLocale create future getLocale now past range setLocale addMilliseconds addSeconds syntax keyword coffeeSFunction contained addMinutes addHours addDays addWeeks addMonths addYears advance beginningOfDay beginningOfWeek beginningOfMonth @@ -43,6 +67,10 @@ syntax keyword coffeeSFunction contained hourBefore hoursBefore dayBefore daysBe syntax keyword coffeeSFunction contained millisecondFromNow millisecondsFromNow secondFromNow secondsFromNow minuteFromNow minutesFromNow hourFromNow hoursFromNow dayFromNow daysFromNow syntax keyword coffeeSFunction contained weekFromNow weeksFromNow monthFromNow monthsFromNow yearFromNow yearsFromNow utc +" Range + +syntax keyword coffeeSFunction contained clamp clone contains every intersect isValid span toString union + " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet diff --git a/autoload/syntax/sugar.ls.vim b/autoload/syntax/sugar.ls.vim index 2e1a5d2..fe6abe9 100644 --- a/autoload/syntax/sugar.ls.vim +++ b/autoload/syntax/sugar.ls.vim @@ -26,6 +26,30 @@ syntax keyword lsSFunction contained atan sqrt exp pow metric ordinalize pad rou syntax keyword lsSFunction contained millisecond milliseconds second seconds minute minutes hour hours day days syntax keyword lsSFunction contained week weeks month months year years upto +" Array + +syntax keyword lsSFunction contained create add all any at average clone compact count each +syntax keyword lsSFunction contained every exclude filter find findAll findFrom findIndex findIndexFrom first flatten +syntax keyword lsSFunction contained forEach from groupBy inGroups inGroupsOf include indexOf insert intersect isEmpty +syntax keyword lsSFunction contained last lastIndexOf least map max min most none randomize reduce +syntax keyword lsSFunction contained reduceRight remove removeAt sample some sortBy subtract sum to union +syntax keyword lsSFunction contained unique zip + +" Object + +syntax keyword lsSFunction contained extended fromQueryString isArray isObject isBoolean isDate isFunction isNaN isNumber isString +syntax keyword lsSFunction contained isRegExp toQueryString clone each map any all none count find +syntax keyword lsSFunction contained findAll reduce isEmpty sum average min max least most equal +syntax keyword lsSFunction contained has keys merge reject select size tap values watch + +" Function + +syntax keyword lsSFunction contained after bind cancel debounce delay everyfill lazyredrawonce throttle + +" RegExp + +syntax keyword lsSFunction contained escape addFlag getFlags removeFlag setFlags + " Date syntax keyword lsSFunction contained addLocale create future getLocale now past range setLocale addMilliseconds addSeconds syntax keyword lsSFunction contained addMinutes addHours addDays addWeeks addMonths addYears advance beginningOfDay beginningOfWeek beginningOfMonth @@ -43,6 +67,10 @@ syntax keyword lsSFunction contained hourBefore hoursBefore dayBefore daysBefore syntax keyword lsSFunction contained millisecondFromNow millisecondsFromNow secondFromNow secondsFromNow minuteFromNow minutesFromNow hourFromNow hoursFromNow dayFromNow daysFromNow syntax keyword lsSFunction contained weekFromNow weeksFromNow monthFromNow monthsFromNow yearFromNow yearsFromNow utc +" Range + +syntax keyword lsSFunction contained clamp clone contains every intersect isValid span toString union + " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet diff --git a/autoload/syntax/sugar.typescript.vim b/autoload/syntax/sugar.typescript.vim index 44ea08a..84b8b07 100644 --- a/autoload/syntax/sugar.typescript.vim +++ b/autoload/syntax/sugar.typescript.vim @@ -26,6 +26,30 @@ syntax keyword typescriptSFunction contained atan sqrt exp pow metric ordinalize syntax keyword typescriptSFunction contained millisecond milliseconds second seconds minute minutes hour hours day days syntax keyword typescriptSFunction contained week weeks month months year years upto +" Array + +syntax keyword typescriptSFunction contained create add all any at average clone compact count each +syntax keyword typescriptSFunction contained every exclude filter find findAll findFrom findIndex findIndexFrom first flatten +syntax keyword typescriptSFunction contained forEach from groupBy inGroups inGroupsOf include indexOf insert intersect isEmpty +syntax keyword typescriptSFunction contained last lastIndexOf least map max min most none randomize reduce +syntax keyword typescriptSFunction contained reduceRight remove removeAt sample some sortBy subtract sum to union +syntax keyword typescriptSFunction contained unique zip + +" Object + +syntax keyword typescriptSFunction contained extended fromQueryString isArray isObject isBoolean isDate isFunction isNaN isNumber isString +syntax keyword typescriptSFunction contained isRegExp toQueryString clone each map any all none count find +syntax keyword typescriptSFunction contained findAll reduce isEmpty sum average min max least most equal +syntax keyword typescriptSFunction contained has keys merge reject select size tap values watch + +" Function + +syntax keyword typescriptSFunction contained after bind cancel debounce delay everyfill lazyredrawonce throttle + +" RegExp + +syntax keyword typescriptSFunction contained escape addFlag getFlags removeFlag setFlags + " Date syntax keyword typescriptSFunction contained addLocale create future getLocale now past range setLocale addMilliseconds addSeconds syntax keyword typescriptSFunction contained addMinutes addHours addDays addWeeks addMonths addYears advance beginningOfDay beginningOfWeek beginningOfMonth @@ -43,6 +67,10 @@ syntax keyword typescriptSFunction contained hourBefore hoursBefore dayBefore da syntax keyword typescriptSFunction contained millisecondFromNow millisecondsFromNow secondFromNow secondsFromNow minuteFromNow minutesFromNow hourFromNow hoursFromNow dayFromNow daysFromNow syntax keyword typescriptSFunction contained weekFromNow weeksFromNow monthFromNow monthsFromNow yearFromNow yearsFromNow utc +" Range + +syntax keyword typescriptSFunction contained clamp clone contains every intersect isValid span toString union + " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet From 5d0cd47d29810b768a9f161bbb087e0080a070a3 Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 29 Aug 2013 11:53:34 +0800 Subject: [PATCH 05/80] Add sugar to support list --- autoload/jslibsyntax.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index e81cbf2..feabf9f 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -11,7 +11,8 @@ let s:libs = [ \ 'backbone', \ 'prelude', \ 'angularjs', - \ 'requirejs' + \ 'requirejs', + \ 'sugar' \ ] let s:path = expand(':p:h') From 79a47b1d972ff554ddf00b4ad98750a801c86e4a Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 29 Aug 2013 11:57:20 +0800 Subject: [PATCH 06/80] Fix #5, add sugar.js support --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1454064..a06de58 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Libraries * [prelude.ls](http://gkz.github.com/prelude-ls/) * [AngularJS](http://angularjs.org/) * [RequireJS](http://requirejs.org/) +* [Sugar.js](http://sugarjs.com/) File Types ---------- @@ -52,6 +53,7 @@ Support libs id: * prelude.ls: prelude * AngularJS: angularjs * RequireJS: requirejs +* Sugar.js: sugar You can use [local vimrc][] to setup libraries used in project. Sample code for local vimrc: From e141bdeca822b50cac918f8542f62d096062ffda Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 30 Aug 2013 21:03:06 +0800 Subject: [PATCH 07/80] Fix #7, contains is keyword in vim syntax --- autoload/syntax/sugar.javascript.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autoload/syntax/sugar.javascript.vim b/autoload/syntax/sugar.javascript.vim index eb52c56..6323ee3 100644 --- a/autoload/syntax/sugar.javascript.vim +++ b/autoload/syntax/sugar.javascript.vim @@ -69,7 +69,8 @@ syntax keyword javascriptSFunction contained weekFromNow weeksFromNow monthFromN " Range -syntax keyword javascriptSFunction contained clamp clone contains every intersect isValid span toString union +syntax keyword javascriptSFunction contained clamp clone every intersect isValid span toString union +syntax match javascriptSFunction contained /contains/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already From aa17cd5004ceaf3e4cb865f59472138ad734d91b Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 30 Aug 2013 21:07:40 +0800 Subject: [PATCH 08/80] Make contains keyword --- autoload/syntax/sugar.javascript.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/syntax/sugar.javascript.vim b/autoload/syntax/sugar.javascript.vim index 6323ee3..0f7bdef 100644 --- a/autoload/syntax/sugar.javascript.vim +++ b/autoload/syntax/sugar.javascript.vim @@ -70,7 +70,7 @@ syntax keyword javascriptSFunction contained weekFromNow weeksFromNow monthFromN " Range syntax keyword javascriptSFunction contained clamp clone every intersect isValid span toString union -syntax match javascriptSFunction contained /contains/ +syntax keyword javascriptSFunction contained contain[s] " Define the default highlighting. " For version 5.7 and earlier: only when not done already From b7713172f36abf2dfa51d2df26c7c2dff2d036c9 Mon Sep 17 00:00:00 2001 From: othree_kao Date: Mon, 2 Sep 2013 13:35:52 +0800 Subject: [PATCH 09/80] 0.35 change log --- README.md | 5 ++++- config.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a06de58..1d2895e 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ Todo ---- * Support future version of SyntaxComplete -* Use `b:current_syntax` instead of `&filetype` Known Issue ----------- @@ -84,6 +83,10 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.3.5 +* Add sugar.js support +* b:current_syntax to detect current syntax + ### Version 0.3.4 * Add $ to iskeyword for jQuery and angular (Issue #4) * Support linecomment (Issue #6) diff --git a/config.mk b/config.mk index 284f598..4d2333b 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ NAME=javascript-libraries-syntax.vim -VERSION=0.3.4 +VERSION=0.3.5 bundle-deps: $(call fetch_github,ID,REPOSITORY,BRANCH,PATH,TARGET_PATH) From ce46c15bdcbe2e1ad086a5453fb4e5d4b6b51744 Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 9 Sep 2013 23:04:35 +0800 Subject: [PATCH 10/80] Fix #8, contains for all ft --- autoload/syntax/sugar.coffee.vim | 3 ++- autoload/syntax/sugar.ls.vim | 3 ++- autoload/syntax/sugar.typescript.vim | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/autoload/syntax/sugar.coffee.vim b/autoload/syntax/sugar.coffee.vim index 3933213..70beeb7 100644 --- a/autoload/syntax/sugar.coffee.vim +++ b/autoload/syntax/sugar.coffee.vim @@ -69,7 +69,8 @@ syntax keyword coffeeSFunction contained weekFromNow weeksFromNow monthFromNow m " Range -syntax keyword coffeeSFunction contained clamp clone contains every intersect isValid span toString union +syntax keyword coffeeSFunction contained clamp clone every intersect isValid span toString union +syntax keyword coffeeSFunction contained contain[s] " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/sugar.ls.vim b/autoload/syntax/sugar.ls.vim index fe6abe9..66a31f7 100644 --- a/autoload/syntax/sugar.ls.vim +++ b/autoload/syntax/sugar.ls.vim @@ -69,7 +69,8 @@ syntax keyword lsSFunction contained weekFromNow weeksFromNow monthFromNow month " Range -syntax keyword lsSFunction contained clamp clone contains every intersect isValid span toString union +syntax keyword lsSFunction contained clamp clone every intersect isValid span toString union +syntax keyword lsSFunction contained contain[s] " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/sugar.typescript.vim b/autoload/syntax/sugar.typescript.vim index 84b8b07..0c23784 100644 --- a/autoload/syntax/sugar.typescript.vim +++ b/autoload/syntax/sugar.typescript.vim @@ -69,7 +69,8 @@ syntax keyword typescriptSFunction contained weekFromNow weeksFromNow monthFromN " Range -syntax keyword typescriptSFunction contained clamp clone contains every intersect isValid span toString union +syntax keyword typescriptSFunction contained clamp clone every intersect isValid span toString union +syntax keyword typescriptSFunction contained contain[s] " Define the default highlighting. " For version 5.7 and earlier: only when not done already From 258a238b9a7fdaf9280f26fbfc0b246e259a205b Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Tue, 8 Oct 2013 10:21:02 +0100 Subject: [PATCH 11/80] Escape paths to be sourced with fnameescape Note, `fnameescape` has to be called after `filereadable`, otherwise `filereadable` returns false. --- autoload/jslibsyntax.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index feabf9f..8698b1a 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -33,7 +33,7 @@ function! jslibsyntax#load() if use let fn = s:path.'/syntax/'.lib.'.'.&filetype.'.vim' if filereadable(fn) - exe('source '.fn) + exe('source '.fnameescape(fn)) let loaded = loaded + 1 endif endif @@ -41,7 +41,7 @@ function! jslibsyntax#load() endwhile let fn = s:path.'/syntax/postprocess.'.&filetype.'.vim' if loaded > 0 && filereadable(fn) - exe('source '.fn) + exe('source '.fnameescape(fn)) endif endfunction From 7c96e46b0ade41a9dd1511df3bcada68f370c0b0 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Tue, 28 Jan 2014 15:33:19 +0000 Subject: [PATCH 12/80] Add Angular ngIf --- autoload/syntax/angularjs.html.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/syntax/angularjs.html.vim b/autoload/syntax/angularjs.html.vim index ec3fc37..04f5020 100644 --- a/autoload/syntax/angularjs.html.vim +++ b/autoload/syntax/angularjs.html.vim @@ -13,7 +13,7 @@ syntax keyword htmlArg contained ng-disable ng-form ng-hide ng-href ng-include syntax keyword htmlArg contained ng-key-up ng-list ng-model ng-mousedown ng-mouseenter ng-mouseleave ng-mousemove syntax keyword htmlArg contained ng-mouseover ng-mouseup ng-multiple ng-non-bindable ng-pluralize ng-readonly syntax keyword htmlArg contained ng-repeat ng-selected ng-show ng-src ng-style ng-submit ng-switch ng-switch-when -syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view +syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view ng-if " http://docs.angularjs.org/guide/directive syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(app\|bind\|bind-html-unsafe\|bind-template\|change\|checked\|class\)/ @@ -22,7 +22,7 @@ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disable\|form\|hide\|hre syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(key-up\|list\|model\|mousedown\|mouseenter\|mouseleave\|mousemove\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(mouseover\|mouseup\|multiple\|non-bindable\|pluralize\|readonly\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(repeat\|selected\|show\|src\|style\|submit\|switch\|switch-when\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\|if\)/ " http://docs.angularjs.org/api/ng.directive:ngInclude " http://docs.angularjs.org/api/ng.directive:ngPluralize From d5ad2c3016883972a602fdd6732188520d5baff8 Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 31 Jan 2014 21:19:45 +0800 Subject: [PATCH 13/80] Fix #11, add jasmine support --- autoload/jslibsyntax.vim | 3 +- autoload/syntax/jasmine.coffee.vim | 64 ++++++++++++++++++++++ autoload/syntax/jasmine.javascript.vim | 64 ++++++++++++++++++++++ autoload/syntax/jasmine.ls.vim | 64 ++++++++++++++++++++++ autoload/syntax/jasmine.typescript.vim | 64 ++++++++++++++++++++++ autoload/syntax/postprocess.javascript.vim | 4 +- autoload/syntax/update.sh | 2 +- 7 files changed, 261 insertions(+), 4 deletions(-) create mode 100644 autoload/syntax/jasmine.coffee.vim create mode 100644 autoload/syntax/jasmine.javascript.vim create mode 100644 autoload/syntax/jasmine.ls.vim create mode 100644 autoload/syntax/jasmine.typescript.vim diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index feabf9f..dc1456b 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -12,7 +12,8 @@ let s:libs = [ \ 'prelude', \ 'angularjs', \ 'requirejs', - \ 'sugar' + \ 'sugar', + \ 'jasmine' \ ] let s:path = expand(':p:h') diff --git a/autoload/syntax/jasmine.coffee.vim b/autoload/syntax/jasmine.coffee.vim new file mode 100644 index 0000000..47f8ca7 --- /dev/null +++ b/autoload/syntax/jasmine.coffee.vim @@ -0,0 +1,64 @@ +" Vim syntax file +" Language: jasmine for coffee +" Maintainer: othree +" Last Change: 2014/01/31 +" Version: 2.0 +" URL: http://jasmine.github.io/ + + +syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=coffeeJdot +syntax match coffeeJdot contained /\./ nextgroup=coffeeJMethods +syntax keyword coffeeJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv + +syntax keyword coffeeJMethods contained tick useMock +syntax keyword coffeeJMethods contained addReporter specFilter + +syntax cluster coffeeJFunctions contains=coffeeJMethods,coffeeJEnvMethods,coffeeJEnvMethods,coffeeJExpectMethods,coffeeJSpyMethods,coffeeJSpyAndMethods,coffeeJSpyCallsMethods +syntax cluster coffeeJAttrs contains=coffeeJExpectNot,coffeeJSpyAnd,coffeeJSpyCalls + +syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString + +syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString + +syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString + +syntax keyword coffeeJSpyAnd and contained +syntax keyword coffeeJSpyAndMethods returnValue callFake throwError stub contained +syntax keyword coffeeJSpyCalls calls contained +syntax keyword coffeeJSpyMethods andReturn andCallThrough callThrough contained +syntax keyword coffeeJCallsMethods any count argsFor allArgs all mostRecent first reset contained + +syntax keyword coffeeJGlobalMethod expect containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeJExpectNot not contained nextgroup=coffeeJExpectNotdot + +syntax keyword coffeeJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained +syntax keyword coffeeJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained +syntax keyword coffeeJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_coffee_syntax_inits") + if version < 508 + let did_requirejs_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeJasmine Constant + HiLink coffeeJMethods PreProc + HiLink coffeeJEnvMethods PreProc + HiLink coffeeJClockMethods PreProc + HiLink coffeeJGlobalMethod PreProc + HiLink coffeeJSpyAnd PreProc + HiLink coffeeJSpyAndMethods PreProc + HiLink coffeeJSpyCalls PreProc + HiLink coffeeJSpyMethods PreProc + HiLink coffeeJCallsMethods PreProc + HiLink coffeeJExpectNot PreProc + HiLink coffeeJExpectMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/jasmine.javascript.vim b/autoload/syntax/jasmine.javascript.vim new file mode 100644 index 0000000..014f54e --- /dev/null +++ b/autoload/syntax/jasmine.javascript.vim @@ -0,0 +1,64 @@ +" Vim syntax file +" Language: jasmine for javascript +" Maintainer: othree +" Last Change: 2014/01/31 +" Version: 2.0 +" URL: http://jasmine.github.io/ + + +syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=javascriptJdot +syntax match javascriptJdot contained /\./ nextgroup=javascriptJMethods +syntax keyword javascriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv + +syntax keyword javascriptJMethods contained tick useMock +syntax keyword javascriptJMethods contained addReporter specFilter + +syntax cluster javascriptJFunctions contains=javascriptJMethods,javascriptJEnvMethods,javascriptJEnvMethods,javascriptJExpectMethods,javascriptJSpyMethods,javascriptJSpyAndMethods,javascriptJSpyCallsMethods +syntax cluster javascriptJAttrs contains=javascriptJExpectNot,javascriptJSpyAnd,javascriptJSpyCalls + +syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString + +syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString + +syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString + +syntax keyword javascriptJSpyAnd and contained +syntax keyword javascriptJSpyAndMethods returnValue callFake throwError stub contained +syntax keyword javascriptJSpyCalls calls contained +syntax keyword javascriptJSpyMethods andReturn andCallThrough callThrough contained +syntax keyword javascriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained + +syntax keyword javascriptJGlobalMethod expect containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptJExpectNot not contained nextgroup=javascriptJExpectNotdot + +syntax keyword javascriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained +syntax keyword javascriptJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained +syntax keyword javascriptJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_javascript_syntax_inits") + if version < 508 + let did_requirejs_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptJasmine Constant + HiLink javascriptJMethods PreProc + HiLink javascriptJEnvMethods PreProc + HiLink javascriptJClockMethods PreProc + HiLink javascriptJGlobalMethod PreProc + HiLink javascriptJSpyAnd PreProc + HiLink javascriptJSpyAndMethods PreProc + HiLink javascriptJSpyCalls PreProc + HiLink javascriptJSpyMethods PreProc + HiLink javascriptJCallsMethods PreProc + HiLink javascriptJExpectNot PreProc + HiLink javascriptJExpectMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/jasmine.ls.vim b/autoload/syntax/jasmine.ls.vim new file mode 100644 index 0000000..6a9a08a --- /dev/null +++ b/autoload/syntax/jasmine.ls.vim @@ -0,0 +1,64 @@ +" Vim syntax file +" Language: jasmine for ls +" Maintainer: othree +" Last Change: 2014/01/31 +" Version: 2.0 +" URL: http://jasmine.github.io/ + + +syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=lsJdot +syntax match lsJdot contained /\./ nextgroup=lsJMethods +syntax keyword lsJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv + +syntax keyword lsJMethods contained tick useMock +syntax keyword lsJMethods contained addReporter specFilter + +syntax cluster lsJFunctions contains=lsJMethods,lsJEnvMethods,lsJEnvMethods,lsJExpectMethods,lsJSpyMethods,lsJSpyAndMethods,lsJSpyCallsMethods +syntax cluster lsJAttrs contains=lsJExpectNot,lsJSpyAnd,lsJSpyCalls + +syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,lsComment,lsLineComment,lsString + +syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString + +syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString + +syntax keyword lsJSpyAnd and contained +syntax keyword lsJSpyAndMethods returnValue callFake throwError stub contained +syntax keyword lsJSpyCalls calls contained +syntax keyword lsJSpyMethods andReturn andCallThrough callThrough contained +syntax keyword lsJCallsMethods any count argsFor allArgs all mostRecent first reset contained + +syntax keyword lsJGlobalMethod expect containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsJExpectNot not contained nextgroup=lsJExpectNotdot + +syntax keyword lsJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained +syntax keyword lsJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained +syntax keyword lsJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_ls_syntax_inits") + if version < 508 + let did_requirejs_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsJasmine Constant + HiLink lsJMethods PreProc + HiLink lsJEnvMethods PreProc + HiLink lsJClockMethods PreProc + HiLink lsJGlobalMethod PreProc + HiLink lsJSpyAnd PreProc + HiLink lsJSpyAndMethods PreProc + HiLink lsJSpyCalls PreProc + HiLink lsJSpyMethods PreProc + HiLink lsJCallsMethods PreProc + HiLink lsJExpectNot PreProc + HiLink lsJExpectMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/jasmine.typescript.vim b/autoload/syntax/jasmine.typescript.vim new file mode 100644 index 0000000..9b14a4b --- /dev/null +++ b/autoload/syntax/jasmine.typescript.vim @@ -0,0 +1,64 @@ +" Vim syntax file +" Language: jasmine for typescript +" Maintainer: othree +" Last Change: 2014/01/31 +" Version: 2.0 +" URL: http://jasmine.github.io/ + + +syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=typescriptJdot +syntax match typescriptJdot contained /\./ nextgroup=typescriptJMethods +syntax keyword typescriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv + +syntax keyword typescriptJMethods contained tick useMock +syntax keyword typescriptJMethods contained addReporter specFilter + +syntax cluster typescriptJFunctions contains=typescriptJMethods,typescriptJEnvMethods,typescriptJEnvMethods,typescriptJExpectMethods,typescriptJSpyMethods,typescriptJSpyAndMethods,typescriptJSpyCallsMethods +syntax cluster typescriptJAttrs contains=typescriptJExpectNot,typescriptJSpyAnd,typescriptJSpyCalls + +syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString + +syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString + +syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString + +syntax keyword typescriptJSpyAnd and contained +syntax keyword typescriptJSpyAndMethods returnValue callFake throwError stub contained +syntax keyword typescriptJSpyCalls calls contained +syntax keyword typescriptJSpyMethods andReturn andCallThrough callThrough contained +syntax keyword typescriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained + +syntax keyword typescriptJGlobalMethod expect containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptJExpectNot not contained nextgroup=typescriptJExpectNotdot + +syntax keyword typescriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained +syntax keyword typescriptJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained +syntax keyword typescriptJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_typescript_syntax_inits") + if version < 508 + let did_requirejs_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptJasmine Constant + HiLink typescriptJMethods PreProc + HiLink typescriptJEnvMethods PreProc + HiLink typescriptJClockMethods PreProc + HiLink typescriptJGlobalMethod PreProc + HiLink typescriptJSpyAnd PreProc + HiLink typescriptJSpyAndMethods PreProc + HiLink typescriptJSpyCalls PreProc + HiLink typescriptJSpyMethods PreProc + HiLink typescriptJCallsMethods PreProc + HiLink typescriptJExpectNot PreProc + HiLink typescriptJExpectMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index c438d41..c9d8b7d 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -6,6 +6,6 @@ " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions -syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs +syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions +syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@javascriptLibraryFuncs,@javascriptLibraryAttrs diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 7769fbe..fd618a2 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,7 +1,7 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From 0cc38219660c447575cf81ed1754604a2c9d1f0f Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 6 Feb 2014 17:26:57 +0800 Subject: [PATCH 14/80] Update underscore syntax --- autoload/syntax/underscore.coffee.vim | 12 ++++++++---- autoload/syntax/underscore.javascript.vim | 12 ++++++++---- autoload/syntax/underscore.ls.vim | 12 ++++++++---- autoload/syntax/underscore.typescript.vim | 12 ++++++++---- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index b3a31c7..a89aee3 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: underscore.js for coffee " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 1.4.4.2 +" Last Change: 2014/02/06 +" Version: 1.5.2 " URL: http://underscorejs.org/ -" LoDash: 1.2.0 +" LoDash: 2.5.0 " URL: http://lodash.com/ syntax keyword coffeeunderscore containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString _ @@ -16,7 +16,7 @@ syntax cluster coffee_Functions contains=coffee_collections,coffee_arrays,coffee syntax match coffee_collections contained /contains/ syntax keyword coffee_collections contained each map reduce reduceRight find filter where findWhere syntax keyword coffee_collections contained reject every some invoke pluck max min sortBy -syntax keyword coffee_collections contained groupBy countBy shuffle toArray size +syntax keyword coffee_collections contained groupBy indexBy countBy shuffle toArray size syntax keyword coffee_arrays contained first initial last rest compact flatten without union syntax keyword coffee_arrays contained intersection difference uniq zip object indextOf syntax keyword coffee_arrays contained lastIndexOf sortedIndex range @@ -34,6 +34,9 @@ syntax keyword coffee_chaining contained chain value syntax keyword coffee_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword coffee_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial syntax keyword coffee_lodash contained partialRight runInContext support unzip where +syntax keyword coffee_lodash contained capitalize match slice trim trimLeft trimRight +syntax keyword coffee_lodash contained constant mapValues now property xor +syntax keyword coffee_lodash contained create noop transform " Define the default highlighting. @@ -55,6 +58,7 @@ if version >= 508 || !exists("did_underscore_coffee_syntax_inits") HiLink coffee_objects PreProc HiLink coffee_utility PreProc HiLink coffee_chaining PreProc + HiLink coffee_lodash PreProc delcommand HiLink diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 5f6cf36..1d066cd 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: underscore.js for javascript " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 1.4.4.2 +" Last Change: 2014/02/06 +" Version: 1.5.2 " URL: http://underscorejs.org/ -" LoDash: 1.2.0 +" LoDash: 2.5.0 " URL: http://lodash.com/ syntax keyword javascriptunderscore containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString _ @@ -16,7 +16,7 @@ syntax cluster javascript_Functions contains=javascript_collections,javascript_a syntax match javascript_collections contained /contains/ syntax keyword javascript_collections contained each map reduce reduceRight find filter where findWhere syntax keyword javascript_collections contained reject every some invoke pluck max min sortBy -syntax keyword javascript_collections contained groupBy countBy shuffle toArray size +syntax keyword javascript_collections contained groupBy indexBy countBy shuffle toArray size syntax keyword javascript_arrays contained first initial last rest compact flatten without union syntax keyword javascript_arrays contained intersection difference uniq zip object indextOf syntax keyword javascript_arrays contained lastIndexOf sortedIndex range @@ -34,6 +34,9 @@ syntax keyword javascript_chaining contained chain value syntax keyword javascript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword javascript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial syntax keyword javascript_lodash contained partialRight runInContext support unzip where +syntax keyword javascript_lodash contained capitalize match slice trim trimLeft trimRight +syntax keyword javascript_lodash contained constant mapValues now property xor +syntax keyword javascript_lodash contained create noop transform " Define the default highlighting. @@ -55,6 +58,7 @@ if version >= 508 || !exists("did_underscore_javascript_syntax_inits") HiLink javascript_objects PreProc HiLink javascript_utility PreProc HiLink javascript_chaining PreProc + HiLink javascript_lodash PreProc delcommand HiLink diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index e46168f..7981019 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: underscore.js for ls " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 1.4.4.2 +" Last Change: 2014/02/06 +" Version: 1.5.2 " URL: http://underscorejs.org/ -" LoDash: 1.2.0 +" LoDash: 2.5.0 " URL: http://lodash.com/ syntax keyword lsunderscore containedin=ALLBUT,lsComment,lsLineComment,lsString _ @@ -16,7 +16,7 @@ syntax cluster ls_Functions contains=ls_collections,ls_arrays,ls_functions,ls_ob syntax match ls_collections contained /contains/ syntax keyword ls_collections contained each map reduce reduceRight find filter where findWhere syntax keyword ls_collections contained reject every some invoke pluck max min sortBy -syntax keyword ls_collections contained groupBy countBy shuffle toArray size +syntax keyword ls_collections contained groupBy indexBy countBy shuffle toArray size syntax keyword ls_arrays contained first initial last rest compact flatten without union syntax keyword ls_arrays contained intersection difference uniq zip object indextOf syntax keyword ls_arrays contained lastIndexOf sortedIndex range @@ -34,6 +34,9 @@ syntax keyword ls_chaining contained chain value syntax keyword ls_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword ls_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial syntax keyword ls_lodash contained partialRight runInContext support unzip where +syntax keyword ls_lodash contained capitalize match slice trim trimLeft trimRight +syntax keyword ls_lodash contained constant mapValues now property xor +syntax keyword ls_lodash contained create noop transform " Define the default highlighting. @@ -55,6 +58,7 @@ if version >= 508 || !exists("did_underscore_ls_syntax_inits") HiLink ls_objects PreProc HiLink ls_utility PreProc HiLink ls_chaining PreProc + HiLink ls_lodash PreProc delcommand HiLink diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 1065a24..0f13e63 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: underscore.js for typescript " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 1.4.4.2 +" Last Change: 2014/02/06 +" Version: 1.5.2 " URL: http://underscorejs.org/ -" LoDash: 1.2.0 +" LoDash: 2.5.0 " URL: http://lodash.com/ syntax keyword typescriptunderscore containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString _ @@ -16,7 +16,7 @@ syntax cluster typescript_Functions contains=typescript_collections,typescript_a syntax match typescript_collections contained /contains/ syntax keyword typescript_collections contained each map reduce reduceRight find filter where findWhere syntax keyword typescript_collections contained reject every some invoke pluck max min sortBy -syntax keyword typescript_collections contained groupBy countBy shuffle toArray size +syntax keyword typescript_collections contained groupBy indexBy countBy shuffle toArray size syntax keyword typescript_arrays contained first initial last rest compact flatten without union syntax keyword typescript_arrays contained intersection difference uniq zip object indextOf syntax keyword typescript_arrays contained lastIndexOf sortedIndex range @@ -34,6 +34,9 @@ syntax keyword typescript_chaining contained chain value syntax keyword typescript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword typescript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial syntax keyword typescript_lodash contained partialRight runInContext support unzip where +syntax keyword typescript_lodash contained capitalize match slice trim trimLeft trimRight +syntax keyword typescript_lodash contained constant mapValues now property xor +syntax keyword typescript_lodash contained create noop transform " Define the default highlighting. @@ -55,6 +58,7 @@ if version >= 508 || !exists("did_underscore_typescript_syntax_inits") HiLink typescript_objects PreProc HiLink typescript_utility PreProc HiLink typescript_chaining PreProc + HiLink typescript_lodash PreProc delcommand HiLink From f4e059a24b56c68c866f88392ebcbe2ab85b627b Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 6 Feb 2014 17:28:51 +0800 Subject: [PATCH 15/80] Add jasmine to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1d2895e..ffdd280 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Libraries * [AngularJS](http://angularjs.org/) * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) +* [Jasmine](http://pivotal.github.io/jasmine/) File Types ---------- @@ -54,6 +55,7 @@ Support libs id: * AngularJS: angularjs * RequireJS: requirejs * Sugar.js: sugar +* Jasmine: jasmine You can use [local vimrc][] to setup libraries used in project. Sample code for local vimrc: From e08e02d3990042d68e411deffe75ff91bdeb34e1 Mon Sep 17 00:00:00 2001 From: othree_kao Date: Thu, 13 Feb 2014 15:47:33 +0800 Subject: [PATCH 16/80] Add jquery.finish --- autoload/syntax/jquery.coffee.vim | 4 ++-- autoload/syntax/jquery.javascript.vim | 4 ++-- autoload/syntax/jquery.ls.vim | 4 ++-- autoload/syntax/jquery.typescript.vim | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index 508a820..f7779dc 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -2,7 +2,7 @@ " Language: jQuery for coffee " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2013/07/26 +" Last Change: 2014/02/13 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -33,7 +33,7 @@ syntax keyword coffeeQData contained clearQueue data dequeue queue rem syntax keyword coffeeQDeferred contained Deferred always done fail notify progress promise reject rejectWith resolved resolveWith notifyWith state then syntax keyword coffeeQDimensions contained height innerHeight innerWidth outerHeight outerWidth width syntax keyword coffeeQEffects contained hide show toggle -syntax keyword coffeeQEffects contained animate delay stop +syntax keyword coffeeQEffects contained animate delay stop finish syntax keyword coffeeQEffects contained fadeIn fadeOut fadeTo fadeToggle syntax keyword coffeeQEffects contained slideDown slideToggle slideUp syntax keyword coffeeQEvents contained error resize scroll diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 0203ed1..b0716f9 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -2,7 +2,7 @@ " Language: jQuery for javascript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2013/07/26 +" Last Change: 2014/02/13 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -33,7 +33,7 @@ syntax keyword javascriptQData contained clearQueue data dequeue queue syntax keyword javascriptQDeferred contained Deferred always done fail notify progress promise reject rejectWith resolved resolveWith notifyWith state then syntax keyword javascriptQDimensions contained height innerHeight innerWidth outerHeight outerWidth width syntax keyword javascriptQEffects contained hide show toggle -syntax keyword javascriptQEffects contained animate delay stop +syntax keyword javascriptQEffects contained animate delay stop finish syntax keyword javascriptQEffects contained fadeIn fadeOut fadeTo fadeToggle syntax keyword javascriptQEffects contained slideDown slideToggle slideUp syntax keyword javascriptQEvents contained error resize scroll diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 5e21626..78b3251 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -2,7 +2,7 @@ " Language: jQuery for ls " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2013/07/26 +" Last Change: 2014/02/13 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -33,7 +33,7 @@ syntax keyword lsQData contained clearQueue data dequeue queue removeD syntax keyword lsQDeferred contained Deferred always done fail notify progress promise reject rejectWith resolved resolveWith notifyWith state then syntax keyword lsQDimensions contained height innerHeight innerWidth outerHeight outerWidth width syntax keyword lsQEffects contained hide show toggle -syntax keyword lsQEffects contained animate delay stop +syntax keyword lsQEffects contained animate delay stop finish syntax keyword lsQEffects contained fadeIn fadeOut fadeTo fadeToggle syntax keyword lsQEffects contained slideDown slideToggle slideUp syntax keyword lsQEvents contained error resize scroll diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 91a24d8..a5656f4 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -2,7 +2,7 @@ " Language: jQuery for typescript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2013/07/26 +" Last Change: 2014/02/13 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -33,7 +33,7 @@ syntax keyword typescriptQData contained clearQueue data dequeue queue syntax keyword typescriptQDeferred contained Deferred always done fail notify progress promise reject rejectWith resolved resolveWith notifyWith state then syntax keyword typescriptQDimensions contained height innerHeight innerWidth outerHeight outerWidth width syntax keyword typescriptQEffects contained hide show toggle -syntax keyword typescriptQEffects contained animate delay stop +syntax keyword typescriptQEffects contained animate delay stop finish syntax keyword typescriptQEffects contained fadeIn fadeOut fadeTo fadeToggle syntax keyword typescriptQEffects contained slideDown slideToggle slideUp syntax keyword typescriptQEvents contained error resize scroll From 70d153198bbf39dfcdfeadd923e19478249b0ab7 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Fri, 14 Feb 2014 00:32:39 +0000 Subject: [PATCH 17/80] Add AngularUI HTML syntax --- README.md | 1 + autoload/jslibsyntax.vim | 1 + autoload/syntax/angularui.html.vim | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 autoload/syntax/angularui.html.vim diff --git a/README.md b/README.md index ffdd280..b9b4f18 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Libraries * [Backbone.js](http://backbonejs.org/) * [prelude.ls](http://gkz.github.com/prelude-ls/) * [AngularJS](http://angularjs.org/) +* [AngularUI](http://angular-ui.github.io) * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) * [Jasmine](http://pivotal.github.io/jasmine/) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 5dcc02e..1ab5957 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -11,6 +11,7 @@ let s:libs = [ \ 'backbone', \ 'prelude', \ 'angularjs', + \ 'angularui', \ 'requirejs', \ 'sugar', \ 'jasmine' diff --git a/autoload/syntax/angularui.html.vim b/autoload/syntax/angularui.html.vim new file mode 100644 index 0000000..81f4adc --- /dev/null +++ b/autoload/syntax/angularui.html.vim @@ -0,0 +1,13 @@ +" Vim syntax file +" Language: AngularUI for HTML +" Maintainer: Tom Vincent +" URL: http://angular-ui.github.io + +setlocal iskeyword+=- + +syntax keyword htmlArg contained ui-view ui-event ui-match ui-include ui-jq +syntax keyword htmlArg contained ui-keypress ui-keydown ui-keyup ui-options +syntax keyword htmlArg contained ui-reset ui-route ui-scrollfixed ui-show +syntax keyword htmlArg contained ui-hide ui-toggle ui-validate ui-date +syntax keyword htmlArg contained ui-codemirror ui-ace ui-calendar ui-map +syntax keyword htmlArg contained ui-select2 ui-tinymce ui-sortable From 9cc0862721136a74a6b5c16429f021cf05483af7 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Fri, 14 Feb 2014 00:34:20 +0000 Subject: [PATCH 18/80] Add AngularUI key to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b9b4f18..2f9ae7d 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ Support libs id: * Backbone.js: backbone * prelude.ls: prelude * AngularJS: angularjs +* AngularUI: angularui * RequireJS: requirejs * Sugar.js: sugar * Jasmine: jasmine From 0ce14d33bdcc041dd6d3200eab7d7a8b4d3fae38 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Sun, 23 Feb 2014 13:45:57 +0000 Subject: [PATCH 19/80] Add ui-sref[-active] to AngularUI --- autoload/syntax/angularui.html.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autoload/syntax/angularui.html.vim b/autoload/syntax/angularui.html.vim index 81f4adc..14e79df 100644 --- a/autoload/syntax/angularui.html.vim +++ b/autoload/syntax/angularui.html.vim @@ -10,4 +10,5 @@ syntax keyword htmlArg contained ui-keypress ui-keydown ui-keyup ui-options syntax keyword htmlArg contained ui-reset ui-route ui-scrollfixed ui-show syntax keyword htmlArg contained ui-hide ui-toggle ui-validate ui-date syntax keyword htmlArg contained ui-codemirror ui-ace ui-calendar ui-map -syntax keyword htmlArg contained ui-select2 ui-tinymce ui-sortable +syntax keyword htmlArg contained ui-select2 ui-tinymce ui-sortable ui-sref +syntax keyword htmlArg contained ui-sref-active From bcca7786896e1165636d0ff014eef8f177f42ac3 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Sun, 23 Feb 2014 22:01:36 +0000 Subject: [PATCH 20/80] ng-disable -> ng-disabled --- autoload/syntax/angularjs.html.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/syntax/angularjs.html.vim b/autoload/syntax/angularjs.html.vim index 04f5020..8f24f90 100644 --- a/autoload/syntax/angularjs.html.vim +++ b/autoload/syntax/angularjs.html.vim @@ -9,7 +9,7 @@ setlocal iskeyword+=- syntax keyword htmlArg contained ng-app ng-bind ng-bind-html-unsafe ng-bind-template ng-change ng-checked ng-class syntax keyword htmlArg contained ng-class-even ng-class-odd ng-click ng-cloak ng-controller ng-csp ng-dblclick -syntax keyword htmlArg contained ng-disable ng-form ng-hide ng-href ng-include ng-init ng-keydown ng-keypress +syntax keyword htmlArg contained ng-disabled ng-form ng-hide ng-href ng-include ng-init ng-keydown ng-keypress syntax keyword htmlArg contained ng-key-up ng-list ng-model ng-mousedown ng-mouseenter ng-mouseleave ng-mousemove syntax keyword htmlArg contained ng-mouseover ng-mouseup ng-multiple ng-non-bindable ng-pluralize ng-readonly syntax keyword htmlArg contained ng-repeat ng-selected ng-show ng-src ng-style ng-submit ng-switch ng-switch-when @@ -18,7 +18,7 @@ syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view ng-if " http://docs.angularjs.org/guide/directive syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(app\|bind\|bind-html-unsafe\|bind-template\|change\|checked\|class\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(class-even\|class-odd\|click\|cloak\|controller\|csp\|dblclick\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disable\|form\|hide\|href\|include\|init\|keydown\|keypress\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disabled\|form\|hide\|href\|include\|init\|keydown\|keypress\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(key-up\|list\|model\|mousedown\|mouseenter\|mouseleave\|mousemove\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(mouseover\|mouseup\|multiple\|non-bindable\|pluralize\|readonly\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(repeat\|selected\|show\|src\|style\|submit\|switch\|switch-when\)/ From ba8b24a1a04fd97d9f7b6832924eccffa0f81e54 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 26 Feb 2014 15:20:22 +0800 Subject: [PATCH 21/80] 0.36 Change Log --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1d2895e..fdd6c9f 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,10 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.3.6 +* Add Jasmine, AngularUI +* Update underscore, jQuery + ### Version 0.3.5 * Add sugar.js support * b:current_syntax to detect current syntax From 168ebfb7dd1f09ff002a08c69428320c6f043acb Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 27 Jun 2014 17:29:16 +0800 Subject: [PATCH 22/80] jQuery not in js template literal --- autoload/syntax/jquery.coffee.vim | 2 +- autoload/syntax/jquery.javascript.vim | 2 +- autoload/syntax/jquery.ls.vim | 2 +- autoload/syntax/jquery.typescript.vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index f7779dc..ff75e4b 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword coffeejQuery containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString jQuery $ +syntax keyword coffeejQuery containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateVar jQuery $ " syntax match coffeejQuerydot contained /\./ nextgroup=@coffeeQGlobals " syntax match coffeejQuerydot contained /([^)]*)\./ nextgroup=@coffeeQFunctions diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index b0716f9..f7f1c31 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword javascriptjQuery containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString jQuery $ +syntax keyword javascriptjQuery containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateVar jQuery $ " syntax match javascriptjQuerydot contained /\./ nextgroup=@javascriptQGlobals " syntax match javascriptjQuerydot contained /([^)]*)\./ nextgroup=@javascriptQFunctions diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 78b3251..82af731 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword lsjQuery containedin=ALLBUT,lsComment,lsLineComment,lsString jQuery $ +syntax keyword lsjQuery containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateVar jQuery $ " syntax match lsjQuerydot contained /\./ nextgroup=@lsQGlobals " syntax match lsjQuerydot contained /([^)]*)\./ nextgroup=@lsQFunctions diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index a5656f4..464fba6 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword typescriptjQuery containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString jQuery $ +syntax keyword typescriptjQuery containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateVar jQuery $ " syntax match typescriptjQuerydot contained /\./ nextgroup=@typescriptQGlobals " syntax match typescriptjQuerydot contained /([^)]*)\./ nextgroup=@typescriptQFunctions From 1a4dda80980ee4b0503abcb538f4ce4dfd7c8cbd Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 27 Jun 2014 18:55:49 +0800 Subject: [PATCH 23/80] Update javascript template group name --- autoload/syntax/angularjs.coffee.vim | 2 +- autoload/syntax/angularjs.javascript.vim | 2 +- autoload/syntax/angularjs.ls.vim | 2 +- autoload/syntax/angularjs.typescript.vim | 2 +- autoload/syntax/backbone.coffee.vim | 2 +- autoload/syntax/backbone.javascript.vim | 2 +- autoload/syntax/backbone.ls.vim | 2 +- autoload/syntax/backbone.typescript.vim | 2 +- autoload/syntax/jasmine.coffee.vim | 2 +- autoload/syntax/jasmine.javascript.vim | 2 +- autoload/syntax/jasmine.ls.vim | 2 +- autoload/syntax/jasmine.typescript.vim | 2 +- autoload/syntax/jquery.coffee.vim | 2 +- autoload/syntax/jquery.javascript.vim | 2 +- autoload/syntax/jquery.ls.vim | 2 +- autoload/syntax/jquery.typescript.vim | 2 +- autoload/syntax/requirejs.coffee.vim | 2 +- autoload/syntax/requirejs.javascript.vim | 2 +- autoload/syntax/requirejs.ls.vim | 2 +- autoload/syntax/requirejs.typescript.vim | 2 +- autoload/syntax/underscore.coffee.vim | 2 +- autoload/syntax/underscore.javascript.vim | 2 +- autoload/syntax/underscore.ls.vim | 2 +- autoload/syntax/underscore.typescript.vim | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 12b036a..0b21fe4 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -7,7 +7,7 @@ setlocal iskeyword+=$ -syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=coffeeAngulardot +syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngulardot syntax match coffeeAngulardot contained /\./ nextgroup=coffeeAngularMethods syntax keyword coffeeAngularMethods contained bind bootstrap copy element equals syntax keyword coffeeAngularMethods contained extend forEach fromJson identity injector diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index a88047f..f293044 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -7,7 +7,7 @@ setlocal iskeyword+=$ -syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=javascriptAngulardot +syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngulardot syntax match javascriptAngulardot contained /\./ nextgroup=javascriptAngularMethods syntax keyword javascriptAngularMethods contained bind bootstrap copy element equals syntax keyword javascriptAngularMethods contained extend forEach fromJson identity injector diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index 083c9b6..fbac487 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -7,7 +7,7 @@ setlocal iskeyword+=$ -syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=lsAngulardot +syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngulardot syntax match lsAngulardot contained /\./ nextgroup=lsAngularMethods syntax keyword lsAngularMethods contained bind bootstrap copy element equals syntax keyword lsAngularMethods contained extend forEach fromJson identity injector diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index 3415b84..0c70624 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -7,7 +7,7 @@ setlocal iskeyword+=$ -syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=typescriptAngulardot +syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngulardot syntax match typescriptAngulardot contained /\./ nextgroup=typescriptAngularMethods syntax keyword typescriptAngularMethods contained bind bootstrap copy element equals syntax keyword typescriptAngularMethods contained extend forEach fromJson identity injector diff --git a/autoload/syntax/backbone.coffee.vim b/autoload/syntax/backbone.coffee.vim index af60ca0..6c5a1ea 100644 --- a/autoload/syntax/backbone.coffee.vim +++ b/autoload/syntax/backbone.coffee.vim @@ -5,7 +5,7 @@ " Version: 0.9.10 " URL: http://backbonejs.org/ -syntax keyword coffeeBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution syntax cluster coffeeBFunctions contains=coffeeBEvents,coffeeBModel,coffeeBCollection,coffeeBRouter,coffeeBHistory,coffeeBSync,coffeeBView,coffeeBUtility syntax cluster coffeeBAttrs contains=coffeeBModelAttrs,coffeeBCollectionAttrs,coffeeBRouterAttrs,coffeeBSyncAttrs,coffeeBViewAttrs diff --git a/autoload/syntax/backbone.javascript.vim b/autoload/syntax/backbone.javascript.vim index 79d9c17..d0ae448 100644 --- a/autoload/syntax/backbone.javascript.vim +++ b/autoload/syntax/backbone.javascript.vim @@ -5,7 +5,7 @@ " Version: 0.9.10 " URL: http://backbonejs.org/ -syntax keyword javascriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution syntax cluster javascriptBFunctions contains=javascriptBEvents,javascriptBModel,javascriptBCollection,javascriptBRouter,javascriptBHistory,javascriptBSync,javascriptBView,javascriptBUtility syntax cluster javascriptBAttrs contains=javascriptBModelAttrs,javascriptBCollectionAttrs,javascriptBRouterAttrs,javascriptBSyncAttrs,javascriptBViewAttrs diff --git a/autoload/syntax/backbone.ls.vim b/autoload/syntax/backbone.ls.vim index e949204..781d544 100644 --- a/autoload/syntax/backbone.ls.vim +++ b/autoload/syntax/backbone.ls.vim @@ -5,7 +5,7 @@ " Version: 0.9.10 " URL: http://backbonejs.org/ -syntax keyword lsBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution syntax cluster lsBFunctions contains=lsBEvents,lsBModel,lsBCollection,lsBRouter,lsBHistory,lsBSync,lsBView,lsBUtility syntax cluster lsBAttrs contains=lsBModelAttrs,lsBCollectionAttrs,lsBRouterAttrs,lsBSyncAttrs,lsBViewAttrs diff --git a/autoload/syntax/backbone.typescript.vim b/autoload/syntax/backbone.typescript.vim index c23e47a..4dbf6f1 100644 --- a/autoload/syntax/backbone.typescript.vim +++ b/autoload/syntax/backbone.typescript.vim @@ -5,7 +5,7 @@ " Version: 0.9.10 " URL: http://backbonejs.org/ -syntax keyword typescriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution syntax cluster typescriptBFunctions contains=typescriptBEvents,typescriptBModel,typescriptBCollection,typescriptBRouter,typescriptBHistory,typescriptBSync,typescriptBView,typescriptBUtility syntax cluster typescriptBAttrs contains=typescriptBModelAttrs,typescriptBCollectionAttrs,typescriptBRouterAttrs,typescriptBSyncAttrs,typescriptBViewAttrs diff --git a/autoload/syntax/jasmine.coffee.vim b/autoload/syntax/jasmine.coffee.vim index 47f8ca7..1a099ed 100644 --- a/autoload/syntax/jasmine.coffee.vim +++ b/autoload/syntax/jasmine.coffee.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=coffeeJdot +syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeJdot syntax match coffeeJdot contained /\./ nextgroup=coffeeJMethods syntax keyword coffeeJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv diff --git a/autoload/syntax/jasmine.javascript.vim b/autoload/syntax/jasmine.javascript.vim index 014f54e..0bab916 100644 --- a/autoload/syntax/jasmine.javascript.vim +++ b/autoload/syntax/jasmine.javascript.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=javascriptJdot +syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptJdot syntax match javascriptJdot contained /\./ nextgroup=javascriptJMethods syntax keyword javascriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv diff --git a/autoload/syntax/jasmine.ls.vim b/autoload/syntax/jasmine.ls.vim index 6a9a08a..a84f9d6 100644 --- a/autoload/syntax/jasmine.ls.vim +++ b/autoload/syntax/jasmine.ls.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=lsJdot +syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsJdot syntax match lsJdot contained /\./ nextgroup=lsJMethods syntax keyword lsJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv diff --git a/autoload/syntax/jasmine.typescript.vim b/autoload/syntax/jasmine.typescript.vim index 9b14a4b..3e0be5b 100644 --- a/autoload/syntax/jasmine.typescript.vim +++ b/autoload/syntax/jasmine.typescript.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=typescriptJdot +syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptJdot syntax match typescriptJdot contained /\./ nextgroup=typescriptJMethods syntax keyword typescriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index ff75e4b..cee0ae6 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword coffeejQuery containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateVar jQuery $ +syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeejQuerydot contained /\./ nextgroup=@coffeeQGlobals " syntax match coffeejQuerydot contained /([^)]*)\./ nextgroup=@coffeeQFunctions diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index f7f1c31..477ddad 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword javascriptjQuery containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateVar jQuery $ +syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptjQuerydot contained /\./ nextgroup=@javascriptQGlobals " syntax match javascriptjQuerydot contained /([^)]*)\./ nextgroup=@javascriptQFunctions diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 82af731..949f758 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword lsjQuery containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateVar jQuery $ +syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsjQuerydot contained /\./ nextgroup=@lsQGlobals " syntax match lsjQuerydot contained /([^)]*)\./ nextgroup=@lsQFunctions diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 464fba6..430cd30 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -8,7 +8,7 @@ setlocal iskeyword+=$ -syntax keyword typescriptjQuery containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateVar jQuery $ +syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptjQuerydot contained /\./ nextgroup=@typescriptQGlobals " syntax match typescriptjQuerydot contained /([^)]*)\./ nextgroup=@typescriptQFunctions diff --git a/autoload/syntax/requirejs.coffee.vim b/autoload/syntax/requirejs.coffee.vim index e638a60..3759655 100644 --- a/autoload/syntax/requirejs.coffee.vim +++ b/autoload/syntax/requirejs.coffee.vim @@ -6,7 +6,7 @@ " URL: http://requirejs.org/ -syntax keyword coffeeRequire require requirejs containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=coffeeRequiredot +syntax keyword coffeeRequire require requirejs containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRequiredot syntax match coffeeRequiredot contained /\./ nextgroup=coffeeRequireMethods syntax keyword coffeeRequireMethods contained config diff --git a/autoload/syntax/requirejs.javascript.vim b/autoload/syntax/requirejs.javascript.vim index 0d3d828..3e8afec 100644 --- a/autoload/syntax/requirejs.javascript.vim +++ b/autoload/syntax/requirejs.javascript.vim @@ -6,7 +6,7 @@ " URL: http://requirejs.org/ -syntax keyword javascriptRequire require requirejs containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=javascriptRequiredot +syntax keyword javascriptRequire require requirejs containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRequiredot syntax match javascriptRequiredot contained /\./ nextgroup=javascriptRequireMethods syntax keyword javascriptRequireMethods contained config diff --git a/autoload/syntax/requirejs.ls.vim b/autoload/syntax/requirejs.ls.vim index c480c93..9c9e138 100644 --- a/autoload/syntax/requirejs.ls.vim +++ b/autoload/syntax/requirejs.ls.vim @@ -6,7 +6,7 @@ " URL: http://requirejs.org/ -syntax keyword lsRequire require requirejs containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=lsRequiredot +syntax keyword lsRequire require requirejs containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRequiredot syntax match lsRequiredot contained /\./ nextgroup=lsRequireMethods syntax keyword lsRequireMethods contained config diff --git a/autoload/syntax/requirejs.typescript.vim b/autoload/syntax/requirejs.typescript.vim index e19ac49..5c71b03 100644 --- a/autoload/syntax/requirejs.typescript.vim +++ b/autoload/syntax/requirejs.typescript.vim @@ -6,7 +6,7 @@ " URL: http://requirejs.org/ -syntax keyword typescriptRequire require requirejs containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=typescriptRequiredot +syntax keyword typescriptRequire require requirejs containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRequiredot syntax match typescriptRequiredot contained /\./ nextgroup=typescriptRequireMethods syntax keyword typescriptRequireMethods contained config diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index a89aee3..b0fad9f 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -7,7 +7,7 @@ " LoDash: 2.5.0 " URL: http://lodash.com/ -syntax keyword coffeeunderscore containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString _ +syntax keyword coffeeunderscore _ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 1d066cd..2e32914 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -7,7 +7,7 @@ " LoDash: 2.5.0 " URL: http://lodash.com/ -syntax keyword javascriptunderscore containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString _ +syntax keyword javascriptunderscore _ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index 7981019..c2d1860 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -7,7 +7,7 @@ " LoDash: 2.5.0 " URL: http://lodash.com/ -syntax keyword lsunderscore containedin=ALLBUT,lsComment,lsLineComment,lsString _ +syntax keyword lsunderscore _ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 0f13e63..06637c6 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -7,7 +7,7 @@ " LoDash: 2.5.0 " URL: http://lodash.com/ -syntax keyword typescriptunderscore containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString _ +syntax keyword typescriptunderscore _ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions From 47e39ba12d0bfa215eacd12da63b5728cb7d190e Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 1 Jul 2014 18:13:34 +0800 Subject: [PATCH 24/80] Modify postprocess to avoid overwrite dot notation --- autoload/syntax/postprocess.coffee.vim | 11 ++++++----- autoload/syntax/postprocess.javascript.vim | 14 +++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index e8eed74..962ba5f 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -1,11 +1,12 @@ " Vim syntax file " Language: JS Lib syntax post process for coffee " Maintainer: othree -" Last Change: 2013/02/25 -" Version: 0.4 +" Last Change: 2014/07/01 +" Version: 0.5 " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster coffeeLibraryFuncs contains=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions,@coffeeSFunctions -syntax cluster coffeeLibraryAttrs contains=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs -syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs +" work with https://github.com/kchmck/vim-coffee-script +syntax cluster coffeeIdentifier add=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions,@coffeeSFunctions +syntax cluster coffeeIdentifier add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs +" syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index c9d8b7d..0547221 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -1,11 +1,15 @@ " Vim syntax file " Language: JS Lib syntax post process for javascript " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 0.4 +" Last Change: 2014/07/01 +" Version: 0.5 " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster javascriptLibraryFuncs contains=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions,@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions -syntax cluster javascriptLibraryAttrs contains=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs -syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@javascriptLibraryFuncs,@javascriptLibraryAttrs +syntax cluster props add=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions +syntax cluster props add=@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions +syntax cluster props add=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs + +if !exists("javascript_props") + syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@props +endif From c3e09cc87417f41047d4b324160ed42277757a4a Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 14 Jul 2014 18:34:11 +0800 Subject: [PATCH 25/80] Fix string def --- autoload/syntax/jquery.coffee.vim | 5 +++-- autoload/syntax/jquery.javascript.vim | 5 +++-- autoload/syntax/jquery.ls.vim | 5 +++-- autoload/syntax/jquery.typescript.vim | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index cee0ae6..7861ca1 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -57,8 +57,9 @@ syntax keyword coffeeQTraversing contained children closest find next nextAl " selector -syntax region coffeeString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=coffeeSpecial,@htmlPreproc,@jSelectors -syntax region coffeeString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=coffeeSpecial,@htmlPreproc,@jSelectors +syntax match coffeeASCII contained /\\\d\d\d/ +syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=coffeeASCII,@jSelectors +syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=coffeeASCII,@jSelectors syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters syntax match jId contained /#[0-9A-Za-z_\-]\+/ diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 477ddad..ca3c4a5 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -57,8 +57,9 @@ syntax keyword javascriptQTraversing contained children closest find next ne " selector -syntax region javascriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javascriptSpecial,@htmlPreproc,@jSelectors -syntax region javascriptString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javascriptSpecial,@htmlPreproc,@jSelectors +syntax match javascriptASCII contained /\\\d\d\d/ +syntax region javascriptString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=javascriptASCII,@jSelectors +syntax region javascriptString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=javascriptASCII,@jSelectors syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters syntax match jId contained /#[0-9A-Za-z_\-]\+/ diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 949f758..640608b 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -57,8 +57,9 @@ syntax keyword lsQTraversing contained children closest find next nextAll ne " selector -syntax region lsString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=lsSpecial,@htmlPreproc,@jSelectors -syntax region lsString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=lsSpecial,@htmlPreproc,@jSelectors +syntax match lsASCII contained /\\\d\d\d/ +syntax region lsString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=lsASCII,@jSelectors +syntax region lsString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=lsASCII,@jSelectors syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters syntax match jId contained /#[0-9A-Za-z_\-]\+/ diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 430cd30..75c40f2 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -57,8 +57,9 @@ syntax keyword typescriptQTraversing contained children closest find next ne " selector -syntax region typescriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=typescriptSpecial,@htmlPreproc,@jSelectors -syntax region typescriptString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=typescriptSpecial,@htmlPreproc,@jSelectors +syntax match typescriptASCII contained /\\\d\d\d/ +syntax region typescriptString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=typescriptASCII,@jSelectors +syntax region typescriptString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=typescriptASCII,@jSelectors syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters syntax match jId contained /#[0-9A-Za-z_\-]\+/ From 9f39e114a38650d047c64e7f6d5d17ad45c95cf7 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 16 Oct 2014 11:41:32 +0800 Subject: [PATCH 26/80] Fix #18, coffee script use their own string defination --- autoload/syntax/postprocess.coffee.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index 962ba5f..9aa6426 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -10,3 +10,7 @@ syntax cluster coffeeIdentifier add=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions,@coffeeSFunctions syntax cluster coffeeIdentifier add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs " syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs +" +syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors +syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@coffeeBasicString,@jSelectors + From b132e7cf52e7b719a5428c8bee3071565da9d69f Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 16 Oct 2014 12:08:05 +0800 Subject: [PATCH 27/80] ls multiline string --- autoload/syntax/postprocess.coffee.vim | 4 ++-- autoload/syntax/postprocess.ls.vim | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index 9aa6426..6adc11d 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -11,6 +11,6 @@ syntax cluster coffeeIdentifier add=@coffeeQFunctions,@coffee_Functions,@coffeeB syntax cluster coffeeIdentifier add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs " syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs " -syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors -syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@coffeeBasicString,@jSelectors +syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors +syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@coffeeBasicString,@jSelectors diff --git a/autoload/syntax/postprocess.ls.vim b/autoload/syntax/postprocess.ls.vim index 237298d..f386f61 100644 --- a/autoload/syntax/postprocess.ls.vim +++ b/autoload/syntax/postprocess.ls.vim @@ -22,3 +22,6 @@ syntax match lsLExp /!/ containedin=ALLBUT,lsComment,lsLineComment,lsString syntax match lsLPipe /|>/ containedin=ALLBUT,lsComment,lsLineComment,lsString skipwhite nextgroup=@lspFunctions syntax match lsLCompose />>/ containedin=ALLBUT,lsComment,lsLineComment,lsString skipwhite nextgroup=@lspFunctions + +syntax region lsString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@lsInterpString,@jSelectors +syntax region lsString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@lsSimpleString,@jSelectors From cf1e7c48da738f02c482e84a6797d10c1dd059fa Mon Sep 17 00:00:00 2001 From: NamelessOne Date: Thu, 23 Oct 2014 22:36:38 +0200 Subject: [PATCH 28/80] Fix multiline JS strings. --- autoload/syntax/jquery.javascript.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index ca3c4a5..9dfaa80 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -58,8 +58,8 @@ syntax keyword javascriptQTraversing contained children closest find next ne " selector syntax match javascriptASCII contained /\\\d\d\d/ -syntax region javascriptString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=javascriptASCII,@jSelectors -syntax region javascriptString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=javascriptASCII,@jSelectors +syntax region javascriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=javascriptASCII,@jSelectors +syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters syntax match jId contained /#[0-9A-Za-z_\-]\+/ From 97ea9982ea12f8e4eccf054635163023825a6168 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 16:55:40 +0800 Subject: [PATCH 29/80] Change implementation for css selector in jQuery --- autoload/syntax/jquery.coffee.vim | 46 +++++++++++++-------------- autoload/syntax/jquery.javascript.vim | 46 +++++++++++++-------------- autoload/syntax/jquery.ls.vim | 46 +++++++++++++-------------- autoload/syntax/jquery.typescript.vim | 46 +++++++++++++-------------- 4 files changed, 92 insertions(+), 92 deletions(-) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index 7861ca1..1630234 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -2,7 +2,7 @@ " Language: jQuery for coffee " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/02/13 +" Last Change: 2014/10/29 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -57,20 +57,20 @@ syntax keyword coffeeQTraversing contained children closest find next nextAl " selector -syntax match coffeeASCII contained /\\\d\d\d/ -syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=coffeeASCII,@jSelectors -syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=coffeeASCII,@jSelectors +" syntax match coffeeASCII contained /\\\d\d\d/ +" syntax region coffeeString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=coffeeASCII,@jSelectors +" syntax region coffeeString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=coffeeASCII,@jSelectors -syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters -syntax match jId contained /#[0-9A-Za-z_\-]\+/ -syntax match jClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match jOperators contained /*\|>\|+\|-\|\~/ -syntax match jBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match jContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match jForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match jVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors containedin=coffeeString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -105,15 +105,15 @@ if version >= 508 || !exists("did_jquery_coffee_syntax_inits") HiLink coffeeQTraversing PreProc HiLink coffeeQUtilities PreProc - HiLink jId Identifier - HiLink jClass Constant - HiLink jOperators Special - HiLink jBasicFilters Statement - HiLink jContentFilters Statement - HiLink jVisibility Statement - HiLink jChildFilters Statement - HiLink jForms Statement - HiLink jFormFilters Statement + HiLink cssId Identifier + HiLink cssClass Constant + HiLink cssOperators Special + HiLink cssBasicFilters Statement + HiLink cssContentFilters Statement + HiLink cssVisibility Statement + HiLink cssChildFilters Statement + HiLink cssForms Statement + HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 9dfaa80..cc72c73 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -2,7 +2,7 @@ " Language: jQuery for javascript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/02/13 +" Last Change: 2014/10/29 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -57,20 +57,20 @@ syntax keyword javascriptQTraversing contained children closest find next ne " selector -syntax match javascriptASCII contained /\\\d\d\d/ -syntax region javascriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=javascriptASCII,@jSelectors -syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors +" syntax match javascriptASCII contained /\\\d\d\d/ +" syntax region javascriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=javascriptASCII,@jSelectors +" syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors -syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters -syntax match jId contained /#[0-9A-Za-z_\-]\+/ -syntax match jClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match jOperators contained /*\|>\|+\|-\|\~/ -syntax match jBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match jContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match jForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match jVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors containedin=javascriptString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -105,15 +105,15 @@ if version >= 508 || !exists("did_jquery_javascript_syntax_inits") HiLink javascriptQTraversing PreProc HiLink javascriptQUtilities PreProc - HiLink jId Identifier - HiLink jClass Constant - HiLink jOperators Special - HiLink jBasicFilters Statement - HiLink jContentFilters Statement - HiLink jVisibility Statement - HiLink jChildFilters Statement - HiLink jForms Statement - HiLink jFormFilters Statement + HiLink cssId Identifier + HiLink cssClass Constant + HiLink cssOperators Special + HiLink cssBasicFilters Statement + HiLink cssContentFilters Statement + HiLink cssVisibility Statement + HiLink cssChildFilters Statement + HiLink cssForms Statement + HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 640608b..4083683 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -2,7 +2,7 @@ " Language: jQuery for ls " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/02/13 +" Last Change: 2014/10/29 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -57,20 +57,20 @@ syntax keyword lsQTraversing contained children closest find next nextAll ne " selector -syntax match lsASCII contained /\\\d\d\d/ -syntax region lsString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=lsASCII,@jSelectors -syntax region lsString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=lsASCII,@jSelectors +" syntax match lsASCII contained /\\\d\d\d/ +" syntax region lsString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=lsASCII,@jSelectors +" syntax region lsString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=lsASCII,@jSelectors -syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters -syntax match jId contained /#[0-9A-Za-z_\-]\+/ -syntax match jClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match jOperators contained /*\|>\|+\|-\|\~/ -syntax match jBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match jContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match jForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match jVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors containedin=lsString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -105,15 +105,15 @@ if version >= 508 || !exists("did_jquery_ls_syntax_inits") HiLink lsQTraversing PreProc HiLink lsQUtilities PreProc - HiLink jId Identifier - HiLink jClass Constant - HiLink jOperators Special - HiLink jBasicFilters Statement - HiLink jContentFilters Statement - HiLink jVisibility Statement - HiLink jChildFilters Statement - HiLink jForms Statement - HiLink jFormFilters Statement + HiLink cssId Identifier + HiLink cssClass Constant + HiLink cssOperators Special + HiLink cssBasicFilters Statement + HiLink cssContentFilters Statement + HiLink cssVisibility Statement + HiLink cssChildFilters Statement + HiLink cssForms Statement + HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 75c40f2..3aabb4a 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -2,7 +2,7 @@ " Language: jQuery for typescript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/02/13 +" Last Change: 2014/10/29 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -57,20 +57,20 @@ syntax keyword typescriptQTraversing contained children closest find next ne " selector -syntax match typescriptASCII contained /\\\d\d\d/ -syntax region typescriptString start=/"/ skip=/\\\\\|\\"/ end=/"\|$/ contains=typescriptASCII,@jSelectors -syntax region typescriptString start=/'/ skip=/\\\\\|\\'/ end=/'\|$/ contains=typescriptASCII,@jSelectors +" syntax match typescriptASCII contained /\\\d\d\d/ +" syntax region typescriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=typescriptASCII,@jSelectors +" syntax region typescriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=typescriptASCII,@jSelectors -syntax cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters -syntax match jId contained /#[0-9A-Za-z_\-]\+/ -syntax match jClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match jOperators contained /*\|>\|+\|-\|\~/ -syntax match jBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match jChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match jContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match jForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match jVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors containedin=typescriptString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -105,15 +105,15 @@ if version >= 508 || !exists("did_jquery_typescript_syntax_inits") HiLink typescriptQTraversing PreProc HiLink typescriptQUtilities PreProc - HiLink jId Identifier - HiLink jClass Constant - HiLink jOperators Special - HiLink jBasicFilters Statement - HiLink jContentFilters Statement - HiLink jVisibility Statement - HiLink jChildFilters Statement - HiLink jForms Statement - HiLink jFormFilters Statement + HiLink cssId Identifier + HiLink cssClass Constant + HiLink cssOperators Special + HiLink cssBasicFilters Statement + HiLink cssContentFilters Statement + HiLink cssVisibility Statement + HiLink cssChildFilters Statement + HiLink cssForms Statement + HiLink cssFormFilters Statement delcommand HiLink From 61e4c0eca073a246185715861114134cc4932a3a Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 16:58:46 +0800 Subject: [PATCH 30/80] Fix #22, default libs --- autoload/jslibsyntax.vim | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 1ab5957..5863ac9 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -1,7 +1,7 @@ " Vim plugin file " Language: JS Lib syntax loader " Maintainer: othree -" Last Change: 2013/02/24 +" Last Change: 2014/10/29 " Version: 0.3 " URL: https://github.com/othree/javascript-libraries-syntax.vim @@ -17,11 +17,17 @@ let s:libs = [ \ 'jasmine' \ ] +let s:default_libs = [ + \ 'jquery', + \ 'underscore', + \ 'backbone' + \ ] + let s:path = expand(':p:h') function! jslibsyntax#load() if !exists('g:used_javascript_libs') - let g:used_javascript_libs = join(s:libs, ',') + let g:used_javascript_libs = join(s:default_libs, ',') endif let index = 0 From 131b1eae781de14ab0a93fc86ddf3540855cad99 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 17:45:00 +0800 Subject: [PATCH 31/80] Add react --- autoload/jslibsyntax.vim | 6 ++-- autoload/syntax/postprocess.coffee.vim | 6 ++-- autoload/syntax/postprocess.javascript.vim | 1 + autoload/syntax/postprocess.ls.vim | 5 +-- autoload/syntax/postprocess.typescript.vim | 4 +-- autoload/syntax/react.coffee.vim | 37 ++++++++++++++++++++++ autoload/syntax/react.javascript.vim | 37 ++++++++++++++++++++++ autoload/syntax/react.ls.vim | 37 ++++++++++++++++++++++ autoload/syntax/react.typescript.vim | 37 ++++++++++++++++++++++ autoload/syntax/update.sh | 2 +- 10 files changed, 163 insertions(+), 9 deletions(-) create mode 100644 autoload/syntax/react.coffee.vim create mode 100644 autoload/syntax/react.javascript.vim create mode 100644 autoload/syntax/react.ls.vim create mode 100644 autoload/syntax/react.typescript.vim diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 5863ac9..3246ebc 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -14,13 +14,15 @@ let s:libs = [ \ 'angularui', \ 'requirejs', \ 'sugar', - \ 'jasmine' + \ 'jasmine', + \ 'react' \ ] let s:default_libs = [ \ 'jquery', \ 'underscore', - \ 'backbone' + \ 'backbone', + \ 'react' \ ] let s:path = expand(':p:h') diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index 6adc11d..4b441ce 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -7,8 +7,10 @@ " " work with https://github.com/kchmck/vim-coffee-script -syntax cluster coffeeIdentifier add=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions,@coffeepFunctions,@coffeeSFunctions -syntax cluster coffeeIdentifier add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs +syntax cluster props add=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions +syntax cluster props add=@coffeepFunctions,@coffeeAFunctions,@coffeeSFunctions,@coffeeJFunctions +syntax cluster props add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs,@coffeeAAttrs,@coffeeJAttrs +syntax cluster props add=@coffeeRProp " syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs " syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index 0547221..a0d87ad 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -9,6 +9,7 @@ syntax cluster props add=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions syntax cluster props add=@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions syntax cluster props add=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs +syntax cluster props add=@javascriptRProp if !exists("javascript_props") syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@props diff --git a/autoload/syntax/postprocess.ls.vim b/autoload/syntax/postprocess.ls.vim index f386f61..0c15b24 100644 --- a/autoload/syntax/postprocess.ls.vim +++ b/autoload/syntax/postprocess.ls.vim @@ -6,8 +6,9 @@ " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster lsLibraryFuncs contains=@lsQFunctions,@ls_Functions,@lsBFunctions,@lspFunctions,@lsSFunctions -syntax cluster lsLibraryAttrs contains=@lsQAttrs,@ls_Attrs,@lsBAttrs,@lspAttrs +syntax cluster lsLibraryFuncs contains=@lsQFunctions,@ls_Functions,@lsBFunctions,@lspFunctions,@lsAFunctions +syntax cluster lsLibraryFuncs contains=@lsSFunctions,@lsJFunctions,@lsRProp +syntax cluster lsLibraryAttrs contains=@lsQAttrs,@ls_Attrs,@lsBAttrs,@lspAttrs,@lsAAttrs,@lsSAttrs,@lsJAttrs " ).fun! " ).fun() " fun0!fun! diff --git a/autoload/syntax/postprocess.typescript.vim b/autoload/syntax/postprocess.typescript.vim index 1e27a2b..e1fda98 100644 --- a/autoload/syntax/postprocess.typescript.vim +++ b/autoload/syntax/postprocess.typescript.vim @@ -6,6 +6,6 @@ " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster typescriptLibraryFuncs contains=@typescriptQFunctions,@typescript_Functions,@typescriptBFunctions,@typescriptpFunctions,@typescriptAFunctions,typescriptSFunctions -syntax cluster typescriptLibraryAttrs contains=@typescriptQAttrs,@typescript_Attrs,@typescriptBAttrs,@typescriptpAttrs,@typescriptAAttrs +syntax cluster typescriptLibraryFuncs contains=@typescriptQFunctions,@typescript_Functions,@typescriptBFunctions,@typescriptpFunctions,@typescriptAFunctions,typescriptSFunctions,typescriptJFunctions,@typescriptRProp +syntax cluster typescriptLibraryAttrs contains=@typescriptQAttrs,@typescript_Attrs,@typescriptBAttrs,@typescriptpAttrs,@typescriptAAttrs,@typescriptSAttrs,@typescriptJAttrs syntax match typescriptLDot /\./ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptLibraryFuncs,@typescriptLibraryAttrs diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim new file mode 100644 index 0000000..a88c1b1 --- /dev/null +++ b/autoload/syntax/react.coffee.vim @@ -0,0 +1,37 @@ +" Vim syntax file +" Language: React for coffee +" Maintainer: othree +" Last Change: 2014/10/29 +" Version: 0.12.0 +" URL: https://facebook.github.io/react/docs/top-level-api.html +" URL: https://facebook.github.io/react/docs/component-api.html + +syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution + +syntax keyword coffeeRTop contained createClass render unmountComponentAtNode renderToString +syntax keyword coffeeRTop contained renderToStaticMarkup isValidElement DOM PropTypes +syntax keyword coffeeRTop contained initializeTouchEvents Children map forEach count only +syntax keyword coffeeRComponent contained setState replaceState forceUpdate getDOMNode +syntax keyword coffeeRComponent contained isMounted setProps replaceProps + +syntax cluster coffeeRProp contains=coffeeRTop,coffeeRComponent + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_coffee_syntax_inits") + if version < 508 + let did_jquery_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeReact Constant + + HiLink coffeeRTop PreProc + HiLink coffeeRComponent PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim new file mode 100644 index 0000000..75b6bee --- /dev/null +++ b/autoload/syntax/react.javascript.vim @@ -0,0 +1,37 @@ +" Vim syntax file +" Language: React for javascript +" Maintainer: othree +" Last Change: 2014/10/29 +" Version: 0.12.0 +" URL: https://facebook.github.io/react/docs/top-level-api.html +" URL: https://facebook.github.io/react/docs/component-api.html + +syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution + +syntax keyword javascriptRTop contained createClass render unmountComponentAtNode renderToString +syntax keyword javascriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes +syntax keyword javascriptRTop contained initializeTouchEvents Children map forEach count only +syntax keyword javascriptRComponent contained setState replaceState forceUpdate getDOMNode +syntax keyword javascriptRComponent contained isMounted setProps replaceProps + +syntax cluster javascriptRProp contains=javascriptRTop,javascriptRComponent + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_javascript_syntax_inits") + if version < 508 + let did_jquery_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptReact Constant + + HiLink javascriptRTop PreProc + HiLink javascriptRComponent PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim new file mode 100644 index 0000000..345e84b --- /dev/null +++ b/autoload/syntax/react.ls.vim @@ -0,0 +1,37 @@ +" Vim syntax file +" Language: React for ls +" Maintainer: othree +" Last Change: 2014/10/29 +" Version: 0.12.0 +" URL: https://facebook.github.io/react/docs/top-level-api.html +" URL: https://facebook.github.io/react/docs/component-api.html + +syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution + +syntax keyword lsRTop contained createClass render unmountComponentAtNode renderToString +syntax keyword lsRTop contained renderToStaticMarkup isValidElement DOM PropTypes +syntax keyword lsRTop contained initializeTouchEvents Children map forEach count only +syntax keyword lsRComponent contained setState replaceState forceUpdate getDOMNode +syntax keyword lsRComponent contained isMounted setProps replaceProps + +syntax cluster lsRProp contains=lsRTop,lsRComponent + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_ls_syntax_inits") + if version < 508 + let did_jquery_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsReact Constant + + HiLink lsRTop PreProc + HiLink lsRComponent PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim new file mode 100644 index 0000000..5b3094b --- /dev/null +++ b/autoload/syntax/react.typescript.vim @@ -0,0 +1,37 @@ +" Vim syntax file +" Language: React for typescript +" Maintainer: othree +" Last Change: 2014/10/29 +" Version: 0.12.0 +" URL: https://facebook.github.io/react/docs/top-level-api.html +" URL: https://facebook.github.io/react/docs/component-api.html + +syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution + +syntax keyword typescriptRTop contained createClass render unmountComponentAtNode renderToString +syntax keyword typescriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes +syntax keyword typescriptRTop contained initializeTouchEvents Children map forEach count only +syntax keyword typescriptRComponent contained setState replaceState forceUpdate getDOMNode +syntax keyword typescriptRComponent contained isMounted setProps replaceProps + +syntax cluster typescriptRProp contains=typescriptRTop,typescriptRComponent + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_typescript_syntax_inits") + if version < 508 + let did_jquery_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptReact Constant + + HiLink typescriptRTop PreProc + HiLink typescriptRComponent PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index fd618a2..33df2f3 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,7 +1,7 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'react' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From 8861a128084e400dd5b1b3320efe0ee3da0d7125 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 17:45:05 +0800 Subject: [PATCH 32/80] Fix jquery sellector string --- autoload/syntax/jquery.javascript.vim | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index cc72c73..f166e60 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -61,16 +61,16 @@ syntax keyword javascriptQTraversing contained children closest find next ne " syntax region javascriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=javascriptASCII,@jSelectors " syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors -syntax cluster cssSelectors containedin=javascriptString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax match cssId contained /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained containedin=javascriptString /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained containedin=javascriptString /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained containedin=javascriptString /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained containedin=javascriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained containedin=javascriptString /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained containedin=javascriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained containedin=javascriptString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already From 84a8497351da385a6dd08846cbeccacfd329f6f2 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 17:46:12 +0800 Subject: [PATCH 33/80] Readme for react --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 285e65f..d0a6da5 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Libraries * [prelude.ls](http://gkz.github.com/prelude-ls/) * [AngularJS](http://angularjs.org/) * [AngularUI](http://angular-ui.github.io) +* [React](https://facebook.github.io/react/index.html) * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) * [Jasmine](http://pivotal.github.io/jasmine/) @@ -55,6 +56,7 @@ Support libs id: * prelude.ls: prelude * AngularJS: angularjs * AngularUI: angularui +* React: react * RequireJS: requirejs * Sugar.js: sugar * Jasmine: jasmine From 87a6103bd20095665831dbe6cd822753382d93ef Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Oct 2014 17:57:12 +0800 Subject: [PATCH 34/80] Doc about default lib set --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d0a6da5..615ba3c 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,8 @@ Support libs id: * Sugar.js: sugar * Jasmine: jasmine +Default lib set is: `jquery,underscore,backbone` + You can use [local vimrc][] to setup libraries used in project. Sample code for local vimrc: autocmd BufReadPre *.js let b:javascript_lib_use_jquery = 1 From b5bbdbd56dad3cec5be14fca31717a33d27cc774 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 30 Oct 2014 12:16:29 +0800 Subject: [PATCH 35/80] Add Flux --- README.md | 6 ++++++ autoload/jslibsyntax.vim | 7 +++--- autoload/syntax/flux.coffee.vim | 31 +++++++++++++++++++++++++++ autoload/syntax/flux.javascript.vim | 31 +++++++++++++++++++++++++++ autoload/syntax/flux.ls.vim | 31 +++++++++++++++++++++++++++ autoload/syntax/flux.typescript.vim | 31 +++++++++++++++++++++++++++ autoload/syntax/jquery.coffee.vim | 20 ++++++++--------- autoload/syntax/jquery.ls.vim | 20 ++++++++--------- autoload/syntax/jquery.typescript.vim | 20 ++++++++--------- autoload/syntax/update.sh | 2 +- 10 files changed, 165 insertions(+), 34 deletions(-) create mode 100644 autoload/syntax/flux.coffee.vim create mode 100644 autoload/syntax/flux.javascript.vim create mode 100644 autoload/syntax/flux.ls.vim create mode 100644 autoload/syntax/flux.typescript.vim diff --git a/README.md b/README.md index 615ba3c..b98195f 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ Support libs id: * AngularJS: angularjs * AngularUI: angularui * React: react +* Flux: flux * RequireJS: requirejs * Sugar.js: sugar * Jasmine: jasmine @@ -91,6 +92,11 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.4 +* Add React, Flux +* Default lib set +* Bug fix + ### Version 0.3.6 * Add Jasmine, AngularUI * Update underscore, jQuery diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 3246ebc..e0fb36e 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -1,8 +1,8 @@ " Vim plugin file " Language: JS Lib syntax loader " Maintainer: othree -" Last Change: 2014/10/29 -" Version: 0.3 +" Last Change: 2014/10/30 +" Version: 0.4 " URL: https://github.com/othree/javascript-libraries-syntax.vim let s:libs = [ @@ -15,7 +15,8 @@ let s:libs = [ \ 'requirejs', \ 'sugar', \ 'jasmine', - \ 'react' + \ 'react', + \ 'flux' \ ] let s:default_libs = [ diff --git a/autoload/syntax/flux.coffee.vim b/autoload/syntax/flux.coffee.vim new file mode 100644 index 0000000..ade2cc0 --- /dev/null +++ b/autoload/syntax/flux.coffee.vim @@ -0,0 +1,31 @@ +" Vim syntax file +" Language: Flux for coffee +" Maintainer: othree +" Last Change: 2014/10/30 +" Version: 2.0.2 +" URL: https://facebook.github.io/flux/docs/dispatcher.html + +syntax keyword coffeeFlux Dispatcher containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution + +syntax keyword coffeeFDispatcher contained register unregister waitFor dispatch isDispatching + +syntax cluster coffeeFFunction contains=coffeeFDispatcher + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_coffee_syntax_inits") + if version < 508 + let did_jquery_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeFlux Constant + + HiLink coffeeFDispatcher PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/flux.javascript.vim b/autoload/syntax/flux.javascript.vim new file mode 100644 index 0000000..697f346 --- /dev/null +++ b/autoload/syntax/flux.javascript.vim @@ -0,0 +1,31 @@ +" Vim syntax file +" Language: Flux for javascript +" Maintainer: othree +" Last Change: 2014/10/30 +" Version: 2.0.2 +" URL: https://facebook.github.io/flux/docs/dispatcher.html + +syntax keyword javascriptFlux Dispatcher containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution + +syntax keyword javascriptFDispatcher contained register unregister waitFor dispatch isDispatching + +syntax cluster javascriptFFunction contains=javascriptFDispatcher + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_javascript_syntax_inits") + if version < 508 + let did_jquery_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptFlux Constant + + HiLink javascriptFDispatcher PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/flux.ls.vim b/autoload/syntax/flux.ls.vim new file mode 100644 index 0000000..5aa1920 --- /dev/null +++ b/autoload/syntax/flux.ls.vim @@ -0,0 +1,31 @@ +" Vim syntax file +" Language: Flux for ls +" Maintainer: othree +" Last Change: 2014/10/30 +" Version: 2.0.2 +" URL: https://facebook.github.io/flux/docs/dispatcher.html + +syntax keyword lsFlux Dispatcher containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution + +syntax keyword lsFDispatcher contained register unregister waitFor dispatch isDispatching + +syntax cluster lsFFunction contains=lsFDispatcher + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_ls_syntax_inits") + if version < 508 + let did_jquery_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsFlux Constant + + HiLink lsFDispatcher PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/flux.typescript.vim b/autoload/syntax/flux.typescript.vim new file mode 100644 index 0000000..364c83c --- /dev/null +++ b/autoload/syntax/flux.typescript.vim @@ -0,0 +1,31 @@ +" Vim syntax file +" Language: Flux for typescript +" Maintainer: othree +" Last Change: 2014/10/30 +" Version: 2.0.2 +" URL: https://facebook.github.io/flux/docs/dispatcher.html + +syntax keyword typescriptFlux Dispatcher containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution + +syntax keyword typescriptFDispatcher contained register unregister waitFor dispatch isDispatching + +syntax cluster typescriptFFunction contains=typescriptFDispatcher + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_typescript_syntax_inits") + if version < 508 + let did_jquery_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptFlux Constant + + HiLink typescriptFDispatcher PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index 1630234..7b4b60c 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -61,16 +61,16 @@ syntax keyword coffeeQTraversing contained children closest find next nextAl " syntax region coffeeString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=coffeeASCII,@jSelectors " syntax region coffeeString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=coffeeASCII,@jSelectors -syntax cluster cssSelectors containedin=coffeeString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax match cssId contained /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained containedin=coffeeString /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained containedin=coffeeString /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained containedin=coffeeString /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained containedin=coffeeString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained containedin=coffeeString /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained containedin=coffeeString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained containedin=coffeeString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 4083683..844ef51 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -61,16 +61,16 @@ syntax keyword lsQTraversing contained children closest find next nextAll ne " syntax region lsString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=lsASCII,@jSelectors " syntax region lsString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=lsASCII,@jSelectors -syntax cluster cssSelectors containedin=lsString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax match cssId contained /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained containedin=lsString /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained containedin=lsString /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained containedin=lsString /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained containedin=lsString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained containedin=lsString /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained containedin=lsString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained containedin=lsString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 3aabb4a..5856ea1 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -61,16 +61,16 @@ syntax keyword typescriptQTraversing contained children closest find next ne " syntax region typescriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=typescriptASCII,@jSelectors " syntax region typescriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=typescriptASCII,@jSelectors -syntax cluster cssSelectors containedin=typescriptString contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax match cssId contained /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained /:\(hidden\|visible\)/ +syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax match cssId contained containedin=typescriptString /#[0-9A-Za-z_\-]\+/ +syntax match cssClass contained containedin=typescriptString /\.[0-9A-Za-z_\-]\+/ +syntax match cssOperators contained containedin=typescriptString /*\|>\|+\|-\|\~/ +syntax match cssBasicFilters contained containedin=typescriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ +syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +syntax match cssContentFilters contained containedin=typescriptString /:\(contains\|empty\|has\|parent\)/ +syntax match cssForms contained containedin=typescriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +syntax match cssVisibility contained containedin=typescriptString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 33df2f3..c800a26 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,7 +1,7 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'react' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'react' 'flux' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From cbfac3d00ec7d827cc4e5865a895b3dd0d18d2f7 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 30 Oct 2014 12:20:51 +0800 Subject: [PATCH 36/80] Flux link --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b98195f..0d67046 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ Libraries * [prelude.ls](http://gkz.github.com/prelude-ls/) * [AngularJS](http://angularjs.org/) * [AngularUI](http://angular-ui.github.io) -* [React](https://facebook.github.io/react/index.html) +* [React](https://facebook.github.io/react/) +* [Flux](https://facebook.github.io/flux/) * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) * [Jasmine](http://pivotal.github.io/jasmine/) From e1a18d3474a951b3c7a961d363648fd72e51c690 Mon Sep 17 00:00:00 2001 From: tkrugg Date: Tue, 25 Mar 2014 23:53:19 +0100 Subject: [PATCH 37/80] added support for chaijs with javascript --- autoload/jslibsyntax.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index e0fb36e..7d0b4c4 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -15,6 +15,7 @@ let s:libs = [ \ 'requirejs', \ 'sugar', \ 'jasmine', + \ 'chai', \ 'react', \ 'flux' \ ] From e92663e203ef55c147efdc0781c608c35abdda8c Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 30 Oct 2014 13:43:41 +0800 Subject: [PATCH 38/80] Add chai --- README.md | 2 ++ autoload/syntax/chai.coffee.vim | 49 +++++++++++++++++++++++++++++ autoload/syntax/chai.javascript.vim | 49 +++++++++++++++++++++++++++++ autoload/syntax/chai.ls.vim | 49 +++++++++++++++++++++++++++++ autoload/syntax/chai.typescript.vim | 49 +++++++++++++++++++++++++++++ autoload/syntax/update.sh | 2 +- 6 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 autoload/syntax/chai.coffee.vim create mode 100644 autoload/syntax/chai.javascript.vim create mode 100644 autoload/syntax/chai.ls.vim create mode 100644 autoload/syntax/chai.typescript.vim diff --git a/README.md b/README.md index 0d67046..903cf9f 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Libraries * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) * [Jasmine](http://pivotal.github.io/jasmine/) +* [Chai](http://chaijs.com/) File Types ---------- @@ -62,6 +63,7 @@ Support libs id: * RequireJS: requirejs * Sugar.js: sugar * Jasmine: jasmine +* Chai: chai Default lib set is: `jquery,underscore,backbone` diff --git a/autoload/syntax/chai.coffee.vim b/autoload/syntax/chai.coffee.vim new file mode 100644 index 0000000..1227e0d --- /dev/null +++ b/autoload/syntax/chai.coffee.vim @@ -0,0 +1,49 @@ +" Vim syntax file +" Language: chai.js for coffee +" Maintainer: tkrugg +" Last Change: 2014/03/25 +" Version: 1.9.2 +" URL: http://chaijs.com/ + +" TDD (assert) +syntax keyword coffeechai assert +syntax keyword coffee_asserter fail ok notOk +syntax keyword coffee_asserter equal notEqual strictEqual notStrictEqual deepEqual notDeepEqual +syntax keyword coffee_asserter isTrue isFalse isNull isNotNull isUndefined isDefined isFunction isNotFunction isObject isNotObject isArray isNotArray isString isNotString isNumber isNotNumber isBoolean isNotBoolean +syntax keyword coffee_asserter typeOf notTypeOf instanceOf notInstanceOf +syntax keyword coffee_asserter include notInclude match notMatch +syntax keyword coffee_asserter property notProperty deepProperty notDeepProperty propertyVal propertyNotVal deepPropertyVal deepPropertyNotVal +syntax keyword coffee_asserter lengthOf +syntax keyword coffee_asserter throws throw Throw doesNotThrow +syntax keyword coffee_asserter operator closeTo +syntax keyword coffee_asserter sameMembers includeMembers + +" BDD (expect/should) +syntax keyword coffeechai expect should +syntax keyword coffee_chain to be been is that and has have with at of same +syntax keyword coffee_asserter not deep a an include contain +syntax keyword coffee_asserter ok true false null undefined exist empty +syntax keyword coffee_asserter arguments Arguments equal equals eq eql eqls +syntax keyword coffee_asserter above gt greaterThan least gte below lt lessThan most lte within +syntax keyword coffee_asserter instanceof instanceOf property ownProperty haveOwnProperty +syntax keyword coffee_asserter length lengthOf match string keys key +syntax keyword coffee_asserter throw throws Throw respondTo itself satisfy closeTo members + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_chai_coffee_syntax_inits") + if version < 508 + let did_chai_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeechai Constant + + HiLink coffee_chain Comment + HiLink coffee_asserter PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/chai.javascript.vim b/autoload/syntax/chai.javascript.vim new file mode 100644 index 0000000..1cc13b2 --- /dev/null +++ b/autoload/syntax/chai.javascript.vim @@ -0,0 +1,49 @@ +" Vim syntax file +" Language: chai.js for javascript +" Maintainer: tkrugg +" Last Change: 2014/03/25 +" Version: 1.9.2 +" URL: http://chaijs.com/ + +" TDD (assert) +syntax keyword javascriptchai assert +syntax keyword javascript_asserter fail ok notOk +syntax keyword javascript_asserter equal notEqual strictEqual notStrictEqual deepEqual notDeepEqual +syntax keyword javascript_asserter isTrue isFalse isNull isNotNull isUndefined isDefined isFunction isNotFunction isObject isNotObject isArray isNotArray isString isNotString isNumber isNotNumber isBoolean isNotBoolean +syntax keyword javascript_asserter typeOf notTypeOf instanceOf notInstanceOf +syntax keyword javascript_asserter include notInclude match notMatch +syntax keyword javascript_asserter property notProperty deepProperty notDeepProperty propertyVal propertyNotVal deepPropertyVal deepPropertyNotVal +syntax keyword javascript_asserter lengthOf +syntax keyword javascript_asserter throws throw Throw doesNotThrow +syntax keyword javascript_asserter operator closeTo +syntax keyword javascript_asserter sameMembers includeMembers + +" BDD (expect/should) +syntax keyword javascriptchai expect should +syntax keyword javascript_chain to be been is that and has have with at of same +syntax keyword javascript_asserter not deep a an include contain +syntax keyword javascript_asserter ok true false null undefined exist empty +syntax keyword javascript_asserter arguments Arguments equal equals eq eql eqls +syntax keyword javascript_asserter above gt greaterThan least gte below lt lessThan most lte within +syntax keyword javascript_asserter instanceof instanceOf property ownProperty haveOwnProperty +syntax keyword javascript_asserter length lengthOf match string keys key +syntax keyword javascript_asserter throw throws Throw respondTo itself satisfy closeTo members + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_chai_javascript_syntax_inits") + if version < 508 + let did_chai_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptchai Constant + + HiLink javascript_chain Comment + HiLink javascript_asserter PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/chai.ls.vim b/autoload/syntax/chai.ls.vim new file mode 100644 index 0000000..88a6ec9 --- /dev/null +++ b/autoload/syntax/chai.ls.vim @@ -0,0 +1,49 @@ +" Vim syntax file +" Language: chai.js for ls +" Maintainer: tkrugg +" Last Change: 2014/03/25 +" Version: 1.9.2 +" URL: http://chaijs.com/ + +" TDD (assert) +syntax keyword lschai assert +syntax keyword ls_asserter fail ok notOk +syntax keyword ls_asserter equal notEqual strictEqual notStrictEqual deepEqual notDeepEqual +syntax keyword ls_asserter isTrue isFalse isNull isNotNull isUndefined isDefined isFunction isNotFunction isObject isNotObject isArray isNotArray isString isNotString isNumber isNotNumber isBoolean isNotBoolean +syntax keyword ls_asserter typeOf notTypeOf instanceOf notInstanceOf +syntax keyword ls_asserter include notInclude match notMatch +syntax keyword ls_asserter property notProperty deepProperty notDeepProperty propertyVal propertyNotVal deepPropertyVal deepPropertyNotVal +syntax keyword ls_asserter lengthOf +syntax keyword ls_asserter throws throw Throw doesNotThrow +syntax keyword ls_asserter operator closeTo +syntax keyword ls_asserter sameMembers includeMembers + +" BDD (expect/should) +syntax keyword lschai expect should +syntax keyword ls_chain to be been is that and has have with at of same +syntax keyword ls_asserter not deep a an include contain +syntax keyword ls_asserter ok true false null undefined exist empty +syntax keyword ls_asserter arguments Arguments equal equals eq eql eqls +syntax keyword ls_asserter above gt greaterThan least gte below lt lessThan most lte within +syntax keyword ls_asserter instanceof instanceOf property ownProperty haveOwnProperty +syntax keyword ls_asserter length lengthOf match string keys key +syntax keyword ls_asserter throw throws Throw respondTo itself satisfy closeTo members + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_chai_ls_syntax_inits") + if version < 508 + let did_chai_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lschai Constant + + HiLink ls_chain Comment + HiLink ls_asserter PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/chai.typescript.vim b/autoload/syntax/chai.typescript.vim new file mode 100644 index 0000000..c1e75eb --- /dev/null +++ b/autoload/syntax/chai.typescript.vim @@ -0,0 +1,49 @@ +" Vim syntax file +" Language: chai.js for typescript +" Maintainer: tkrugg +" Last Change: 2014/03/25 +" Version: 1.9.2 +" URL: http://chaijs.com/ + +" TDD (assert) +syntax keyword typescriptchai assert +syntax keyword typescript_asserter fail ok notOk +syntax keyword typescript_asserter equal notEqual strictEqual notStrictEqual deepEqual notDeepEqual +syntax keyword typescript_asserter isTrue isFalse isNull isNotNull isUndefined isDefined isFunction isNotFunction isObject isNotObject isArray isNotArray isString isNotString isNumber isNotNumber isBoolean isNotBoolean +syntax keyword typescript_asserter typeOf notTypeOf instanceOf notInstanceOf +syntax keyword typescript_asserter include notInclude match notMatch +syntax keyword typescript_asserter property notProperty deepProperty notDeepProperty propertyVal propertyNotVal deepPropertyVal deepPropertyNotVal +syntax keyword typescript_asserter lengthOf +syntax keyword typescript_asserter throws throw Throw doesNotThrow +syntax keyword typescript_asserter operator closeTo +syntax keyword typescript_asserter sameMembers includeMembers + +" BDD (expect/should) +syntax keyword typescriptchai expect should +syntax keyword typescript_chain to be been is that and has have with at of same +syntax keyword typescript_asserter not deep a an include contain +syntax keyword typescript_asserter ok true false null undefined exist empty +syntax keyword typescript_asserter arguments Arguments equal equals eq eql eqls +syntax keyword typescript_asserter above gt greaterThan least gte below lt lessThan most lte within +syntax keyword typescript_asserter instanceof instanceOf property ownProperty haveOwnProperty +syntax keyword typescript_asserter length lengthOf match string keys key +syntax keyword typescript_asserter throw throws Throw respondTo itself satisfy closeTo members + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_chai_typescript_syntax_inits") + if version < 508 + let did_chai_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptchai Constant + + HiLink typescript_chain Comment + HiLink typescript_asserter PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index c800a26..794927d 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,7 +1,7 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'react' 'flux' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From 2ab2e6e75063246a4c7682d3a0a1cd338c2aa902 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 30 Oct 2014 13:50:19 +0800 Subject: [PATCH 39/80] Update change log --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 903cf9f..ac47684 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Changes ------- ### Version 0.4 -* Add React, Flux +* Add React, Flux, Chai * Default lib set * Bug fix From 97d01496fffd230d0e6449016b8afed04ee5b234 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 30 Oct 2014 23:36:05 +0800 Subject: [PATCH 40/80] Use b:current_syntax instead of &filetype --- autoload/jslibsyntax.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 1ab5957..5afccd8 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -33,7 +33,7 @@ function! jslibsyntax#load() exec('let use = b:javascript_lib_use_'.lib) endif if use - let fn = s:path.'/syntax/'.lib.'.'.&filetype.'.vim' + let fn = s:path.'/syntax/'.lib.'.'.b:current_syntax.'.vim' if filereadable(fn) exe('source '.fnameescape(fn)) let loaded = loaded + 1 @@ -41,7 +41,7 @@ function! jslibsyntax#load() endif let index = index + 1 endwhile - let fn = s:path.'/syntax/postprocess.'.&filetype.'.vim' + let fn = s:path.'/syntax/postprocess.'.b:current_syntax.'.vim' if loaded > 0 && filereadable(fn) exe('source '.fnameescape(fn)) endif From b8182e97e8832227380233a9bdc860dfa62c0e6c Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Sun, 2 Nov 2014 17:09:53 +0000 Subject: [PATCH 41/80] Add ng-blur highlighting https://docs.angularjs.org/api/ng/directive/ngBlur --- autoload/syntax/angularjs.html.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/syntax/angularjs.html.vim b/autoload/syntax/angularjs.html.vim index 8f24f90..662a824 100644 --- a/autoload/syntax/angularjs.html.vim +++ b/autoload/syntax/angularjs.html.vim @@ -13,7 +13,7 @@ syntax keyword htmlArg contained ng-disabled ng-form ng-hide ng-href ng-include syntax keyword htmlArg contained ng-key-up ng-list ng-model ng-mousedown ng-mouseenter ng-mouseleave ng-mousemove syntax keyword htmlArg contained ng-mouseover ng-mouseup ng-multiple ng-non-bindable ng-pluralize ng-readonly syntax keyword htmlArg contained ng-repeat ng-selected ng-show ng-src ng-style ng-submit ng-switch ng-switch-when -syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view ng-if +syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view ng-if ng-blur " http://docs.angularjs.org/guide/directive syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(app\|bind\|bind-html-unsafe\|bind-template\|change\|checked\|class\)/ @@ -22,7 +22,7 @@ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disabled\|form\|hide\|hr syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(key-up\|list\|model\|mousedown\|mouseenter\|mouseleave\|mousemove\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(mouseover\|mouseup\|multiple\|non-bindable\|pluralize\|readonly\)/ syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(repeat\|selected\|show\|src\|style\|submit\|switch\|switch-when\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\|if\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\|if\|blur\)/ " http://docs.angularjs.org/api/ng.directive:ngInclude " http://docs.angularjs.org/api/ng.directive:ngPluralize From d0cfca10e1e47a699d90438845225f7daedafa36 Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 12 Dec 2014 16:16:29 +0800 Subject: [PATCH 42/80] add $ to isk before some check --- autoload/syntax/angularjs.coffee.vim | 2 -- autoload/syntax/angularjs.javascript.vim | 2 -- autoload/syntax/angularjs.ls.vim | 2 -- autoload/syntax/angularjs.typescript.vim | 2 -- autoload/syntax/jquery.coffee.vim | 5 ++++- autoload/syntax/jquery.javascript.vim | 5 ++++- autoload/syntax/jquery.ls.vim | 5 ++++- autoload/syntax/jquery.typescript.vim | 5 ++++- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 0b21fe4..14c598c 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -5,8 +5,6 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -setlocal iskeyword+=$ - syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngulardot syntax match coffeeAngulardot contained /\./ nextgroup=coffeeAngularMethods syntax keyword coffeeAngularMethods contained bind bootstrap copy element equals diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index f293044..ad6d087 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -5,8 +5,6 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -setlocal iskeyword+=$ - syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngulardot syntax match javascriptAngulardot contained /\./ nextgroup=javascriptAngularMethods syntax keyword javascriptAngularMethods contained bind bootstrap copy element equals diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index fbac487..f60b395 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -5,8 +5,6 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -setlocal iskeyword+=$ - syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngulardot syntax match lsAngulardot contained /\./ nextgroup=lsAngularMethods syntax keyword lsAngularMethods contained bind bootstrap copy element equals diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index 0c70624..568fbbc 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -5,8 +5,6 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -setlocal iskeyword+=$ - syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngulardot syntax match typescriptAngulardot contained /\./ nextgroup=typescriptAngularMethods syntax keyword typescriptAngularMethods contained bind bootstrap copy element equals diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index 7b4b60c..e93e975 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -6,7 +6,10 @@ " Version: 1.9.0.2 " URL: http://api.jquery.com/ -setlocal iskeyword+=$ +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'coffee' + setlocal iskeyword+=$ +endif syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeejQuerydot contained /\./ nextgroup=@coffeeQGlobals diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index f166e60..89327a4 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -6,7 +6,10 @@ " Version: 1.9.0.2 " URL: http://api.jquery.com/ -setlocal iskeyword+=$ +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'javascript' + setlocal iskeyword+=$ +endif syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptjQuerydot contained /\./ nextgroup=@javascriptQGlobals diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 844ef51..4387bb0 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -6,7 +6,10 @@ " Version: 1.9.0.2 " URL: http://api.jquery.com/ -setlocal iskeyword+=$ +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'ls' + setlocal iskeyword+=$ +endif syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsjQuerydot contained /\./ nextgroup=@lsQGlobals diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 5856ea1..3b4dcb4 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -6,7 +6,10 @@ " Version: 1.9.0.2 " URL: http://api.jquery.com/ -setlocal iskeyword+=$ +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'typescript' + setlocal iskeyword+=$ +endif syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptjQuerydot contained /\./ nextgroup=@typescriptQGlobals From c1b3ab842713bc8d65936831539bbce5d5ad4560 Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 27 Jan 2015 16:07:28 +0800 Subject: [PATCH 43/80] Underscore 1.7.0 and Lo-Dash 3.0.0 --- autoload/syntax/underscore.coffee.vim | 46 +++++++++++++++++++---- autoload/syntax/underscore.javascript.vim | 46 +++++++++++++++++++---- autoload/syntax/underscore.ls.vim | 46 +++++++++++++++++++---- autoload/syntax/underscore.typescript.vim | 46 +++++++++++++++++++---- 4 files changed, 152 insertions(+), 32 deletions(-) diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index b0fad9f..eedc138 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -1,35 +1,61 @@ " Vim syntax file " Language: underscore.js for coffee " Maintainer: othree -" Last Change: 2014/02/06 -" Version: 1.5.2 +" Last Change: 2015/01/27 +" Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 2.5.0 +" LoDash: 3.0.0 " URL: http://lodash.com/ syntax keyword coffeeunderscore _ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions -syntax cluster coffee_Functions contains=coffee_collections,coffee_arrays,coffee_functions,coffee_objects,coffee_chaining,coffee_lodash +syntax cluster coffee_Functions contains=coffee_collections,coffee_strings,coffee_arrays,coffee_functions,coffee_objects,coffee_chaining,coffee_lodash syntax match coffee_collections contained /contains/ +syntax keyword coffee_collections contained include syntax keyword coffee_collections contained each map reduce reduceRight find filter where findWhere syntax keyword coffee_collections contained reject every some invoke pluck max min sortBy syntax keyword coffee_collections contained groupBy indexBy countBy shuffle toArray size +syntax keyword coffee_collections contained partition iteratee +" lodash 3.0.0 +syntax keyword coffee_collections contained partition sortByAll includes callback +" +" lodash 3.0.0 +syntax keyword coffee_strings contained camelCase capitalize deburr endsWith escapeRegExp +syntax keyword coffee_strings contained kebabCase pad padLeft padRight repeat snakeCase +syntax keyword coffee_strings contained startsWith trim trimLeft trimRight trunc words +" syntax keyword coffee_arrays contained first initial last rest compact flatten without union syntax keyword coffee_arrays contained intersection difference uniq zip object indextOf syntax keyword coffee_arrays contained lastIndexOf sortedIndex range +" lodash 3.0.0 +syntax keyword coffee_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep +syntax keyword coffee_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile +syntax keyword coffee_arrays contained takeWhile +" syntax keyword coffee_functions contained bind bindAll partial memoize delay throttle debounce -syntax keyword coffee_functions contained once after wrap compose +syntax keyword coffee_functions contained once after before wrap negate compose flow flowRight +" lodash 3.0.0 +syntax keyword coffee_functions contained ary before curryRight negate rearg +syntax keyword coffee_functions contained backflow compose partial cancel +" + syntax keyword coffee_objects contained keys values pairs invert functions extend pick omit syntax keyword coffee_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword coffee_objects contained isObject isArguments isFunction isString isNumber syntax keyword coffee_objects contained isFinite isBoolean isDate isRegExp isNaN isNull -syntax keyword coffee_objects contained isUndefined +syntax keyword coffee_objects contained isUndefined property matches +" lodash 3.0.0 +syntax keyword coffee_objects contained keysIn valuesIn +" syntax keyword coffee_utility contained noConflict identify times random mixin uniqueId -syntax keyword coffee_utility contained escape unescape result template -syntax keyword coffee_chaining contained chain value +syntax keyword coffee_utility contained escape unescape result template iteratee noop +" lodash 3.0.0 +syntax keyword coffee_utility contained attempt matches propertyOf constant now +" +syntax keyword coffee_chaining contained chain value thru syntax keyword coffee_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword coffee_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial @@ -37,6 +63,9 @@ syntax keyword coffee_lodash contained partialRight runInContext support unzip w syntax keyword coffee_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword coffee_lodash contained constant mapValues now property xor syntax keyword coffee_lodash contained create noop transform +" lodash 3.0.0 +syntax keyword coffee_lodash contained isError isMatch isNative isTypedArray toPlainObject +" " Define the default highlighting. @@ -53,6 +82,7 @@ if version >= 508 || !exists("did_underscore_coffee_syntax_inits") HiLink coffeeunderscore Constant HiLink coffee_collections PreProc + HiLink coffee_strings PreProc HiLink coffee_arrays PreProc HiLink coffee_functions PreProc HiLink coffee_objects PreProc diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 2e32914..91e440c 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -1,35 +1,61 @@ " Vim syntax file " Language: underscore.js for javascript " Maintainer: othree -" Last Change: 2014/02/06 -" Version: 1.5.2 +" Last Change: 2015/01/27 +" Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 2.5.0 +" LoDash: 3.0.0 " URL: http://lodash.com/ syntax keyword javascriptunderscore _ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions -syntax cluster javascript_Functions contains=javascript_collections,javascript_arrays,javascript_functions,javascript_objects,javascript_chaining,javascript_lodash +syntax cluster javascript_Functions contains=javascript_collections,javascript_strings,javascript_arrays,javascript_functions,javascript_objects,javascript_chaining,javascript_lodash syntax match javascript_collections contained /contains/ +syntax keyword javascript_collections contained include syntax keyword javascript_collections contained each map reduce reduceRight find filter where findWhere syntax keyword javascript_collections contained reject every some invoke pluck max min sortBy syntax keyword javascript_collections contained groupBy indexBy countBy shuffle toArray size +syntax keyword javascript_collections contained partition iteratee +" lodash 3.0.0 +syntax keyword javascript_collections contained partition sortByAll includes callback +" +" lodash 3.0.0 +syntax keyword javascript_strings contained camelCase capitalize deburr endsWith escapeRegExp +syntax keyword javascript_strings contained kebabCase pad padLeft padRight repeat snakeCase +syntax keyword javascript_strings contained startsWith trim trimLeft trimRight trunc words +" syntax keyword javascript_arrays contained first initial last rest compact flatten without union syntax keyword javascript_arrays contained intersection difference uniq zip object indextOf syntax keyword javascript_arrays contained lastIndexOf sortedIndex range +" lodash 3.0.0 +syntax keyword javascript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep +syntax keyword javascript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile +syntax keyword javascript_arrays contained takeWhile +" syntax keyword javascript_functions contained bind bindAll partial memoize delay throttle debounce -syntax keyword javascript_functions contained once after wrap compose +syntax keyword javascript_functions contained once after before wrap negate compose flow flowRight +" lodash 3.0.0 +syntax keyword javascript_functions contained ary before curryRight negate rearg +syntax keyword javascript_functions contained backflow compose partial cancel +" + syntax keyword javascript_objects contained keys values pairs invert functions extend pick omit syntax keyword javascript_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword javascript_objects contained isObject isArguments isFunction isString isNumber syntax keyword javascript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull -syntax keyword javascript_objects contained isUndefined +syntax keyword javascript_objects contained isUndefined property matches +" lodash 3.0.0 +syntax keyword javascript_objects contained keysIn valuesIn +" syntax keyword javascript_utility contained noConflict identify times random mixin uniqueId -syntax keyword javascript_utility contained escape unescape result template -syntax keyword javascript_chaining contained chain value +syntax keyword javascript_utility contained escape unescape result template iteratee noop +" lodash 3.0.0 +syntax keyword javascript_utility contained attempt matches propertyOf constant now +" +syntax keyword javascript_chaining contained chain value thru syntax keyword javascript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword javascript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial @@ -37,6 +63,9 @@ syntax keyword javascript_lodash contained partialRight runInContext support unz syntax keyword javascript_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword javascript_lodash contained constant mapValues now property xor syntax keyword javascript_lodash contained create noop transform +" lodash 3.0.0 +syntax keyword javascript_lodash contained isError isMatch isNative isTypedArray toPlainObject +" " Define the default highlighting. @@ -53,6 +82,7 @@ if version >= 508 || !exists("did_underscore_javascript_syntax_inits") HiLink javascriptunderscore Constant HiLink javascript_collections PreProc + HiLink javascript_strings PreProc HiLink javascript_arrays PreProc HiLink javascript_functions PreProc HiLink javascript_objects PreProc diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index c2d1860..3084b3c 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -1,35 +1,61 @@ " Vim syntax file " Language: underscore.js for ls " Maintainer: othree -" Last Change: 2014/02/06 -" Version: 1.5.2 +" Last Change: 2015/01/27 +" Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 2.5.0 +" LoDash: 3.0.0 " URL: http://lodash.com/ syntax keyword lsunderscore _ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions -syntax cluster ls_Functions contains=ls_collections,ls_arrays,ls_functions,ls_objects,ls_chaining,ls_lodash +syntax cluster ls_Functions contains=ls_collections,ls_strings,ls_arrays,ls_functions,ls_objects,ls_chaining,ls_lodash syntax match ls_collections contained /contains/ +syntax keyword ls_collections contained include syntax keyword ls_collections contained each map reduce reduceRight find filter where findWhere syntax keyword ls_collections contained reject every some invoke pluck max min sortBy syntax keyword ls_collections contained groupBy indexBy countBy shuffle toArray size +syntax keyword ls_collections contained partition iteratee +" lodash 3.0.0 +syntax keyword ls_collections contained partition sortByAll includes callback +" +" lodash 3.0.0 +syntax keyword ls_strings contained camelCase capitalize deburr endsWith escapeRegExp +syntax keyword ls_strings contained kebabCase pad padLeft padRight repeat snakeCase +syntax keyword ls_strings contained startsWith trim trimLeft trimRight trunc words +" syntax keyword ls_arrays contained first initial last rest compact flatten without union syntax keyword ls_arrays contained intersection difference uniq zip object indextOf syntax keyword ls_arrays contained lastIndexOf sortedIndex range +" lodash 3.0.0 +syntax keyword ls_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep +syntax keyword ls_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile +syntax keyword ls_arrays contained takeWhile +" syntax keyword ls_functions contained bind bindAll partial memoize delay throttle debounce -syntax keyword ls_functions contained once after wrap compose +syntax keyword ls_functions contained once after before wrap negate compose flow flowRight +" lodash 3.0.0 +syntax keyword ls_functions contained ary before curryRight negate rearg +syntax keyword ls_functions contained backflow compose partial cancel +" + syntax keyword ls_objects contained keys values pairs invert functions extend pick omit syntax keyword ls_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword ls_objects contained isObject isArguments isFunction isString isNumber syntax keyword ls_objects contained isFinite isBoolean isDate isRegExp isNaN isNull -syntax keyword ls_objects contained isUndefined +syntax keyword ls_objects contained isUndefined property matches +" lodash 3.0.0 +syntax keyword ls_objects contained keysIn valuesIn +" syntax keyword ls_utility contained noConflict identify times random mixin uniqueId -syntax keyword ls_utility contained escape unescape result template -syntax keyword ls_chaining contained chain value +syntax keyword ls_utility contained escape unescape result template iteratee noop +" lodash 3.0.0 +syntax keyword ls_utility contained attempt matches propertyOf constant now +" +syntax keyword ls_chaining contained chain value thru syntax keyword ls_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword ls_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial @@ -37,6 +63,9 @@ syntax keyword ls_lodash contained partialRight runInContext support unzip where syntax keyword ls_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword ls_lodash contained constant mapValues now property xor syntax keyword ls_lodash contained create noop transform +" lodash 3.0.0 +syntax keyword ls_lodash contained isError isMatch isNative isTypedArray toPlainObject +" " Define the default highlighting. @@ -53,6 +82,7 @@ if version >= 508 || !exists("did_underscore_ls_syntax_inits") HiLink lsunderscore Constant HiLink ls_collections PreProc + HiLink ls_strings PreProc HiLink ls_arrays PreProc HiLink ls_functions PreProc HiLink ls_objects PreProc diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 06637c6..7139d65 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -1,35 +1,61 @@ " Vim syntax file " Language: underscore.js for typescript " Maintainer: othree -" Last Change: 2014/02/06 -" Version: 1.5.2 +" Last Change: 2015/01/27 +" Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 2.5.0 +" LoDash: 3.0.0 " URL: http://lodash.com/ syntax keyword typescriptunderscore _ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions -syntax cluster typescript_Functions contains=typescript_collections,typescript_arrays,typescript_functions,typescript_objects,typescript_chaining,typescript_lodash +syntax cluster typescript_Functions contains=typescript_collections,typescript_strings,typescript_arrays,typescript_functions,typescript_objects,typescript_chaining,typescript_lodash syntax match typescript_collections contained /contains/ +syntax keyword typescript_collections contained include syntax keyword typescript_collections contained each map reduce reduceRight find filter where findWhere syntax keyword typescript_collections contained reject every some invoke pluck max min sortBy syntax keyword typescript_collections contained groupBy indexBy countBy shuffle toArray size +syntax keyword typescript_collections contained partition iteratee +" lodash 3.0.0 +syntax keyword typescript_collections contained partition sortByAll includes callback +" +" lodash 3.0.0 +syntax keyword typescript_strings contained camelCase capitalize deburr endsWith escapeRegExp +syntax keyword typescript_strings contained kebabCase pad padLeft padRight repeat snakeCase +syntax keyword typescript_strings contained startsWith trim trimLeft trimRight trunc words +" syntax keyword typescript_arrays contained first initial last rest compact flatten without union syntax keyword typescript_arrays contained intersection difference uniq zip object indextOf syntax keyword typescript_arrays contained lastIndexOf sortedIndex range +" lodash 3.0.0 +syntax keyword typescript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep +syntax keyword typescript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile +syntax keyword typescript_arrays contained takeWhile +" syntax keyword typescript_functions contained bind bindAll partial memoize delay throttle debounce -syntax keyword typescript_functions contained once after wrap compose +syntax keyword typescript_functions contained once after before wrap negate compose flow flowRight +" lodash 3.0.0 +syntax keyword typescript_functions contained ary before curryRight negate rearg +syntax keyword typescript_functions contained backflow compose partial cancel +" + syntax keyword typescript_objects contained keys values pairs invert functions extend pick omit syntax keyword typescript_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword typescript_objects contained isObject isArguments isFunction isString isNumber syntax keyword typescript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull -syntax keyword typescript_objects contained isUndefined +syntax keyword typescript_objects contained isUndefined property matches +" lodash 3.0.0 +syntax keyword typescript_objects contained keysIn valuesIn +" syntax keyword typescript_utility contained noConflict identify times random mixin uniqueId -syntax keyword typescript_utility contained escape unescape result template -syntax keyword typescript_chaining contained chain value +syntax keyword typescript_utility contained escape unescape result template iteratee noop +" lodash 3.0.0 +syntax keyword typescript_utility contained attempt matches propertyOf constant now +" +syntax keyword typescript_chaining contained chain value thru syntax keyword typescript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword typescript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial @@ -37,6 +63,9 @@ syntax keyword typescript_lodash contained partialRight runInContext support unz syntax keyword typescript_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword typescript_lodash contained constant mapValues now property xor syntax keyword typescript_lodash contained create noop transform +" lodash 3.0.0 +syntax keyword typescript_lodash contained isError isMatch isNative isTypedArray toPlainObject +" " Define the default highlighting. @@ -53,6 +82,7 @@ if version >= 508 || !exists("did_underscore_typescript_syntax_inits") HiLink typescriptunderscore Constant HiLink typescript_collections PreProc + HiLink typescript_strings PreProc HiLink typescript_arrays PreProc HiLink typescript_functions PreProc HiLink typescript_objects PreProc From 9c3222824204d638716b8b5789affc905c17824f Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 2 Feb 2015 17:22:27 +0800 Subject: [PATCH 44/80] Add Handlebars --- README.md | 2 ++ autoload/jslibsyntax.vim | 3 +- autoload/syntax/handlebars.coffee.vim | 41 +++++++++++++++++++++++ autoload/syntax/handlebars.javascript.vim | 41 +++++++++++++++++++++++ autoload/syntax/handlebars.ls.vim | 41 +++++++++++++++++++++++ autoload/syntax/handlebars.typescript.vim | 41 +++++++++++++++++++++++ autoload/syntax/update.sh | 2 +- 7 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 autoload/syntax/handlebars.coffee.vim create mode 100644 autoload/syntax/handlebars.javascript.vim create mode 100644 autoload/syntax/handlebars.ls.vim create mode 100644 autoload/syntax/handlebars.typescript.vim diff --git a/README.md b/README.md index ac47684..d8b0f1b 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Libraries * [Sugar.js](http://sugarjs.com/) * [Jasmine](http://pivotal.github.io/jasmine/) * [Chai](http://chaijs.com/) +* [Handlebars](http://handlebarsjs.com/) File Types ---------- @@ -64,6 +65,7 @@ Support libs id: * Sugar.js: sugar * Jasmine: jasmine * Chai: chai +* Handlebars: handlebars Default lib set is: `jquery,underscore,backbone` diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index f4551f9..5a25b07 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -17,7 +17,8 @@ let s:libs = [ \ 'jasmine', \ 'chai', \ 'react', - \ 'flux' + \ 'flux', + \ 'handlebars' \ ] let s:default_libs = [ diff --git a/autoload/syntax/handlebars.coffee.vim b/autoload/syntax/handlebars.coffee.vim new file mode 100644 index 0000000..8c53884 --- /dev/null +++ b/autoload/syntax/handlebars.coffee.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Language: handlebars for coffee +" Maintainer: othree +" Last Change: 2015/02/02 +" Version: 2.0.0 +" URL: http://handlebarsjs.com/ + +syntax keyword coffeeHandlebars Handlebars containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +" syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions +" syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions + +syntax cluster coffeeHFunctions contains=coffeeHmethods,coffeeHutilityMethod + +syntax keyword coffeeHmethods contained compile precompile template unregisterPartial registerPartial +syntax keyword coffeeHmethods contained registerHelper unregisterHelper SafeString escapeExpression +syntax keyword coffeeHmethods contained createFrame create log + +syntax keyword coffeeHutility contained Utils + +syntax keyword coffeeHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_coffee_syntax_inits") + if version < 508 + let did_underscore_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeHandlebars Constant + + HiLink coffeeHmethods PreProc + HiLink coffeeHutility PreProc + HiLink coffeeHutilityMethod PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/handlebars.javascript.vim b/autoload/syntax/handlebars.javascript.vim new file mode 100644 index 0000000..5d377f5 --- /dev/null +++ b/autoload/syntax/handlebars.javascript.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Language: handlebars for javascript +" Maintainer: othree +" Last Change: 2015/02/02 +" Version: 2.0.0 +" URL: http://handlebarsjs.com/ + +syntax keyword javascriptHandlebars Handlebars containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +" syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions +" syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions + +syntax cluster javascriptHFunctions contains=javascriptHmethods,javascriptHutilityMethod + +syntax keyword javascriptHmethods contained compile precompile template unregisterPartial registerPartial +syntax keyword javascriptHmethods contained registerHelper unregisterHelper SafeString escapeExpression +syntax keyword javascriptHmethods contained createFrame create log + +syntax keyword javascriptHutility contained Utils + +syntax keyword javascriptHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_javascript_syntax_inits") + if version < 508 + let did_underscore_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptHandlebars Constant + + HiLink javascriptHmethods PreProc + HiLink javascriptHutility PreProc + HiLink javascriptHutilityMethod PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/handlebars.ls.vim b/autoload/syntax/handlebars.ls.vim new file mode 100644 index 0000000..7984b4f --- /dev/null +++ b/autoload/syntax/handlebars.ls.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Language: handlebars for ls +" Maintainer: othree +" Last Change: 2015/02/02 +" Version: 2.0.0 +" URL: http://handlebarsjs.com/ + +syntax keyword lsHandlebars Handlebars containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +" syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions +" syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions + +syntax cluster lsHFunctions contains=lsHmethods,lsHutilityMethod + +syntax keyword lsHmethods contained compile precompile template unregisterPartial registerPartial +syntax keyword lsHmethods contained registerHelper unregisterHelper SafeString escapeExpression +syntax keyword lsHmethods contained createFrame create log + +syntax keyword lsHutility contained Utils + +syntax keyword lsHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_ls_syntax_inits") + if version < 508 + let did_underscore_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsHandlebars Constant + + HiLink lsHmethods PreProc + HiLink lsHutility PreProc + HiLink lsHutilityMethod PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/handlebars.typescript.vim b/autoload/syntax/handlebars.typescript.vim new file mode 100644 index 0000000..f8639eb --- /dev/null +++ b/autoload/syntax/handlebars.typescript.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Language: handlebars for typescript +" Maintainer: othree +" Last Change: 2015/02/02 +" Version: 2.0.0 +" URL: http://handlebarsjs.com/ + +syntax keyword typescriptHandlebars Handlebars containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +" syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions +" syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions + +syntax cluster typescriptHFunctions contains=typescriptHmethods,typescriptHutilityMethod + +syntax keyword typescriptHmethods contained compile precompile template unregisterPartial registerPartial +syntax keyword typescriptHmethods contained registerHelper unregisterHelper SafeString escapeExpression +syntax keyword typescriptHmethods contained createFrame create log + +syntax keyword typescriptHutility contained Utils + +syntax keyword typescriptHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_typescript_syntax_inits") + if version < 508 + let did_underscore_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptHandlebars Constant + + HiLink typescriptHmethods PreProc + HiLink typescriptHutility PreProc + HiLink typescriptHutilityMethod PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 794927d..7e56e51 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,7 +1,7 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From c49ce49c3cd79bbb9388969568444e9b42498cb1 Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 17 Feb 2015 11:15:37 +0800 Subject: [PATCH 45/80] Mark as 0.4.0 --- README.md | 2 +- config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8b0f1b..dae923c 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ Changes ------- ### Version 0.4 -* Add React, Flux, Chai +* Add React, Flux, Chai, Handlbars * Default lib set * Bug fix diff --git a/config.mk b/config.mk index 4d2333b..2c4980e 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ NAME=javascript-libraries-syntax.vim -VERSION=0.3.5 +VERSION=0.4 bundle-deps: $(call fetch_github,ID,REPOSITORY,BRANCH,PATH,TARGET_PATH) From d416f3b05676dcbaa2f4fd6a4719b1cc241a2654 Mon Sep 17 00:00:00 2001 From: Gilad Peleg Date: Sun, 21 Jun 2015 09:49:11 +0300 Subject: [PATCH 46/80] Update lodash functions --- autoload/syntax/underscore.coffee.vim | 21 ++++++++++----------- autoload/syntax/underscore.javascript.vim | 21 ++++++++++----------- autoload/syntax/underscore.ls.vim | 21 ++++++++++----------- autoload/syntax/underscore.typescript.vim | 21 ++++++++++----------- autoload/syntax/update.sh | 2 -- 5 files changed, 40 insertions(+), 46 deletions(-) diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index eedc138..84d1606 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -33,41 +33,41 @@ syntax keyword coffee_arrays contained lastIndexOf sortedIndex range " lodash 3.0.0 syntax keyword coffee_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword coffee_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile -syntax keyword coffee_arrays contained takeWhile -" +syntax keyword coffee_arrays contained takeWhile + syntax keyword coffee_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword coffee_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword coffee_functions contained ary before curryRight negate rearg syntax keyword coffee_functions contained backflow compose partial cancel -" syntax keyword coffee_objects contained keys values pairs invert functions extend pick omit syntax keyword coffee_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword coffee_objects contained isObject isArguments isFunction isString isNumber -syntax keyword coffee_objects contained isFinite isBoolean isDate isRegExp isNaN isNull +syntax keyword coffee_objects contained isFinite isBoolean isDate isRegExp isNaN isNull syntax keyword coffee_objects contained isUndefined property matches " lodash 3.0.0 -syntax keyword coffee_objects contained keysIn valuesIn +syntax keyword coffee_objects contained keysIn valuesIn assign get set +syntax keyword coffee_objects contained mapKeys " syntax keyword coffee_utility contained noConflict identify times random mixin uniqueId syntax keyword coffee_utility contained escape unescape result template iteratee noop " lodash 3.0.0 -syntax keyword coffee_utility contained attempt matches propertyOf constant now -" +syntax keyword coffee_utility contained attempt matches matchesProperty propertyOf constant now +syntax keyword coffee_utility contained attempt matches matchesProperty propertyOf constant now + syntax keyword coffee_chaining contained chain value thru syntax keyword coffee_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword coffee_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial -syntax keyword coffee_lodash contained partialRight runInContext support unzip where +syntax keyword coffee_lodash contained partialRight runInContext support unzip where syntax keyword coffee_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword coffee_lodash contained constant mapValues now property xor -syntax keyword coffee_lodash contained create noop transform +syntax keyword coffee_lodash contained create noop transform " lodash 3.0.0 syntax keyword coffee_lodash contained isError isMatch isNative isTypedArray toPlainObject " - " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet @@ -90,6 +90,5 @@ if version >= 508 || !exists("did_underscore_coffee_syntax_inits") HiLink coffee_chaining PreProc HiLink coffee_lodash PreProc - delcommand HiLink endif diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 91e440c..51a91b7 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -33,41 +33,41 @@ syntax keyword javascript_arrays contained lastIndexOf sortedIndex range " lodash 3.0.0 syntax keyword javascript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword javascript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile -syntax keyword javascript_arrays contained takeWhile -" +syntax keyword javascript_arrays contained takeWhile + syntax keyword javascript_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword javascript_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword javascript_functions contained ary before curryRight negate rearg syntax keyword javascript_functions contained backflow compose partial cancel -" syntax keyword javascript_objects contained keys values pairs invert functions extend pick omit syntax keyword javascript_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword javascript_objects contained isObject isArguments isFunction isString isNumber -syntax keyword javascript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull +syntax keyword javascript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull syntax keyword javascript_objects contained isUndefined property matches " lodash 3.0.0 -syntax keyword javascript_objects contained keysIn valuesIn +syntax keyword javascript_objects contained keysIn valuesIn assign get set +syntax keyword javascript_objects contained mapKeys " syntax keyword javascript_utility contained noConflict identify times random mixin uniqueId syntax keyword javascript_utility contained escape unescape result template iteratee noop " lodash 3.0.0 -syntax keyword javascript_utility contained attempt matches propertyOf constant now -" +syntax keyword javascript_utility contained attempt matches matchesProperty propertyOf constant now +syntax keyword javascript_utility contained attempt matches matchesProperty propertyOf constant now + syntax keyword javascript_chaining contained chain value thru syntax keyword javascript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword javascript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial -syntax keyword javascript_lodash contained partialRight runInContext support unzip where +syntax keyword javascript_lodash contained partialRight runInContext support unzip where syntax keyword javascript_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword javascript_lodash contained constant mapValues now property xor -syntax keyword javascript_lodash contained create noop transform +syntax keyword javascript_lodash contained create noop transform " lodash 3.0.0 syntax keyword javascript_lodash contained isError isMatch isNative isTypedArray toPlainObject " - " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet @@ -90,6 +90,5 @@ if version >= 508 || !exists("did_underscore_javascript_syntax_inits") HiLink javascript_chaining PreProc HiLink javascript_lodash PreProc - delcommand HiLink endif diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index 3084b3c..21cb711 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -33,41 +33,41 @@ syntax keyword ls_arrays contained lastIndexOf sortedIndex range " lodash 3.0.0 syntax keyword ls_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword ls_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile -syntax keyword ls_arrays contained takeWhile -" +syntax keyword ls_arrays contained takeWhile + syntax keyword ls_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword ls_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword ls_functions contained ary before curryRight negate rearg syntax keyword ls_functions contained backflow compose partial cancel -" syntax keyword ls_objects contained keys values pairs invert functions extend pick omit syntax keyword ls_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword ls_objects contained isObject isArguments isFunction isString isNumber -syntax keyword ls_objects contained isFinite isBoolean isDate isRegExp isNaN isNull +syntax keyword ls_objects contained isFinite isBoolean isDate isRegExp isNaN isNull syntax keyword ls_objects contained isUndefined property matches " lodash 3.0.0 -syntax keyword ls_objects contained keysIn valuesIn +syntax keyword ls_objects contained keysIn valuesIn assign get set +syntax keyword ls_objects contained mapKeys " syntax keyword ls_utility contained noConflict identify times random mixin uniqueId syntax keyword ls_utility contained escape unescape result template iteratee noop " lodash 3.0.0 -syntax keyword ls_utility contained attempt matches propertyOf constant now -" +syntax keyword ls_utility contained attempt matches matchesProperty propertyOf constant now +syntax keyword ls_utility contained attempt matches matchesProperty propertyOf constant now + syntax keyword ls_chaining contained chain value thru syntax keyword ls_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword ls_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial -syntax keyword ls_lodash contained partialRight runInContext support unzip where +syntax keyword ls_lodash contained partialRight runInContext support unzip where syntax keyword ls_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword ls_lodash contained constant mapValues now property xor -syntax keyword ls_lodash contained create noop transform +syntax keyword ls_lodash contained create noop transform " lodash 3.0.0 syntax keyword ls_lodash contained isError isMatch isNative isTypedArray toPlainObject " - " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet @@ -90,6 +90,5 @@ if version >= 508 || !exists("did_underscore_ls_syntax_inits") HiLink ls_chaining PreProc HiLink ls_lodash PreProc - delcommand HiLink endif diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 7139d65..122bfde 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -33,41 +33,41 @@ syntax keyword typescript_arrays contained lastIndexOf sortedIndex range " lodash 3.0.0 syntax keyword typescript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword typescript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile -syntax keyword typescript_arrays contained takeWhile -" +syntax keyword typescript_arrays contained takeWhile + syntax keyword typescript_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword typescript_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword typescript_functions contained ary before curryRight negate rearg syntax keyword typescript_functions contained backflow compose partial cancel -" syntax keyword typescript_objects contained keys values pairs invert functions extend pick omit syntax keyword typescript_objects contained defaults clone tap has isEqual isEmpty isElement isArray syntax keyword typescript_objects contained isObject isArguments isFunction isString isNumber -syntax keyword typescript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull +syntax keyword typescript_objects contained isFinite isBoolean isDate isRegExp isNaN isNull syntax keyword typescript_objects contained isUndefined property matches " lodash 3.0.0 -syntax keyword typescript_objects contained keysIn valuesIn +syntax keyword typescript_objects contained keysIn valuesIn assign get set +syntax keyword typescript_objects contained mapKeys " syntax keyword typescript_utility contained noConflict identify times random mixin uniqueId syntax keyword typescript_utility contained escape unescape result template iteratee noop " lodash 3.0.0 -syntax keyword typescript_utility contained attempt matches propertyOf constant now -" +syntax keyword typescript_utility contained attempt matches matchesProperty propertyOf constant now +syntax keyword typescript_utility contained attempt matches matchesProperty propertyOf constant now + syntax keyword typescript_chaining contained chain value thru syntax keyword typescript_lodash contained at bindKey cloneDeep createCallback findIndex findKey syntax keyword typescript_lodash contained forEach forIn forOwn isPlainObject merge parseInt partial -syntax keyword typescript_lodash contained partialRight runInContext support unzip where +syntax keyword typescript_lodash contained partialRight runInContext support unzip where syntax keyword typescript_lodash contained capitalize match slice trim trimLeft trimRight syntax keyword typescript_lodash contained constant mapValues now property xor -syntax keyword typescript_lodash contained create noop transform +syntax keyword typescript_lodash contained create noop transform " lodash 3.0.0 syntax keyword typescript_lodash contained isError isMatch isNative isTypedArray toPlainObject " - " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet @@ -90,6 +90,5 @@ if version >= 508 || !exists("did_underscore_typescript_syntax_inits") HiLink typescript_chaining PreProc HiLink typescript_lodash PreProc - delcommand HiLink endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 7e56e51..8755e1f 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,4 +1,3 @@ - for filetype in 'coffee' 'ls' 'typescript' do for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' @@ -6,4 +5,3 @@ do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done done - From 89b0947ee03673d67808f1e9ed9415ff77b75c7f Mon Sep 17 00:00:00 2001 From: Dan Hansen Date: Fri, 7 Aug 2015 13:35:10 -0600 Subject: [PATCH 47/80] Add AngularUI Router library support --- README.md | 2 + autoload/jslibsyntax.vim | 1 + autoload/syntax/angularui-router.coffee.vim | 44 +++++++++++++++++++ .../syntax/angularui-router.javascript.vim | 44 +++++++++++++++++++ autoload/syntax/angularui-router.ls.vim | 44 +++++++++++++++++++ .../syntax/angularui-router.typescript.vim | 44 +++++++++++++++++++ autoload/syntax/update.sh | 2 +- 7 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 autoload/syntax/angularui-router.coffee.vim create mode 100644 autoload/syntax/angularui-router.javascript.vim create mode 100644 autoload/syntax/angularui-router.ls.vim create mode 100644 autoload/syntax/angularui-router.typescript.vim diff --git a/README.md b/README.md index dae923c..a504127 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Libraries * [prelude.ls](http://gkz.github.com/prelude-ls/) * [AngularJS](http://angularjs.org/) * [AngularUI](http://angular-ui.github.io) +* [AngularUI Router](http://angular-ui.github.io/ui-router/) * [React](https://facebook.github.io/react/) * [Flux](https://facebook.github.io/flux/) * [RequireJS](http://requirejs.org/) @@ -59,6 +60,7 @@ Support libs id: * prelude.ls: prelude * AngularJS: angularjs * AngularUI: angularui +* AngularUI Router: angularui-router * React: react * Flux: flux * RequireJS: requirejs diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 5a25b07..e4c95be 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -12,6 +12,7 @@ let s:libs = [ \ 'prelude', \ 'angularjs', \ 'angularui', + \ 'angularui-router', \ 'requirejs', \ 'sugar', \ 'jasmine', diff --git a/autoload/syntax/angularui-router.coffee.vim b/autoload/syntax/angularui-router.coffee.vim new file mode 100644 index 0000000..6edfe91 --- /dev/null +++ b/autoload/syntax/angularui-router.coffee.vim @@ -0,0 +1,44 @@ +" Vim syntax file +" Language: AngularUI Router for coffee +" Maintainer: Dan Hansen +" URL: http://angular-ui.github.io/ui-router/ + +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $stateProvider nextgroup=coffeeASstateProviderdot +syntax match coffeeASstateProverdot contained /\./ nextgroup=coffeeASstateProviderMethods +syntax keyword coffeeASstateProviderMethods contained state decorator + +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $urlRouterProvider nextgroup=coffeeASurlRouterProviderdot +syntax match coffeeASstateProverdot contained /\./ nextgroup=coffeeASurlRouterProviderMethods +syntax keyword coffeeASurlRouterProviderMethods contained when otherwise rule + +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $state nextgroup=coffeeASstatedot +syntax match coffeeASstatedot contained /\./ nextgroup=coffeeASstateMethods +syntax keyword coffeeASstateMethods contained current get go href includes is reload transitionTo + +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $urlRouter nextgroup=coffeeASurlRouterdot +syntax match coffeeASurlRouterdot contained /\./ nextgroup=coffeeASurlRouterMethods +syntax keyword coffeeASurlRouterMethods contained href sync + +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $stateParams $uiViewScroll + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_angularui_router_coffee_syntax_inits") + if version < 508 + let did_angularui_router_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeUIRouter Constant + + HiLink coffeeASstateProviderMethods PreProc + HiLink coffeeASurlRouterProviderMethods PreProc + HiLink coffeeASstateMethods PreProc + HiLink coffeeASurlRouterMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/angularui-router.javascript.vim b/autoload/syntax/angularui-router.javascript.vim new file mode 100644 index 0000000..878162f --- /dev/null +++ b/autoload/syntax/angularui-router.javascript.vim @@ -0,0 +1,44 @@ +" Vim syntax file +" Language: AngularUI Router for javascript +" Maintainer: Dan Hansen +" URL: http://angular-ui.github.io/ui-router/ + +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $stateProvider nextgroup=javascriptASstateProviderdot +syntax match javascriptASstateProverdot contained /\./ nextgroup=javascriptASstateProviderMethods +syntax keyword javascriptASstateProviderMethods contained state decorator + +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $urlRouterProvider nextgroup=javascriptASurlRouterProviderdot +syntax match javascriptASstateProverdot contained /\./ nextgroup=javascriptASurlRouterProviderMethods +syntax keyword javascriptASurlRouterProviderMethods contained when otherwise rule + +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $state nextgroup=javascriptASstatedot +syntax match javascriptASstatedot contained /\./ nextgroup=javascriptASstateMethods +syntax keyword javascriptASstateMethods contained current get go href includes is reload transitionTo + +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $urlRouter nextgroup=javascriptASurlRouterdot +syntax match javascriptASurlRouterdot contained /\./ nextgroup=javascriptASurlRouterMethods +syntax keyword javascriptASurlRouterMethods contained href sync + +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $stateParams $uiViewScroll + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_angularui_router_javascript_syntax_inits") + if version < 508 + let did_angularui_router_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptUIRouter Constant + + HiLink javascriptASstateProviderMethods PreProc + HiLink javascriptASurlRouterProviderMethods PreProc + HiLink javascriptASstateMethods PreProc + HiLink javascriptASurlRouterMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/angularui-router.ls.vim b/autoload/syntax/angularui-router.ls.vim new file mode 100644 index 0000000..42fbc39 --- /dev/null +++ b/autoload/syntax/angularui-router.ls.vim @@ -0,0 +1,44 @@ +" Vim syntax file +" Language: AngularUI Router for ls +" Maintainer: Dan Hansen +" URL: http://angular-ui.github.io/ui-router/ + +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $stateProvider nextgroup=lsASstateProviderdot +syntax match lsASstateProverdot contained /\./ nextgroup=lsASstateProviderMethods +syntax keyword lsASstateProviderMethods contained state decorator + +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $urlRouterProvider nextgroup=lsASurlRouterProviderdot +syntax match lsASstateProverdot contained /\./ nextgroup=lsASurlRouterProviderMethods +syntax keyword lsASurlRouterProviderMethods contained when otherwise rule + +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $state nextgroup=lsASstatedot +syntax match lsASstatedot contained /\./ nextgroup=lsASstateMethods +syntax keyword lsASstateMethods contained current get go href includes is reload transitionTo + +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $urlRouter nextgroup=lsASurlRouterdot +syntax match lsASurlRouterdot contained /\./ nextgroup=lsASurlRouterMethods +syntax keyword lsASurlRouterMethods contained href sync + +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $stateParams $uiViewScroll + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_angularui_router_ls_syntax_inits") + if version < 508 + let did_angularui_router_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsUIRouter Constant + + HiLink lsASstateProviderMethods PreProc + HiLink lsASurlRouterProviderMethods PreProc + HiLink lsASstateMethods PreProc + HiLink lsASurlRouterMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/angularui-router.typescript.vim b/autoload/syntax/angularui-router.typescript.vim new file mode 100644 index 0000000..b686954 --- /dev/null +++ b/autoload/syntax/angularui-router.typescript.vim @@ -0,0 +1,44 @@ +" Vim syntax file +" Language: AngularUI Router for typescript +" Maintainer: Dan Hansen +" URL: http://angular-ui.github.io/ui-router/ + +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $stateProvider nextgroup=typescriptASstateProviderdot +syntax match typescriptASstateProverdot contained /\./ nextgroup=typescriptASstateProviderMethods +syntax keyword typescriptASstateProviderMethods contained state decorator + +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $urlRouterProvider nextgroup=typescriptASurlRouterProviderdot +syntax match typescriptASstateProverdot contained /\./ nextgroup=typescriptASurlRouterProviderMethods +syntax keyword typescriptASurlRouterProviderMethods contained when otherwise rule + +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $state nextgroup=typescriptASstatedot +syntax match typescriptASstatedot contained /\./ nextgroup=typescriptASstateMethods +syntax keyword typescriptASstateMethods contained current get go href includes is reload transitionTo + +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $urlRouter nextgroup=typescriptASurlRouterdot +syntax match typescriptASurlRouterdot contained /\./ nextgroup=typescriptASurlRouterMethods +syntax keyword typescriptASurlRouterMethods contained href sync + +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $stateParams $uiViewScroll + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_angularui_router_typescript_syntax_inits") + if version < 508 + let did_angularui_router_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptUIRouter Constant + + HiLink typescriptASstateProviderMethods PreProc + HiLink typescriptASurlRouterProviderMethods PreProc + HiLink typescriptASstateMethods PreProc + HiLink typescriptASurlRouterMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 8755e1f..9ce7814 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularui-router' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From c0b543201d1b531308a77d6d41310929590324fc Mon Sep 17 00:00:00 2001 From: Takashi WADA Date: Wed, 12 Aug 2015 00:11:33 +0900 Subject: [PATCH 48/80] Rename lib AngularUI Router because cannot define variable `b:javascript_lib_use_angularui-router` --- README.md | 2 +- autoload/jslibsyntax.vim | 2 +- .../{angularui-router.coffee.vim => angularuirouter.coffee.vim} | 0 ...rui-router.javascript.vim => angularuirouter.javascript.vim} | 0 .../syntax/{angularui-router.ls.vim => angularuirouter.ls.vim} | 0 ...rui-router.typescript.vim => angularuirouter.typescript.vim} | 0 autoload/syntax/update.sh | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename autoload/syntax/{angularui-router.coffee.vim => angularuirouter.coffee.vim} (100%) rename autoload/syntax/{angularui-router.javascript.vim => angularuirouter.javascript.vim} (100%) rename autoload/syntax/{angularui-router.ls.vim => angularuirouter.ls.vim} (100%) rename autoload/syntax/{angularui-router.typescript.vim => angularuirouter.typescript.vim} (100%) diff --git a/README.md b/README.md index a504127..a86b246 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Support libs id: * prelude.ls: prelude * AngularJS: angularjs * AngularUI: angularui -* AngularUI Router: angularui-router +* AngularUI Router: angularuirouter * React: react * Flux: flux * RequireJS: requirejs diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index e4c95be..95f620a 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -12,7 +12,7 @@ let s:libs = [ \ 'prelude', \ 'angularjs', \ 'angularui', - \ 'angularui-router', + \ 'angularuirouter', \ 'requirejs', \ 'sugar', \ 'jasmine', diff --git a/autoload/syntax/angularui-router.coffee.vim b/autoload/syntax/angularuirouter.coffee.vim similarity index 100% rename from autoload/syntax/angularui-router.coffee.vim rename to autoload/syntax/angularuirouter.coffee.vim diff --git a/autoload/syntax/angularui-router.javascript.vim b/autoload/syntax/angularuirouter.javascript.vim similarity index 100% rename from autoload/syntax/angularui-router.javascript.vim rename to autoload/syntax/angularuirouter.javascript.vim diff --git a/autoload/syntax/angularui-router.ls.vim b/autoload/syntax/angularuirouter.ls.vim similarity index 100% rename from autoload/syntax/angularui-router.ls.vim rename to autoload/syntax/angularuirouter.ls.vim diff --git a/autoload/syntax/angularui-router.typescript.vim b/autoload/syntax/angularuirouter.typescript.vim similarity index 100% rename from autoload/syntax/angularui-router.typescript.vim rename to autoload/syntax/angularuirouter.typescript.vim diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 9ce7814..8a0672e 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularui-router' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From e06fcbe4717f7453a2439b6963ba5844f90ae630 Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Fri, 4 Sep 2015 17:05:02 -0400 Subject: [PATCH 49/80] Update to Angular 1.4.5 directives --- autoload/syntax/angularjs.html.vim | 45 ++++++++++++++---------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/autoload/syntax/angularjs.html.vim b/autoload/syntax/angularjs.html.vim index 662a824..0e1a4eb 100644 --- a/autoload/syntax/angularjs.html.vim +++ b/autoload/syntax/angularjs.html.vim @@ -1,35 +1,32 @@ " Vim syntax file " Language: AngularJS for javascript -" Maintainer: othree -" Last Change: 2013/04/21 -" Version: 1.1.13.1 +" Maintainer: othree , Rafael Benevides +" Last Change: 2015/10/04 +" Version: 1.4.5 - Taken from: https://code.angularjs.org/1.4.5/docs/api/ng/directive " URL: http://angularjs.org/ setlocal iskeyword+=- -syntax keyword htmlArg contained ng-app ng-bind ng-bind-html-unsafe ng-bind-template ng-change ng-checked ng-class -syntax keyword htmlArg contained ng-class-even ng-class-odd ng-click ng-cloak ng-controller ng-csp ng-dblclick -syntax keyword htmlArg contained ng-disabled ng-form ng-hide ng-href ng-include ng-init ng-keydown ng-keypress -syntax keyword htmlArg contained ng-key-up ng-list ng-model ng-mousedown ng-mouseenter ng-mouseleave ng-mousemove -syntax keyword htmlArg contained ng-mouseover ng-mouseup ng-multiple ng-non-bindable ng-pluralize ng-readonly -syntax keyword htmlArg contained ng-repeat ng-selected ng-show ng-src ng-style ng-submit ng-switch ng-switch-when -syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view ng-if ng-blur +syntax keyword htmlArg contained ng-app ng-bind ng-bind-html ng-bind-template ng-blur ng-change ng-checked ng-class +syntax keyword htmlArg contained ng-class-even ng-class-odd ng-click ng-cloak ng-controller ng-copy ng-csp ng-dblclick +syntax keyword htmlArg contained ng-disabled ng-form ng-hide ng-href ng-if ng-include ng-init ng-jq ng-keydown ng-keypress +syntax keyword htmlArg contained ng-keyup ng-list ng-model ng-model-options ng-mousedown ng-mouseenter ng-mouseleave ng-mousemove +syntax keyword htmlArg contained ng-mouseover ng-mouseup ng-non-bindable ng-open ng-options ng-paste ng-pluralize ng-readonly +syntax keyword htmlArg contained ng-repeat ng-selected ng-show ng-src ng-srcset ng-style ng-submit ng-switch ng-switch-when +syntax keyword htmlArg contained ng-switch-default ng-transclude ng-view +"Input directives +syntax keyword htmlArg contained ng-required ng-minlength ng-maxlength ng-pattern ng-trim ng-true-values ng-false-values ng-min ng-max " http://docs.angularjs.org/guide/directive -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(app\|bind\|bind-html-unsafe\|bind-template\|change\|checked\|class\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(class-even\|class-odd\|click\|cloak\|controller\|csp\|dblclick\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disabled\|form\|hide\|href\|include\|init\|keydown\|keypress\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(key-up\|list\|model\|mousedown\|mouseenter\|mouseleave\|mousemove\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(mouseover\|mouseup\|multiple\|non-bindable\|pluralize\|readonly\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(repeat\|selected\|show\|src\|style\|submit\|switch\|switch-when\)/ -syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\|if\|blur\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(app\|bind\|bind-html\|blur\|bind-template\|change\|checked\|class\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(class-even\|class-odd\|click\|cloak\|controller\|copy\|csp\|dblclick\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(disabled\|form\|hide\|href\|if\|include\|init\|jq\|keydown\|keypress\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(keyup\|list\|model\|model-options\|mousedown\|mouseenter\|mouseleave\|mousemove\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(mouseover\|mouseup\|non-bindable\|open\|options\|paste\|pluralize\|readonly\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(repeat\|selected\|show\|src\|srset\|style\|submit\|switch\|switch-when\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(switch-default\|transclude\|view\)/ +syntax match htmlArg contained /\(ng_\|ng:\|x-ng-\)\(required\|minlength\|maxlength\|pattern\|trim\|true-values\|false-values\|min\|max\)/ -" http://docs.angularjs.org/api/ng.directive:ngInclude -" http://docs.angularjs.org/api/ng.directive:ngPluralize -" http://docs.angularjs.org/api/ng.directive:ngSwitch syntax keyword htmlArg contained expression autoscroll count when offset on - -syntax keyword htmlTagName contained ng-change ng-form ng-view -syntax keyword htmlTagName contained ng-include ng-pluralize ng-switch - +syntax keyword htmlTagName contained ng-form ng-include ng-pluralize ng-transclude ng-view From 9a565e172fa1259061996a98cb173cb9d9692fc5 Mon Sep 17 00:00:00 2001 From: Chris DeLuca Date: Thu, 24 Sep 2015 10:50:08 -0400 Subject: [PATCH 50/80] Add syntax highlighting to readme code snippets --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a86b246..f9a4385 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,9 @@ Config You can use g:used_javascript_libs to setup used libraries, ex: - let g:used_javascript_libs = 'underscore,backbone' +```viml +let g:used_javascript_libs = 'underscore,backbone' +``` Support libs id: @@ -73,11 +75,13 @@ Default lib set is: `jquery,underscore,backbone` You can use [local vimrc][] to setup libraries used in project. Sample code for local vimrc: - autocmd BufReadPre *.js let b:javascript_lib_use_jquery = 1 - autocmd BufReadPre *.js let b:javascript_lib_use_underscore = 1 - autocmd BufReadPre *.js let b:javascript_lib_use_backbone = 1 - autocmd BufReadPre *.js let b:javascript_lib_use_prelude = 0 - autocmd BufReadPre *.js let b:javascript_lib_use_angularjs = 0 +```viml +autocmd BufReadPre *.js let b:javascript_lib_use_jquery = 1 +autocmd BufReadPre *.js let b:javascript_lib_use_underscore = 1 +autocmd BufReadPre *.js let b:javascript_lib_use_backbone = 1 +autocmd BufReadPre *.js let b:javascript_lib_use_prelude = 0 +autocmd BufReadPre *.js let b:javascript_lib_use_angularjs = 0 +``` [local vimrc]:https://github.com/MarcWeber/vim-addon-local-vimrc From 0f99e49fca2b309b92eaa842b1c0f7277c7e19de Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 7 Jan 2016 12:08:33 +0800 Subject: [PATCH 51/80] Update backbone to 1.2.3 --- autoload/syntax/backbone.coffee.vim | 24 ++++++++++++++---------- autoload/syntax/backbone.javascript.vim | 24 ++++++++++++++---------- autoload/syntax/backbone.ls.vim | 24 ++++++++++++++---------- autoload/syntax/backbone.typescript.vim | 24 ++++++++++++++---------- 4 files changed, 56 insertions(+), 40 deletions(-) diff --git a/autoload/syntax/backbone.coffee.vim b/autoload/syntax/backbone.coffee.vim index 6c5a1ea..af0b119 100644 --- a/autoload/syntax/backbone.coffee.vim +++ b/autoload/syntax/backbone.coffee.vim @@ -1,33 +1,36 @@ " Vim syntax file " Language: Backbone.js for coffee " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 0.9.10 +" Last Change: 2016/01/07 +" Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword coffeeBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeBackbone Backbone containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeBDot +syntax match coffeeBDot contained /\./ nextgroup=coffeeBObjects +syntax keyword coffeeBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON syntax cluster coffeeBFunctions contains=coffeeBEvents,coffeeBModel,coffeeBCollection,coffeeBRouter,coffeeBHistory,coffeeBSync,coffeeBView,coffeeBUtility syntax cluster coffeeBAttrs contains=coffeeBModelAttrs,coffeeBCollectionAttrs,coffeeBRouterAttrs,coffeeBSyncAttrs,coffeeBViewAttrs -syntax keyword coffeeBEvents contained on off trigger once listenTo stopListening +syntax keyword coffeeBEvents contained on off trigger once listenTo stopListening listenToOnce syntax keyword coffeeBModel contained extend constructor initialize get set escape has unset clear syntax keyword coffeeBModel contained toJSON sync fetch save destroy validate validationError url parse syntax keyword coffeeBModel contained clone isNew hasChanged changedAttributes previous previousAttributes -syntax keyword coffeeBCollection contained extend constructor initialize toJSON sync add remove reset update get at -syntax keyword coffeeBCollection contained push pop unshift shift length comparator sort pluck where url parse clone fetch create -syntax keyword coffeeBRouter contained extend constructor initialize route navigate +syntax keyword coffeeBCollection contained extend constructor initialize toJSON sync add remove reset set get at +syntax keyword coffeeBCollection contained push pop unshift shift slice length comparator sort pluck where +syntax keyword coffeeBCollection contained findWhere url parse clone fetch create +syntax keyword coffeeBRouter contained extend constructor initialize route navigate execute syntax keyword coffeeBHistory contained start syntax keyword coffeeBSync contained ajax syntax keyword coffeeBView contained extend constructor initialize setElement render remove delegateEvents undelegateEvents syntax keyword coffeeBUtility contained noConflict syntax keyword coffeeBModelAttrs contained id idAttribute cid attributes changed defaults urlRoot -syntax keyword coffeeBCollectionAttrs contained model models length comparator url +syntax keyword coffeeBCollectionAttrs contained model modelId models length comparator url syntax keyword coffeeBRouterAttrs contained routes -syntax keyword coffeeBSyncAttrs contained emulateHTTP emulateJSON -syntax keyword coffeeBViewAttrs contained el attributes +syntax keyword coffeeBViewAttrs contained el attributes events syntax keyword coffeeBViewAttrs match /$el/ +syntax keyword coffeeBViewAttrs match /$/ " Define the default highlighting. @@ -42,6 +45,7 @@ if version >= 508 || !exists("did_backbone_coffee_syntax_inits") endif HiLink coffeeBackbone Constant + HiLink coffeeBObjects Constant HiLink coffeeBEvents PreProc HiLink coffeeBModel PreProc diff --git a/autoload/syntax/backbone.javascript.vim b/autoload/syntax/backbone.javascript.vim index d0ae448..70a5d16 100644 --- a/autoload/syntax/backbone.javascript.vim +++ b/autoload/syntax/backbone.javascript.vim @@ -1,33 +1,36 @@ " Vim syntax file " Language: Backbone.js for javascript " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 0.9.10 +" Last Change: 2016/01/07 +" Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword javascriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptBackbone Backbone containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptBDot +syntax match javascriptBDot contained /\./ nextgroup=javascriptBObjects +syntax keyword javascriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON syntax cluster javascriptBFunctions contains=javascriptBEvents,javascriptBModel,javascriptBCollection,javascriptBRouter,javascriptBHistory,javascriptBSync,javascriptBView,javascriptBUtility syntax cluster javascriptBAttrs contains=javascriptBModelAttrs,javascriptBCollectionAttrs,javascriptBRouterAttrs,javascriptBSyncAttrs,javascriptBViewAttrs -syntax keyword javascriptBEvents contained on off trigger once listenTo stopListening +syntax keyword javascriptBEvents contained on off trigger once listenTo stopListening listenToOnce syntax keyword javascriptBModel contained extend constructor initialize get set escape has unset clear syntax keyword javascriptBModel contained toJSON sync fetch save destroy validate validationError url parse syntax keyword javascriptBModel contained clone isNew hasChanged changedAttributes previous previousAttributes -syntax keyword javascriptBCollection contained extend constructor initialize toJSON sync add remove reset update get at -syntax keyword javascriptBCollection contained push pop unshift shift length comparator sort pluck where url parse clone fetch create -syntax keyword javascriptBRouter contained extend constructor initialize route navigate +syntax keyword javascriptBCollection contained extend constructor initialize toJSON sync add remove reset set get at +syntax keyword javascriptBCollection contained push pop unshift shift slice length comparator sort pluck where +syntax keyword javascriptBCollection contained findWhere url parse clone fetch create +syntax keyword javascriptBRouter contained extend constructor initialize route navigate execute syntax keyword javascriptBHistory contained start syntax keyword javascriptBSync contained ajax syntax keyword javascriptBView contained extend constructor initialize setElement render remove delegateEvents undelegateEvents syntax keyword javascriptBUtility contained noConflict syntax keyword javascriptBModelAttrs contained id idAttribute cid attributes changed defaults urlRoot -syntax keyword javascriptBCollectionAttrs contained model models length comparator url +syntax keyword javascriptBCollectionAttrs contained model modelId models length comparator url syntax keyword javascriptBRouterAttrs contained routes -syntax keyword javascriptBSyncAttrs contained emulateHTTP emulateJSON -syntax keyword javascriptBViewAttrs contained el attributes +syntax keyword javascriptBViewAttrs contained el attributes events syntax keyword javascriptBViewAttrs match /$el/ +syntax keyword javascriptBViewAttrs match /$/ " Define the default highlighting. @@ -42,6 +45,7 @@ if version >= 508 || !exists("did_backbone_javascript_syntax_inits") endif HiLink javascriptBackbone Constant + HiLink javascriptBObjects Constant HiLink javascriptBEvents PreProc HiLink javascriptBModel PreProc diff --git a/autoload/syntax/backbone.ls.vim b/autoload/syntax/backbone.ls.vim index 781d544..63aef70 100644 --- a/autoload/syntax/backbone.ls.vim +++ b/autoload/syntax/backbone.ls.vim @@ -1,33 +1,36 @@ " Vim syntax file " Language: Backbone.js for ls " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 0.9.10 +" Last Change: 2016/01/07 +" Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword lsBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsBackbone Backbone containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsBDot +syntax match lsBDot contained /\./ nextgroup=lsBObjects +syntax keyword lsBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON syntax cluster lsBFunctions contains=lsBEvents,lsBModel,lsBCollection,lsBRouter,lsBHistory,lsBSync,lsBView,lsBUtility syntax cluster lsBAttrs contains=lsBModelAttrs,lsBCollectionAttrs,lsBRouterAttrs,lsBSyncAttrs,lsBViewAttrs -syntax keyword lsBEvents contained on off trigger once listenTo stopListening +syntax keyword lsBEvents contained on off trigger once listenTo stopListening listenToOnce syntax keyword lsBModel contained extend constructor initialize get set escape has unset clear syntax keyword lsBModel contained toJSON sync fetch save destroy validate validationError url parse syntax keyword lsBModel contained clone isNew hasChanged changedAttributes previous previousAttributes -syntax keyword lsBCollection contained extend constructor initialize toJSON sync add remove reset update get at -syntax keyword lsBCollection contained push pop unshift shift length comparator sort pluck where url parse clone fetch create -syntax keyword lsBRouter contained extend constructor initialize route navigate +syntax keyword lsBCollection contained extend constructor initialize toJSON sync add remove reset set get at +syntax keyword lsBCollection contained push pop unshift shift slice length comparator sort pluck where +syntax keyword lsBCollection contained findWhere url parse clone fetch create +syntax keyword lsBRouter contained extend constructor initialize route navigate execute syntax keyword lsBHistory contained start syntax keyword lsBSync contained ajax syntax keyword lsBView contained extend constructor initialize setElement render remove delegateEvents undelegateEvents syntax keyword lsBUtility contained noConflict syntax keyword lsBModelAttrs contained id idAttribute cid attributes changed defaults urlRoot -syntax keyword lsBCollectionAttrs contained model models length comparator url +syntax keyword lsBCollectionAttrs contained model modelId models length comparator url syntax keyword lsBRouterAttrs contained routes -syntax keyword lsBSyncAttrs contained emulateHTTP emulateJSON -syntax keyword lsBViewAttrs contained el attributes +syntax keyword lsBViewAttrs contained el attributes events syntax keyword lsBViewAttrs match /$el/ +syntax keyword lsBViewAttrs match /$/ " Define the default highlighting. @@ -42,6 +45,7 @@ if version >= 508 || !exists("did_backbone_ls_syntax_inits") endif HiLink lsBackbone Constant + HiLink lsBObjects Constant HiLink lsBEvents PreProc HiLink lsBModel PreProc diff --git a/autoload/syntax/backbone.typescript.vim b/autoload/syntax/backbone.typescript.vim index 4dbf6f1..30012dd 100644 --- a/autoload/syntax/backbone.typescript.vim +++ b/autoload/syntax/backbone.typescript.vim @@ -1,33 +1,36 @@ " Vim syntax file " Language: Backbone.js for typescript " Maintainer: othree -" Last Change: 2013/07/26 -" Version: 0.9.10 +" Last Change: 2016/01/07 +" Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword typescriptBackbone Backbone Collection Model View Events Router History Sync Utility containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptBackbone Backbone containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptBDot +syntax match typescriptBDot contained /\./ nextgroup=typescriptBObjects +syntax keyword typescriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON syntax cluster typescriptBFunctions contains=typescriptBEvents,typescriptBModel,typescriptBCollection,typescriptBRouter,typescriptBHistory,typescriptBSync,typescriptBView,typescriptBUtility syntax cluster typescriptBAttrs contains=typescriptBModelAttrs,typescriptBCollectionAttrs,typescriptBRouterAttrs,typescriptBSyncAttrs,typescriptBViewAttrs -syntax keyword typescriptBEvents contained on off trigger once listenTo stopListening +syntax keyword typescriptBEvents contained on off trigger once listenTo stopListening listenToOnce syntax keyword typescriptBModel contained extend constructor initialize get set escape has unset clear syntax keyword typescriptBModel contained toJSON sync fetch save destroy validate validationError url parse syntax keyword typescriptBModel contained clone isNew hasChanged changedAttributes previous previousAttributes -syntax keyword typescriptBCollection contained extend constructor initialize toJSON sync add remove reset update get at -syntax keyword typescriptBCollection contained push pop unshift shift length comparator sort pluck where url parse clone fetch create -syntax keyword typescriptBRouter contained extend constructor initialize route navigate +syntax keyword typescriptBCollection contained extend constructor initialize toJSON sync add remove reset set get at +syntax keyword typescriptBCollection contained push pop unshift shift slice length comparator sort pluck where +syntax keyword typescriptBCollection contained findWhere url parse clone fetch create +syntax keyword typescriptBRouter contained extend constructor initialize route navigate execute syntax keyword typescriptBHistory contained start syntax keyword typescriptBSync contained ajax syntax keyword typescriptBView contained extend constructor initialize setElement render remove delegateEvents undelegateEvents syntax keyword typescriptBUtility contained noConflict syntax keyword typescriptBModelAttrs contained id idAttribute cid attributes changed defaults urlRoot -syntax keyword typescriptBCollectionAttrs contained model models length comparator url +syntax keyword typescriptBCollectionAttrs contained model modelId models length comparator url syntax keyword typescriptBRouterAttrs contained routes -syntax keyword typescriptBSyncAttrs contained emulateHTTP emulateJSON -syntax keyword typescriptBViewAttrs contained el attributes +syntax keyword typescriptBViewAttrs contained el attributes events syntax keyword typescriptBViewAttrs match /$el/ +syntax keyword typescriptBViewAttrs match /$/ " Define the default highlighting. @@ -42,6 +45,7 @@ if version >= 508 || !exists("did_backbone_typescript_syntax_inits") endif HiLink typescriptBackbone Constant + HiLink typescriptBObjects Constant HiLink typescriptBEvents PreProc HiLink typescriptBModel PreProc From a05b429029459fc1ed036eb5d0eab9eed009549f Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 18 Jan 2016 15:51:49 +0800 Subject: [PATCH 52/80] Lo-Dash 4.0 --- autoload/syntax/underscore.coffee.vim | 48 +++++++++++++++++++---- autoload/syntax/underscore.javascript.vim | 48 +++++++++++++++++++---- autoload/syntax/underscore.ls.vim | 48 +++++++++++++++++++---- autoload/syntax/underscore.typescript.vim | 48 +++++++++++++++++++---- 4 files changed, 164 insertions(+), 28 deletions(-) diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index 84d1606..376faa6 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: underscore.js for coffee " Maintainer: othree -" Last Change: 2015/01/27 +" Last Change: 2016/01/18 " Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 3.0.0 +" LoDash: 4.0.0 " URL: http://lodash.com/ syntax keyword coffeeunderscore _ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions -syntax cluster coffee_Functions contains=coffee_collections,coffee_strings,coffee_arrays,coffee_functions,coffee_objects,coffee_chaining,coffee_lodash +syntax cluster coffee_Functions contains=coffee_collections,coffee_strings,coffee_arrays,coffee_functions,coffee_objects,coffee_chaining,coffee_utility,coffee_lodash,coffee_math,coffee_number syntax match coffee_collections contained /contains/ syntax keyword coffee_collections contained include @@ -21,12 +21,19 @@ syntax keyword coffee_collections contained groupBy indexBy countBy shuffle toAr syntax keyword coffee_collections contained partition iteratee " lodash 3.0.0 syntax keyword coffee_collections contained partition sortByAll includes callback -" +" lodash 4.0.0 +syntax keyword coffee_collections contained flatMap commit next plant reverse toJSON valueOf +syntax keyword coffee_collections contained forEachRight invokeMap keyBy orderBy sample sampleSize + " lodash 3.0.0 syntax keyword coffee_strings contained camelCase capitalize deburr endsWith escapeRegExp syntax keyword coffee_strings contained kebabCase pad padLeft padRight repeat snakeCase syntax keyword coffee_strings contained startsWith trim trimLeft trimRight trunc words -" +" lodash 4.0.0 +syntax keyword coffee_strings contained lowerCase lowerFirst padEnd padStart replace startCase +syntax keyword coffee_strings contained startWith toLower toUpper trimEnd trimStart truncate upperCase +syntax keyword coffee_strings contained upperFirst + syntax keyword coffee_arrays contained first initial last rest compact flatten without union syntax keyword coffee_arrays contained intersection difference uniq zip object indextOf syntax keyword coffee_arrays contained lastIndexOf sortedIndex range @@ -34,12 +41,21 @@ syntax keyword coffee_arrays contained lastIndexOf sortedIndex range syntax keyword coffee_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword coffee_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile syntax keyword coffee_arrays contained takeWhile +" lodash 4.0.0 +syntax keyword coffee_arrays contained concat differenceBy differenceWith drop fill findLastIndex +syntax keyword coffee_arrays contained fromPairs head indexOf intersection intersectionBy intersectionWith +syntax keyword coffee_arrays contained join pull pullAll pullAllBy remove slice sortedIndexBy sortedIndexOf +syntax keyword coffee_arrays contained sortedLastIndexBy sortedLastIndexOf sortedUniq sortedUniqBy tail +syntax keyword coffee_arrays contained take takeRightWhile unionBy unionWith uniqBy uniqWith unzipWith +syntax keyword coffee_arrays contained xorBy xorWith zipObject zipWith syntax keyword coffee_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword coffee_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword coffee_functions contained ary before curryRight negate rearg syntax keyword coffee_functions contained backflow compose partial cancel +" lodash 4.0.0 +syntax keyword coffee_functions contained curry defer eachRight findLast flip negate overArgs rest spread unary syntax keyword coffee_objects contained keys values pairs invert functions extend pick omit syntax keyword coffee_objects contained defaults clone tap has isEqual isEmpty isElement isArray @@ -49,12 +65,19 @@ syntax keyword coffee_objects contained isUndefined property matches " lodash 3.0.0 syntax keyword coffee_objects contained keysIn valuesIn assign get set syntax keyword coffee_objects contained mapKeys +" lodash 4.0.0 +syntax keyword coffee_objects contained assignIn assignInWith assignWith defaultsDeep extendWith +syntax keyword coffee_objects contained findKey findLastKey forIn forInRight forOwn forOwnRight +syntax keyword coffee_objects contained functionsIn hasIn mergeWith omitBy pickBy setWith toPairs +syntax keyword coffee_objects contained toPairsIn transform unset " syntax keyword coffee_utility contained noConflict identify times random mixin uniqueId syntax keyword coffee_utility contained escape unescape result template iteratee noop " lodash 3.0.0 syntax keyword coffee_utility contained attempt matches matchesProperty propertyOf constant now -syntax keyword coffee_utility contained attempt matches matchesProperty propertyOf constant now +" lodash 4.0.0 +syntax keyword coffee_utility contained cond conforms flow identity matches method methodOf nthArg +syntax keyword coffee_utility contained over overEvery overSome rangeRight times toPath uniqueId syntax keyword coffee_chaining contained chain value thru @@ -66,7 +89,16 @@ syntax keyword coffee_lodash contained constant mapValues now property xor syntax keyword coffee_lodash contained create noop transform " lodash 3.0.0 syntax keyword coffee_lodash contained isError isMatch isNative isTypedArray toPlainObject -" +" lodash 4.0.0 +syntax keyword coffee_lodash contained clone cloneDeepWith cloneWith eq gt gte isArrayLike isArrayLikeObject +syntax keyword coffee_lodash contained isEqualWith isInteger isLength isMatchWith isNil isObjectLike isSafeInteger +syntax keyword coffee_lodash contained isSymbol lt lte toInteger toLength toNumber toSafeInteger toString +syntax keyword coffee_lodash contained templateSettings evaluate imports interpolate varible +syntax keyword coffee_lodash contained VERSION + +" lodash 4.0.0 +syntax keyword coffee_math contained add ceil floor max maxBy mean min minBy round subtract sum sumBy +syntax keyword coffee_number contained clamp inRange " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -89,6 +121,8 @@ if version >= 508 || !exists("did_underscore_coffee_syntax_inits") HiLink coffee_utility PreProc HiLink coffee_chaining PreProc HiLink coffee_lodash PreProc + HiLink coffee_math PreProc + HiLink coffee_number PreProc delcommand HiLink endif diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 51a91b7..2b50b3d 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: underscore.js for javascript " Maintainer: othree -" Last Change: 2015/01/27 +" Last Change: 2016/01/18 " Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 3.0.0 +" LoDash: 4.0.0 " URL: http://lodash.com/ syntax keyword javascriptunderscore _ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions -syntax cluster javascript_Functions contains=javascript_collections,javascript_strings,javascript_arrays,javascript_functions,javascript_objects,javascript_chaining,javascript_lodash +syntax cluster javascript_Functions contains=javascript_collections,javascript_strings,javascript_arrays,javascript_functions,javascript_objects,javascript_chaining,javascript_utility,javascript_lodash,javascript_math,javascript_number syntax match javascript_collections contained /contains/ syntax keyword javascript_collections contained include @@ -21,12 +21,19 @@ syntax keyword javascript_collections contained groupBy indexBy countBy shuffle syntax keyword javascript_collections contained partition iteratee " lodash 3.0.0 syntax keyword javascript_collections contained partition sortByAll includes callback -" +" lodash 4.0.0 +syntax keyword javascript_collections contained flatMap commit next plant reverse toJSON valueOf +syntax keyword javascript_collections contained forEachRight invokeMap keyBy orderBy sample sampleSize + " lodash 3.0.0 syntax keyword javascript_strings contained camelCase capitalize deburr endsWith escapeRegExp syntax keyword javascript_strings contained kebabCase pad padLeft padRight repeat snakeCase syntax keyword javascript_strings contained startsWith trim trimLeft trimRight trunc words -" +" lodash 4.0.0 +syntax keyword javascript_strings contained lowerCase lowerFirst padEnd padStart replace startCase +syntax keyword javascript_strings contained startWith toLower toUpper trimEnd trimStart truncate upperCase +syntax keyword javascript_strings contained upperFirst + syntax keyword javascript_arrays contained first initial last rest compact flatten without union syntax keyword javascript_arrays contained intersection difference uniq zip object indextOf syntax keyword javascript_arrays contained lastIndexOf sortedIndex range @@ -34,12 +41,21 @@ syntax keyword javascript_arrays contained lastIndexOf sortedIndex range syntax keyword javascript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword javascript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile syntax keyword javascript_arrays contained takeWhile +" lodash 4.0.0 +syntax keyword javascript_arrays contained concat differenceBy differenceWith drop fill findLastIndex +syntax keyword javascript_arrays contained fromPairs head indexOf intersection intersectionBy intersectionWith +syntax keyword javascript_arrays contained join pull pullAll pullAllBy remove slice sortedIndexBy sortedIndexOf +syntax keyword javascript_arrays contained sortedLastIndexBy sortedLastIndexOf sortedUniq sortedUniqBy tail +syntax keyword javascript_arrays contained take takeRightWhile unionBy unionWith uniqBy uniqWith unzipWith +syntax keyword javascript_arrays contained xorBy xorWith zipObject zipWith syntax keyword javascript_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword javascript_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword javascript_functions contained ary before curryRight negate rearg syntax keyword javascript_functions contained backflow compose partial cancel +" lodash 4.0.0 +syntax keyword javascript_functions contained curry defer eachRight findLast flip negate overArgs rest spread unary syntax keyword javascript_objects contained keys values pairs invert functions extend pick omit syntax keyword javascript_objects contained defaults clone tap has isEqual isEmpty isElement isArray @@ -49,12 +65,19 @@ syntax keyword javascript_objects contained isUndefined property matches " lodash 3.0.0 syntax keyword javascript_objects contained keysIn valuesIn assign get set syntax keyword javascript_objects contained mapKeys +" lodash 4.0.0 +syntax keyword javascript_objects contained assignIn assignInWith assignWith defaultsDeep extendWith +syntax keyword javascript_objects contained findKey findLastKey forIn forInRight forOwn forOwnRight +syntax keyword javascript_objects contained functionsIn hasIn mergeWith omitBy pickBy setWith toPairs +syntax keyword javascript_objects contained toPairsIn transform unset " syntax keyword javascript_utility contained noConflict identify times random mixin uniqueId syntax keyword javascript_utility contained escape unescape result template iteratee noop " lodash 3.0.0 syntax keyword javascript_utility contained attempt matches matchesProperty propertyOf constant now -syntax keyword javascript_utility contained attempt matches matchesProperty propertyOf constant now +" lodash 4.0.0 +syntax keyword javascript_utility contained cond conforms flow identity matches method methodOf nthArg +syntax keyword javascript_utility contained over overEvery overSome rangeRight times toPath uniqueId syntax keyword javascript_chaining contained chain value thru @@ -66,7 +89,16 @@ syntax keyword javascript_lodash contained constant mapValues now property xor syntax keyword javascript_lodash contained create noop transform " lodash 3.0.0 syntax keyword javascript_lodash contained isError isMatch isNative isTypedArray toPlainObject -" +" lodash 4.0.0 +syntax keyword javascript_lodash contained clone cloneDeepWith cloneWith eq gt gte isArrayLike isArrayLikeObject +syntax keyword javascript_lodash contained isEqualWith isInteger isLength isMatchWith isNil isObjectLike isSafeInteger +syntax keyword javascript_lodash contained isSymbol lt lte toInteger toLength toNumber toSafeInteger toString +syntax keyword javascript_lodash contained templateSettings evaluate imports interpolate varible +syntax keyword javascript_lodash contained VERSION + +" lodash 4.0.0 +syntax keyword javascript_math contained add ceil floor max maxBy mean min minBy round subtract sum sumBy +syntax keyword javascript_number contained clamp inRange " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -89,6 +121,8 @@ if version >= 508 || !exists("did_underscore_javascript_syntax_inits") HiLink javascript_utility PreProc HiLink javascript_chaining PreProc HiLink javascript_lodash PreProc + HiLink javascript_math PreProc + HiLink javascript_number PreProc delcommand HiLink endif diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index 21cb711..e8dd6b7 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: underscore.js for ls " Maintainer: othree -" Last Change: 2015/01/27 +" Last Change: 2016/01/18 " Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 3.0.0 +" LoDash: 4.0.0 " URL: http://lodash.com/ syntax keyword lsunderscore _ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions -syntax cluster ls_Functions contains=ls_collections,ls_strings,ls_arrays,ls_functions,ls_objects,ls_chaining,ls_lodash +syntax cluster ls_Functions contains=ls_collections,ls_strings,ls_arrays,ls_functions,ls_objects,ls_chaining,ls_utility,ls_lodash,ls_math,ls_number syntax match ls_collections contained /contains/ syntax keyword ls_collections contained include @@ -21,12 +21,19 @@ syntax keyword ls_collections contained groupBy indexBy countBy shuffle toArray syntax keyword ls_collections contained partition iteratee " lodash 3.0.0 syntax keyword ls_collections contained partition sortByAll includes callback -" +" lodash 4.0.0 +syntax keyword ls_collections contained flatMap commit next plant reverse toJSON valueOf +syntax keyword ls_collections contained forEachRight invokeMap keyBy orderBy sample sampleSize + " lodash 3.0.0 syntax keyword ls_strings contained camelCase capitalize deburr endsWith escapeRegExp syntax keyword ls_strings contained kebabCase pad padLeft padRight repeat snakeCase syntax keyword ls_strings contained startsWith trim trimLeft trimRight trunc words -" +" lodash 4.0.0 +syntax keyword ls_strings contained lowerCase lowerFirst padEnd padStart replace startCase +syntax keyword ls_strings contained startWith toLower toUpper trimEnd trimStart truncate upperCase +syntax keyword ls_strings contained upperFirst + syntax keyword ls_arrays contained first initial last rest compact flatten without union syntax keyword ls_arrays contained intersection difference uniq zip object indextOf syntax keyword ls_arrays contained lastIndexOf sortedIndex range @@ -34,12 +41,21 @@ syntax keyword ls_arrays contained lastIndexOf sortedIndex range syntax keyword ls_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword ls_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile syntax keyword ls_arrays contained takeWhile +" lodash 4.0.0 +syntax keyword ls_arrays contained concat differenceBy differenceWith drop fill findLastIndex +syntax keyword ls_arrays contained fromPairs head indexOf intersection intersectionBy intersectionWith +syntax keyword ls_arrays contained join pull pullAll pullAllBy remove slice sortedIndexBy sortedIndexOf +syntax keyword ls_arrays contained sortedLastIndexBy sortedLastIndexOf sortedUniq sortedUniqBy tail +syntax keyword ls_arrays contained take takeRightWhile unionBy unionWith uniqBy uniqWith unzipWith +syntax keyword ls_arrays contained xorBy xorWith zipObject zipWith syntax keyword ls_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword ls_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword ls_functions contained ary before curryRight negate rearg syntax keyword ls_functions contained backflow compose partial cancel +" lodash 4.0.0 +syntax keyword ls_functions contained curry defer eachRight findLast flip negate overArgs rest spread unary syntax keyword ls_objects contained keys values pairs invert functions extend pick omit syntax keyword ls_objects contained defaults clone tap has isEqual isEmpty isElement isArray @@ -49,12 +65,19 @@ syntax keyword ls_objects contained isUndefined property matches " lodash 3.0.0 syntax keyword ls_objects contained keysIn valuesIn assign get set syntax keyword ls_objects contained mapKeys +" lodash 4.0.0 +syntax keyword ls_objects contained assignIn assignInWith assignWith defaultsDeep extendWith +syntax keyword ls_objects contained findKey findLastKey forIn forInRight forOwn forOwnRight +syntax keyword ls_objects contained functionsIn hasIn mergeWith omitBy pickBy setWith toPairs +syntax keyword ls_objects contained toPairsIn transform unset " syntax keyword ls_utility contained noConflict identify times random mixin uniqueId syntax keyword ls_utility contained escape unescape result template iteratee noop " lodash 3.0.0 syntax keyword ls_utility contained attempt matches matchesProperty propertyOf constant now -syntax keyword ls_utility contained attempt matches matchesProperty propertyOf constant now +" lodash 4.0.0 +syntax keyword ls_utility contained cond conforms flow identity matches method methodOf nthArg +syntax keyword ls_utility contained over overEvery overSome rangeRight times toPath uniqueId syntax keyword ls_chaining contained chain value thru @@ -66,7 +89,16 @@ syntax keyword ls_lodash contained constant mapValues now property xor syntax keyword ls_lodash contained create noop transform " lodash 3.0.0 syntax keyword ls_lodash contained isError isMatch isNative isTypedArray toPlainObject -" +" lodash 4.0.0 +syntax keyword ls_lodash contained clone cloneDeepWith cloneWith eq gt gte isArrayLike isArrayLikeObject +syntax keyword ls_lodash contained isEqualWith isInteger isLength isMatchWith isNil isObjectLike isSafeInteger +syntax keyword ls_lodash contained isSymbol lt lte toInteger toLength toNumber toSafeInteger toString +syntax keyword ls_lodash contained templateSettings evaluate imports interpolate varible +syntax keyword ls_lodash contained VERSION + +" lodash 4.0.0 +syntax keyword ls_math contained add ceil floor max maxBy mean min minBy round subtract sum sumBy +syntax keyword ls_number contained clamp inRange " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -89,6 +121,8 @@ if version >= 508 || !exists("did_underscore_ls_syntax_inits") HiLink ls_utility PreProc HiLink ls_chaining PreProc HiLink ls_lodash PreProc + HiLink ls_math PreProc + HiLink ls_number PreProc delcommand HiLink endif diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 122bfde..1522942 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: underscore.js for typescript " Maintainer: othree -" Last Change: 2015/01/27 +" Last Change: 2016/01/18 " Version: 1.7.0 " URL: http://underscorejs.org/ -" LoDash: 3.0.0 +" LoDash: 4.0.0 " URL: http://lodash.com/ syntax keyword typescriptunderscore _ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions -syntax cluster typescript_Functions contains=typescript_collections,typescript_strings,typescript_arrays,typescript_functions,typescript_objects,typescript_chaining,typescript_lodash +syntax cluster typescript_Functions contains=typescript_collections,typescript_strings,typescript_arrays,typescript_functions,typescript_objects,typescript_chaining,typescript_utility,typescript_lodash,typescript_math,typescript_number syntax match typescript_collections contained /contains/ syntax keyword typescript_collections contained include @@ -21,12 +21,19 @@ syntax keyword typescript_collections contained groupBy indexBy countBy shuffle syntax keyword typescript_collections contained partition iteratee " lodash 3.0.0 syntax keyword typescript_collections contained partition sortByAll includes callback -" +" lodash 4.0.0 +syntax keyword typescript_collections contained flatMap commit next plant reverse toJSON valueOf +syntax keyword typescript_collections contained forEachRight invokeMap keyBy orderBy sample sampleSize + " lodash 3.0.0 syntax keyword typescript_strings contained camelCase capitalize deburr endsWith escapeRegExp syntax keyword typescript_strings contained kebabCase pad padLeft padRight repeat snakeCase syntax keyword typescript_strings contained startsWith trim trimLeft trimRight trunc words -" +" lodash 4.0.0 +syntax keyword typescript_strings contained lowerCase lowerFirst padEnd padStart replace startCase +syntax keyword typescript_strings contained startWith toLower toUpper trimEnd trimStart truncate upperCase +syntax keyword typescript_strings contained upperFirst + syntax keyword typescript_arrays contained first initial last rest compact flatten without union syntax keyword typescript_arrays contained intersection difference uniq zip object indextOf syntax keyword typescript_arrays contained lastIndexOf sortedIndex range @@ -34,12 +41,21 @@ syntax keyword typescript_arrays contained lastIndexOf sortedIndex range syntax keyword typescript_arrays contained chunk dropRight dropRightWhile dropWhile flattenDeep syntax keyword typescript_arrays contained pullAt slice sortedLastIndex takeRight takeRightWhile syntax keyword typescript_arrays contained takeWhile +" lodash 4.0.0 +syntax keyword typescript_arrays contained concat differenceBy differenceWith drop fill findLastIndex +syntax keyword typescript_arrays contained fromPairs head indexOf intersection intersectionBy intersectionWith +syntax keyword typescript_arrays contained join pull pullAll pullAllBy remove slice sortedIndexBy sortedIndexOf +syntax keyword typescript_arrays contained sortedLastIndexBy sortedLastIndexOf sortedUniq sortedUniqBy tail +syntax keyword typescript_arrays contained take takeRightWhile unionBy unionWith uniqBy uniqWith unzipWith +syntax keyword typescript_arrays contained xorBy xorWith zipObject zipWith syntax keyword typescript_functions contained bind bindAll partial memoize delay throttle debounce syntax keyword typescript_functions contained once after before wrap negate compose flow flowRight " lodash 3.0.0 syntax keyword typescript_functions contained ary before curryRight negate rearg syntax keyword typescript_functions contained backflow compose partial cancel +" lodash 4.0.0 +syntax keyword typescript_functions contained curry defer eachRight findLast flip negate overArgs rest spread unary syntax keyword typescript_objects contained keys values pairs invert functions extend pick omit syntax keyword typescript_objects contained defaults clone tap has isEqual isEmpty isElement isArray @@ -49,12 +65,19 @@ syntax keyword typescript_objects contained isUndefined property matches " lodash 3.0.0 syntax keyword typescript_objects contained keysIn valuesIn assign get set syntax keyword typescript_objects contained mapKeys +" lodash 4.0.0 +syntax keyword typescript_objects contained assignIn assignInWith assignWith defaultsDeep extendWith +syntax keyword typescript_objects contained findKey findLastKey forIn forInRight forOwn forOwnRight +syntax keyword typescript_objects contained functionsIn hasIn mergeWith omitBy pickBy setWith toPairs +syntax keyword typescript_objects contained toPairsIn transform unset " syntax keyword typescript_utility contained noConflict identify times random mixin uniqueId syntax keyword typescript_utility contained escape unescape result template iteratee noop " lodash 3.0.0 syntax keyword typescript_utility contained attempt matches matchesProperty propertyOf constant now -syntax keyword typescript_utility contained attempt matches matchesProperty propertyOf constant now +" lodash 4.0.0 +syntax keyword typescript_utility contained cond conforms flow identity matches method methodOf nthArg +syntax keyword typescript_utility contained over overEvery overSome rangeRight times toPath uniqueId syntax keyword typescript_chaining contained chain value thru @@ -66,7 +89,16 @@ syntax keyword typescript_lodash contained constant mapValues now property xor syntax keyword typescript_lodash contained create noop transform " lodash 3.0.0 syntax keyword typescript_lodash contained isError isMatch isNative isTypedArray toPlainObject -" +" lodash 4.0.0 +syntax keyword typescript_lodash contained clone cloneDeepWith cloneWith eq gt gte isArrayLike isArrayLikeObject +syntax keyword typescript_lodash contained isEqualWith isInteger isLength isMatchWith isNil isObjectLike isSafeInteger +syntax keyword typescript_lodash contained isSymbol lt lte toInteger toLength toNumber toSafeInteger toString +syntax keyword typescript_lodash contained templateSettings evaluate imports interpolate varible +syntax keyword typescript_lodash contained VERSION + +" lodash 4.0.0 +syntax keyword typescript_math contained add ceil floor max maxBy mean min minBy round subtract sum sumBy +syntax keyword typescript_number contained clamp inRange " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -89,6 +121,8 @@ if version >= 508 || !exists("did_underscore_typescript_syntax_inits") HiLink typescript_utility PreProc HiLink typescript_chaining PreProc HiLink typescript_lodash PreProc + HiLink typescript_math PreProc + HiLink typescript_number PreProc delcommand HiLink endif From 9196c864aa4f6dabc12a5e44a62d88cd91c975c2 Mon Sep 17 00:00:00 2001 From: Weirong Xu Date: Mon, 18 Jan 2016 22:37:22 +0800 Subject: [PATCH 53/80] fix: jquery prepend typo --- autoload/syntax/jquery.coffee.vim | 2 +- autoload/syntax/jquery.javascript.vim | 2 +- autoload/syntax/jquery.ls.vim | 2 +- autoload/syntax/jquery.typescript.vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index e93e975..e833335 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -48,7 +48,7 @@ syntax keyword coffeeQEvents contained focusin focusout keydown keypress syntax keyword coffeeQEvents contained click dblclick hover mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup syntax keyword coffeeQManipulation contained clone syntax keyword coffeeQManipulation contained unwrap wrap wrapAll wrapInner -syntax keyword coffeeQManipulation contained append appendTo html preprend prependTo text +syntax keyword coffeeQManipulation contained append appendTo html prepend prependTo text syntax keyword coffeeQManipulation contained after before insertAfter insertBefore syntax keyword coffeeQManipulation contained detach empty remove syntax keyword coffeeQManipulation contained replaceAll replaceWith diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 89327a4..8fddf85 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -48,7 +48,7 @@ syntax keyword javascriptQEvents contained focusin focusout keydown keyp syntax keyword javascriptQEvents contained click dblclick hover mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup syntax keyword javascriptQManipulation contained clone syntax keyword javascriptQManipulation contained unwrap wrap wrapAll wrapInner -syntax keyword javascriptQManipulation contained append appendTo html preprend prependTo text +syntax keyword javascriptQManipulation contained append appendTo html prepend prependTo text syntax keyword javascriptQManipulation contained after before insertAfter insertBefore syntax keyword javascriptQManipulation contained detach empty remove syntax keyword javascriptQManipulation contained replaceAll replaceWith diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 4387bb0..6881fc4 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -48,7 +48,7 @@ syntax keyword lsQEvents contained focusin focusout keydown keypress key syntax keyword lsQEvents contained click dblclick hover mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup syntax keyword lsQManipulation contained clone syntax keyword lsQManipulation contained unwrap wrap wrapAll wrapInner -syntax keyword lsQManipulation contained append appendTo html preprend prependTo text +syntax keyword lsQManipulation contained append appendTo html prepend prependTo text syntax keyword lsQManipulation contained after before insertAfter insertBefore syntax keyword lsQManipulation contained detach empty remove syntax keyword lsQManipulation contained replaceAll replaceWith diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 3b4dcb4..80ba67b 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -48,7 +48,7 @@ syntax keyword typescriptQEvents contained focusin focusout keydown keyp syntax keyword typescriptQEvents contained click dblclick hover mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup syntax keyword typescriptQManipulation contained clone syntax keyword typescriptQManipulation contained unwrap wrap wrapAll wrapInner -syntax keyword typescriptQManipulation contained append appendTo html preprend prependTo text +syntax keyword typescriptQManipulation contained append appendTo html prepend prependTo text syntax keyword typescriptQManipulation contained after before insertAfter insertBefore syntax keyword typescriptQManipulation contained detach empty remove syntax keyword typescriptQManipulation contained replaceAll replaceWith From 0795093ea3b397b4e78ad75d8d9f0d98fb9e4d08 Mon Sep 17 00:00:00 2001 From: Joe Lencioni Date: Mon, 18 Jan 2016 15:58:30 -0800 Subject: [PATCH 54/80] Fix wording in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a86b246..a1835ee 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ javascript-libraries-syntax.vim =============================== Syntax file for JavaScript libraries. Supports JavaScript libraries I am using (patches welcome). -Should works well with other JavaScript syntax file. [SyntaxComplete][] also works well on all +Should work well with other JavaScript syntax files. [SyntaxComplete][] also works well on all supported languages. [SyntaxComplete]:http://www.vim.org/scripts/script.php?script_id=3172 From 8f7a84d61c3e2cc0902d2f4ff320085e774862cf Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 19 Jan 2016 11:06:26 +0800 Subject: [PATCH 55/80] Fix #43, css selector in noreserved --- autoload/syntax/jquery.coffee.vim | 1 + autoload/syntax/jquery.javascript.vim | 1 + autoload/syntax/jquery.ls.vim | 1 + autoload/syntax/jquery.typescript.vim | 1 + 4 files changed, 4 insertions(+) diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index e833335..b96d270 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -65,6 +65,7 @@ syntax keyword coffeeQTraversing contained children closest find next nextAl " syntax region coffeeString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=coffeeASCII,@jSelectors syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax cluster coffeeNoReserved add=@cssSelectors syntax match cssId contained containedin=coffeeString /#[0-9A-Za-z_\-]\+/ syntax match cssClass contained containedin=coffeeString /\.[0-9A-Za-z_\-]\+/ syntax match cssOperators contained containedin=coffeeString /*\|>\|+\|-\|\~/ diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 8fddf85..6356343 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -65,6 +65,7 @@ syntax keyword javascriptQTraversing contained children closest find next ne " syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax cluster javascriptNoReserved add=@cssSelectors syntax match cssId contained containedin=javascriptString /#[0-9A-Za-z_\-]\+/ syntax match cssClass contained containedin=javascriptString /\.[0-9A-Za-z_\-]\+/ syntax match cssOperators contained containedin=javascriptString /*\|>\|+\|-\|\~/ diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 6881fc4..9d35b7f 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -65,6 +65,7 @@ syntax keyword lsQTraversing contained children closest find next nextAll ne " syntax region lsString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=lsASCII,@jSelectors syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax cluster lsNoReserved add=@cssSelectors syntax match cssId contained containedin=lsString /#[0-9A-Za-z_\-]\+/ syntax match cssClass contained containedin=lsString /\.[0-9A-Za-z_\-]\+/ syntax match cssOperators contained containedin=lsString /*\|>\|+\|-\|\~/ diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 80ba67b..1eb82a7 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -65,6 +65,7 @@ syntax keyword typescriptQTraversing contained children closest find next ne " syntax region typescriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=typescriptASCII,@jSelectors syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +syntax cluster typescriptNoReserved add=@cssSelectors syntax match cssId contained containedin=typescriptString /#[0-9A-Za-z_\-]\+/ syntax match cssClass contained containedin=typescriptString /\.[0-9A-Za-z_\-]\+/ syntax match cssOperators contained containedin=typescriptString /*\|>\|+\|-\|\~/ From b17f2bbbc72c86ee99c6dc8ddaa665c4d2d8c260 Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 19 Jan 2016 17:27:11 +0800 Subject: [PATCH 56/80] Temp fix for #48, disable css selctors --- autoload/syntax/jquery.javascript.vim | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 6356343..05e53ef 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -64,17 +64,17 @@ syntax keyword javascriptQTraversing contained children closest find next ne " syntax region javascriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=javascriptASCII,@jSelectors " syntax region javascriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=javascriptASCII,@jSelectors -syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax cluster javascriptNoReserved add=@cssSelectors -syntax match cssId contained containedin=javascriptString /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained containedin=javascriptString /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained containedin=javascriptString /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained containedin=javascriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained containedin=javascriptString /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained containedin=javascriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained containedin=javascriptString /:\(hidden\|visible\)/ +" syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +" syntax cluster javascriptNoReserved add=@cssSelectors +" syntax match cssId contained containedin=javascriptString /#[0-9A-Za-z_\-]\+/ +" syntax match cssClass contained containedin=javascriptString /\.[0-9A-Za-z_\-]\+/ +" syntax match cssOperators contained containedin=javascriptString /*\|>\|+\|-\|\~/ +" syntax match cssBasicFilters contained containedin=javascriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +" syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ +" syntax match cssChildFilters contained containedin=javascriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +" syntax match cssContentFilters contained containedin=javascriptString /:\(contains\|empty\|has\|parent\)/ +" syntax match cssForms contained containedin=javascriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +" syntax match cssVisibility contained containedin=javascriptString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -109,15 +109,15 @@ if version >= 508 || !exists("did_jquery_javascript_syntax_inits") HiLink javascriptQTraversing PreProc HiLink javascriptQUtilities PreProc - HiLink cssId Identifier - HiLink cssClass Constant - HiLink cssOperators Special - HiLink cssBasicFilters Statement - HiLink cssContentFilters Statement - HiLink cssVisibility Statement - HiLink cssChildFilters Statement - HiLink cssForms Statement - HiLink cssFormFilters Statement + " HiLink cssId Identifier + " HiLink cssClass Constant + " HiLink cssOperators Special + " HiLink cssBasicFilters Statement + " HiLink cssContentFilters Statement + " HiLink cssVisibility Statement + " HiLink cssChildFilters Statement + " HiLink cssForms Statement + " HiLink cssFormFilters Statement delcommand HiLink From f4719fb5c4b565fc6c4e2473d18c5aa99823e00c Mon Sep 17 00:00:00 2001 From: Georgi Mitrev Date: Thu, 3 Mar 2016 17:32:47 +0200 Subject: [PATCH 57/80] Add ReactDOM as a top-level React constant --- autoload/syntax/react.coffee.vim | 2 +- autoload/syntax/react.javascript.vim | 2 +- autoload/syntax/react.ls.vim | 2 +- autoload/syntax/react.typescript.vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim index a88c1b1..b5ed8ec 100644 --- a/autoload/syntax/react.coffee.vim +++ b/autoload/syntax/react.coffee.vim @@ -6,7 +6,7 @@ " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeReact React ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution syntax keyword coffeeRTop contained createClass render unmountComponentAtNode renderToString syntax keyword coffeeRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim index 75b6bee..22948b9 100644 --- a/autoload/syntax/react.javascript.vim +++ b/autoload/syntax/react.javascript.vim @@ -6,7 +6,7 @@ " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptReact React ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution syntax keyword javascriptRTop contained createClass render unmountComponentAtNode renderToString syntax keyword javascriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim index 345e84b..7e4215e 100644 --- a/autoload/syntax/react.ls.vim +++ b/autoload/syntax/react.ls.vim @@ -6,7 +6,7 @@ " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsReact React ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution syntax keyword lsRTop contained createClass render unmountComponentAtNode renderToString syntax keyword lsRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim index 5b3094b..869cad3 100644 --- a/autoload/syntax/react.typescript.vim +++ b/autoload/syntax/react.typescript.vim @@ -6,7 +6,7 @@ " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptReact React ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution syntax keyword typescriptRTop contained createClass render unmountComponentAtNode renderToString syntax keyword typescriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes From c2f17e2de27cf8c835c69d7d555c881c7259ac7a Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 19 Apr 2016 08:44:46 +0800 Subject: [PATCH 58/80] Update jasmine to fix othree/yajs.vim#123 --- autoload/syntax/jasmine.coffee.vim | 10 +++++----- autoload/syntax/jasmine.javascript.vim | 10 +++++----- autoload/syntax/jasmine.ls.vim | 10 +++++----- autoload/syntax/jasmine.typescript.vim | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/autoload/syntax/jasmine.coffee.vim b/autoload/syntax/jasmine.coffee.vim index 1a099ed..d8626d2 100644 --- a/autoload/syntax/jasmine.coffee.vim +++ b/autoload/syntax/jasmine.coffee.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: jasmine for coffee " Maintainer: othree -" Last Change: 2014/01/31 +" Last Change: 2016/04/19 " Version: 2.0 " URL: http://jasmine.github.io/ @@ -16,11 +16,11 @@ syntax keyword coffeeJMethods contained addReporter specFilter syntax cluster coffeeJFunctions contains=coffeeJMethods,coffeeJEnvMethods,coffeeJEnvMethods,coffeeJExpectMethods,coffeeJSpyMethods,coffeeJSpyAndMethods,coffeeJSpyCallsMethods syntax cluster coffeeJAttrs contains=coffeeJExpectNot,coffeeJSpyAnd,coffeeJSpyCalls -syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier syntax keyword coffeeJSpyAnd and contained syntax keyword coffeeJSpyAndMethods returnValue callFake throwError stub contained @@ -28,7 +28,7 @@ syntax keyword coffeeJSpyCalls calls contained syntax keyword coffeeJSpyMethods andReturn andCallThrough callThrough contained syntax keyword coffeeJCallsMethods any count argsFor allArgs all mostRecent first reset contained -syntax keyword coffeeJGlobalMethod expect containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString +syntax keyword coffeeJGlobalMethod expect containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier syntax keyword coffeeJExpectNot not contained nextgroup=coffeeJExpectNotdot syntax keyword coffeeJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained diff --git a/autoload/syntax/jasmine.javascript.vim b/autoload/syntax/jasmine.javascript.vim index 0bab916..383036f 100644 --- a/autoload/syntax/jasmine.javascript.vim +++ b/autoload/syntax/jasmine.javascript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: jasmine for javascript " Maintainer: othree -" Last Change: 2014/01/31 +" Last Change: 2016/04/19 " Version: 2.0 " URL: http://jasmine.github.io/ @@ -16,11 +16,11 @@ syntax keyword javascriptJMethods contained addReporter specFilter syntax cluster javascriptJFunctions contains=javascriptJMethods,javascriptJEnvMethods,javascriptJEnvMethods,javascriptJExpectMethods,javascriptJSpyMethods,javascriptJSpyAndMethods,javascriptJSpyCallsMethods syntax cluster javascriptJAttrs contains=javascriptJExpectNot,javascriptJSpyAnd,javascriptJSpyCalls -syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier syntax keyword javascriptJSpyAnd and contained syntax keyword javascriptJSpyAndMethods returnValue callFake throwError stub contained @@ -28,7 +28,7 @@ syntax keyword javascriptJSpyCalls calls contained syntax keyword javascriptJSpyMethods andReturn andCallThrough callThrough contained syntax keyword javascriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained -syntax keyword javascriptJGlobalMethod expect containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString +syntax keyword javascriptJGlobalMethod expect containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier syntax keyword javascriptJExpectNot not contained nextgroup=javascriptJExpectNotdot syntax keyword javascriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained diff --git a/autoload/syntax/jasmine.ls.vim b/autoload/syntax/jasmine.ls.vim index a84f9d6..b30865a 100644 --- a/autoload/syntax/jasmine.ls.vim +++ b/autoload/syntax/jasmine.ls.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: jasmine for ls " Maintainer: othree -" Last Change: 2014/01/31 +" Last Change: 2016/04/19 " Version: 2.0 " URL: http://jasmine.github.io/ @@ -16,11 +16,11 @@ syntax keyword lsJMethods contained addReporter specFilter syntax cluster lsJFunctions contains=lsJMethods,lsJEnvMethods,lsJEnvMethods,lsJExpectMethods,lsJSpyMethods,lsJSpyAndMethods,lsJSpyCallsMethods syntax cluster lsJAttrs contains=lsJExpectNot,lsJSpyAnd,lsJSpyCalls -syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier syntax keyword lsJSpyAnd and contained syntax keyword lsJSpyAndMethods returnValue callFake throwError stub contained @@ -28,7 +28,7 @@ syntax keyword lsJSpyCalls calls contained syntax keyword lsJSpyMethods andReturn andCallThrough callThrough contained syntax keyword lsJCallsMethods any count argsFor allArgs all mostRecent first reset contained -syntax keyword lsJGlobalMethod expect containedin=ALLBUT,lsComment,lsLineComment,lsString +syntax keyword lsJGlobalMethod expect containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier syntax keyword lsJExpectNot not contained nextgroup=lsJExpectNotdot syntax keyword lsJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained diff --git a/autoload/syntax/jasmine.typescript.vim b/autoload/syntax/jasmine.typescript.vim index 3e0be5b..adaa88e 100644 --- a/autoload/syntax/jasmine.typescript.vim +++ b/autoload/syntax/jasmine.typescript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: jasmine for typescript " Maintainer: othree -" Last Change: 2014/01/31 +" Last Change: 2016/04/19 " Version: 2.0 " URL: http://jasmine.github.io/ @@ -16,11 +16,11 @@ syntax keyword typescriptJMethods contained addReporter specFilter syntax cluster typescriptJFunctions contains=typescriptJMethods,typescriptJEnvMethods,typescriptJEnvMethods,typescriptJExpectMethods,typescriptJSpyMethods,typescriptJSpyAndMethods,typescriptJSpyCallsMethods syntax cluster typescriptJAttrs contains=typescriptJExpectNot,typescriptJSpyAnd,typescriptJSpyCalls -syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier syntax keyword typescriptJSpyAnd and contained syntax keyword typescriptJSpyAndMethods returnValue callFake throwError stub contained @@ -28,7 +28,7 @@ syntax keyword typescriptJSpyCalls calls contained syntax keyword typescriptJSpyMethods andReturn andCallThrough callThrough contained syntax keyword typescriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained -syntax keyword typescriptJGlobalMethod expect containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString +syntax keyword typescriptJGlobalMethod expect containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier syntax keyword typescriptJExpectNot not contained nextgroup=typescriptJExpectNotdot syntax keyword typescriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained From 9c991410fde8ab3ad584aade2f89a7344159be7d Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 4 May 2016 13:30:31 +0800 Subject: [PATCH 59/80] Add Ramda --- autoload/jslibsyntax.vim | 1 + autoload/syntax/jquery.coffee.vim | 40 +++++++++---------- autoload/syntax/jquery.ls.vim | 40 +++++++++---------- autoload/syntax/jquery.typescript.vim | 40 +++++++++---------- autoload/syntax/postprocess.coffee.vim | 1 + autoload/syntax/postprocess.javascript.vim | 3 +- autoload/syntax/postprocess.typescript.vim | 4 +- autoload/syntax/ramda.coffee.vim | 46 ++++++++++++++++++++++ autoload/syntax/ramda.javascript.vim | 46 ++++++++++++++++++++++ autoload/syntax/ramda.ls.vim | 46 ++++++++++++++++++++++ autoload/syntax/ramda.typescript.vim | 46 ++++++++++++++++++++++ autoload/syntax/update.sh | 2 +- 12 files changed, 251 insertions(+), 64 deletions(-) create mode 100644 autoload/syntax/ramda.coffee.vim create mode 100644 autoload/syntax/ramda.javascript.vim create mode 100644 autoload/syntax/ramda.ls.vim create mode 100644 autoload/syntax/ramda.typescript.vim diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 95f620a..6d5b782 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -17,6 +17,7 @@ let s:libs = [ \ 'sugar', \ 'jasmine', \ 'chai', + \ 'ramda', \ 'react', \ 'flux', \ 'handlebars' diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index b96d270..e8e004f 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -64,17 +64,17 @@ syntax keyword coffeeQTraversing contained children closest find next nextAl " syntax region coffeeString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=coffeeASCII,@jSelectors " syntax region coffeeString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=coffeeASCII,@jSelectors -syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax cluster coffeeNoReserved add=@cssSelectors -syntax match cssId contained containedin=coffeeString /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained containedin=coffeeString /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained containedin=coffeeString /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained containedin=coffeeString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained containedin=coffeeString /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained containedin=coffeeString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained containedin=coffeeString /:\(hidden\|visible\)/ +" syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +" syntax cluster coffeeNoReserved add=@cssSelectors +" syntax match cssId contained containedin=coffeeString /#[0-9A-Za-z_\-]\+/ +" syntax match cssClass contained containedin=coffeeString /\.[0-9A-Za-z_\-]\+/ +" syntax match cssOperators contained containedin=coffeeString /*\|>\|+\|-\|\~/ +" syntax match cssBasicFilters contained containedin=coffeeString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +" syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-child/ +" syntax match cssChildFilters contained containedin=coffeeString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +" syntax match cssContentFilters contained containedin=coffeeString /:\(contains\|empty\|has\|parent\)/ +" syntax match cssForms contained containedin=coffeeString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +" syntax match cssVisibility contained containedin=coffeeString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -109,15 +109,15 @@ if version >= 508 || !exists("did_jquery_coffee_syntax_inits") HiLink coffeeQTraversing PreProc HiLink coffeeQUtilities PreProc - HiLink cssId Identifier - HiLink cssClass Constant - HiLink cssOperators Special - HiLink cssBasicFilters Statement - HiLink cssContentFilters Statement - HiLink cssVisibility Statement - HiLink cssChildFilters Statement - HiLink cssForms Statement - HiLink cssFormFilters Statement + " HiLink cssId Identifier + " HiLink cssClass Constant + " HiLink cssOperators Special + " HiLink cssBasicFilters Statement + " HiLink cssContentFilters Statement + " HiLink cssVisibility Statement + " HiLink cssChildFilters Statement + " HiLink cssForms Statement + " HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index 9d35b7f..b039ca8 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -64,17 +64,17 @@ syntax keyword lsQTraversing contained children closest find next nextAll ne " syntax region lsString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=lsASCII,@jSelectors " syntax region lsString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=lsASCII,@jSelectors -syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax cluster lsNoReserved add=@cssSelectors -syntax match cssId contained containedin=lsString /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained containedin=lsString /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained containedin=lsString /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained containedin=lsString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained containedin=lsString /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained containedin=lsString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained containedin=lsString /:\(hidden\|visible\)/ +" syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +" syntax cluster lsNoReserved add=@cssSelectors +" syntax match cssId contained containedin=lsString /#[0-9A-Za-z_\-]\+/ +" syntax match cssClass contained containedin=lsString /\.[0-9A-Za-z_\-]\+/ +" syntax match cssOperators contained containedin=lsString /*\|>\|+\|-\|\~/ +" syntax match cssBasicFilters contained containedin=lsString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +" syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-child/ +" syntax match cssChildFilters contained containedin=lsString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +" syntax match cssContentFilters contained containedin=lsString /:\(contains\|empty\|has\|parent\)/ +" syntax match cssForms contained containedin=lsString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +" syntax match cssVisibility contained containedin=lsString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -109,15 +109,15 @@ if version >= 508 || !exists("did_jquery_ls_syntax_inits") HiLink lsQTraversing PreProc HiLink lsQUtilities PreProc - HiLink cssId Identifier - HiLink cssClass Constant - HiLink cssOperators Special - HiLink cssBasicFilters Statement - HiLink cssContentFilters Statement - HiLink cssVisibility Statement - HiLink cssChildFilters Statement - HiLink cssForms Statement - HiLink cssFormFilters Statement + " HiLink cssId Identifier + " HiLink cssClass Constant + " HiLink cssOperators Special + " HiLink cssBasicFilters Statement + " HiLink cssContentFilters Statement + " HiLink cssVisibility Statement + " HiLink cssChildFilters Statement + " HiLink cssForms Statement + " HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 1eb82a7..750ea61 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -64,17 +64,17 @@ syntax keyword typescriptQTraversing contained children closest find next ne " syntax region typescriptString start=/"/ skip=/\\\\\|\\"\|\\\n/ end=/"\|$/ contains=typescriptASCII,@jSelectors " syntax region typescriptString start=/'/ skip=/\\\\\|\\'\|\\\n/ end=/'\|$/ contains=typescriptASCII,@jSelectors -syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters -syntax cluster typescriptNoReserved add=@cssSelectors -syntax match cssId contained containedin=typescriptString /#[0-9A-Za-z_\-]\+/ -syntax match cssClass contained containedin=typescriptString /\.[0-9A-Za-z_\-]\+/ -syntax match cssOperators contained containedin=typescriptString /*\|>\|+\|-\|\~/ -syntax match cssBasicFilters contained containedin=typescriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ -syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ -syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ -syntax match cssContentFilters contained containedin=typescriptString /:\(contains\|empty\|has\|parent\)/ -syntax match cssForms contained containedin=typescriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ -syntax match cssVisibility contained containedin=typescriptString /:\(hidden\|visible\)/ +" syntax cluster cssSelectors contains=cssId,cssClass,cssOperators,cssBasicFilters,cssContentFilters,cssVisibility,cssChildFilters,cssForms,cssFormFilters +" syntax cluster typescriptNoReserved add=@cssSelectors +" syntax match cssId contained containedin=typescriptString /#[0-9A-Za-z_\-]\+/ +" syntax match cssClass contained containedin=typescriptString /\.[0-9A-Za-z_\-]\+/ +" syntax match cssOperators contained containedin=typescriptString /*\|>\|+\|-\|\~/ +" syntax match cssBasicFilters contained containedin=typescriptString /:\(animated\|eq\|even\|first\|focus\|gt\|header\|last\|lang\|lt\|not\|odd\|root\|target\)/ +" syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-child/ +" syntax match cssChildFilters contained containedin=typescriptString /:\(first\|last\|nth\|only\|nth-last\)-of-type/ +" syntax match cssContentFilters contained containedin=typescriptString /:\(contains\|empty\|has\|parent\)/ +" syntax match cssForms contained containedin=typescriptString /:\(button\|checkbox\|checked\|disabled\|enabled\|file\|image\|input\|password\|radio\|reset\|selected\|submit\|text\)/ +" syntax match cssVisibility contained containedin=typescriptString /:\(hidden\|visible\)/ " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -109,15 +109,15 @@ if version >= 508 || !exists("did_jquery_typescript_syntax_inits") HiLink typescriptQTraversing PreProc HiLink typescriptQUtilities PreProc - HiLink cssId Identifier - HiLink cssClass Constant - HiLink cssOperators Special - HiLink cssBasicFilters Statement - HiLink cssContentFilters Statement - HiLink cssVisibility Statement - HiLink cssChildFilters Statement - HiLink cssForms Statement - HiLink cssFormFilters Statement + " HiLink cssId Identifier + " HiLink cssClass Constant + " HiLink cssOperators Special + " HiLink cssBasicFilters Statement + " HiLink cssContentFilters Statement + " HiLink cssVisibility Statement + " HiLink cssChildFilters Statement + " HiLink cssForms Statement + " HiLink cssFormFilters Statement delcommand HiLink diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index 4b441ce..34898ae 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -9,6 +9,7 @@ " work with https://github.com/kchmck/vim-coffee-script syntax cluster props add=@coffeeQFunctions,@coffee_Functions,@coffeeBFunctions syntax cluster props add=@coffeepFunctions,@coffeeAFunctions,@coffeeSFunctions,@coffeeJFunctions +syntax cluster props add=@coffeeRaFunctions syntax cluster props add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs,@coffeeAAttrs,@coffeeJAttrs syntax cluster props add=@coffeeRProp " syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index a0d87ad..98e410c 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -1,13 +1,14 @@ " Vim syntax file " Language: JS Lib syntax post process for javascript " Maintainer: othree -" Last Change: 2014/07/01 +" Last Change: 2016/05/04 " Version: 0.5 " URL: https://github.com/othree/javascript-libraries-syntax.vim " syntax cluster props add=@javascriptQFunctions,@javascript_Functions,@javascriptBFunctions syntax cluster props add=@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions +syntax cluster props add=@javascriptRaFunctions syntax cluster props add=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs syntax cluster props add=@javascriptRProp diff --git a/autoload/syntax/postprocess.typescript.vim b/autoload/syntax/postprocess.typescript.vim index e1fda98..b1aee9c 100644 --- a/autoload/syntax/postprocess.typescript.vim +++ b/autoload/syntax/postprocess.typescript.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: JS Lib syntax post process for typescript " Maintainer: othree -" Last Change: 2013/02/25 +" Last Change: 2016/05/04 " Version: 0.4 " URL: https://github.com/othree/javascript-libraries-syntax.vim " -syntax cluster typescriptLibraryFuncs contains=@typescriptQFunctions,@typescript_Functions,@typescriptBFunctions,@typescriptpFunctions,@typescriptAFunctions,typescriptSFunctions,typescriptJFunctions,@typescriptRProp +syntax cluster typescriptLibraryFuncs contains=@typescriptQFunctions,@typescript_Functions,@typescriptBFunctions,@typescriptpFunctions,@typescriptAFunctions,typescriptSFunctions,typescriptJFunctions,@typescriptRProp,@typescriptRaFunctions syntax cluster typescriptLibraryAttrs contains=@typescriptQAttrs,@typescript_Attrs,@typescriptBAttrs,@typescriptpAttrs,@typescriptAAttrs,@typescriptSAttrs,@typescriptJAttrs syntax match typescriptLDot /\./ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptLibraryFuncs,@typescriptLibraryAttrs diff --git a/autoload/syntax/ramda.coffee.vim b/autoload/syntax/ramda.coffee.vim new file mode 100644 index 0000000..99b72de --- /dev/null +++ b/autoload/syntax/ramda.coffee.vim @@ -0,0 +1,46 @@ +" Vim syntax file +" Language: Ramda for coffee +" Maintainer: othree +" Last Change: 2016/05/04 +" Version: 0.21.0 +" URL: http://ramdajs.com/ + +syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeRDot +syntax match coffeeRaDot contained /\./ nextgroup=coffeeRFunctions + +syntax cluster coffeeRaaFunctions contains=coffeeRaFunction,coffeeRaMath,coffeeRaList,coffeeRaLogic,coffeeRaObject,coffeeRaRelation,coffeeRaType,coffeeRaString + +syntax keyword coffeeRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap +syntax keyword coffeeRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum +syntax keyword coffeeRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax keyword coffeeRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when +syntax keyword coffeeRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq +syntax keyword coffeeRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith +syntax keyword coffeeRaType contained is isArrayLike isNil propIs type +syntax keyword coffeeRaString contained match replace split test toLower toString toUpper trim + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_backbone_coffee_syntax_inits") + if version < 508 + let did_backbone_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeRamda Constant + + HiLink coffeeRaFunction PreProc + HiLink coffeeRaMath PreProc + HiLink coffeeRaList PreProc + HiLink coffeeRaLogic PreProc + HiLink coffeeRaObject PreProc + HiLink coffeeRaRelation PreProc + HiLink coffeeRaType PreProc + HiLink coffeeRaString PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/ramda.javascript.vim b/autoload/syntax/ramda.javascript.vim new file mode 100644 index 0000000..1fdfe18 --- /dev/null +++ b/autoload/syntax/ramda.javascript.vim @@ -0,0 +1,46 @@ +" Vim syntax file +" Language: Ramda for javascript +" Maintainer: othree +" Last Change: 2016/05/04 +" Version: 0.21.0 +" URL: http://ramdajs.com/ + +syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptRDot +syntax match javascriptRaDot contained /\./ nextgroup=javascriptRFunctions + +syntax cluster javascriptRaaFunctions contains=javascriptRaFunction,javascriptRaMath,javascriptRaList,javascriptRaLogic,javascriptRaObject,javascriptRaRelation,javascriptRaType,javascriptRaString + +syntax keyword javascriptRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap +syntax keyword javascriptRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum +syntax keyword javascriptRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax keyword javascriptRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when +syntax keyword javascriptRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq +syntax keyword javascriptRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith +syntax keyword javascriptRaType contained is isArrayLike isNil propIs type +syntax keyword javascriptRaString contained match replace split test toLower toString toUpper trim + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_backbone_javascript_syntax_inits") + if version < 508 + let did_backbone_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptRamda Constant + + HiLink javascriptRaFunction PreProc + HiLink javascriptRaMath PreProc + HiLink javascriptRaList PreProc + HiLink javascriptRaLogic PreProc + HiLink javascriptRaObject PreProc + HiLink javascriptRaRelation PreProc + HiLink javascriptRaType PreProc + HiLink javascriptRaString PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/ramda.ls.vim b/autoload/syntax/ramda.ls.vim new file mode 100644 index 0000000..3b12e24 --- /dev/null +++ b/autoload/syntax/ramda.ls.vim @@ -0,0 +1,46 @@ +" Vim syntax file +" Language: Ramda for ls +" Maintainer: othree +" Last Change: 2016/05/04 +" Version: 0.21.0 +" URL: http://ramdajs.com/ + +syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsRDot +syntax match lsRaDot contained /\./ nextgroup=lsRFunctions + +syntax cluster lsRaaFunctions contains=lsRaFunction,lsRaMath,lsRaList,lsRaLogic,lsRaObject,lsRaRelation,lsRaType,lsRaString + +syntax keyword lsRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap +syntax keyword lsRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum +syntax keyword lsRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax keyword lsRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when +syntax keyword lsRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq +syntax keyword lsRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith +syntax keyword lsRaType contained is isArrayLike isNil propIs type +syntax keyword lsRaString contained match replace split test toLower toString toUpper trim + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_backbone_ls_syntax_inits") + if version < 508 + let did_backbone_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsRamda Constant + + HiLink lsRaFunction PreProc + HiLink lsRaMath PreProc + HiLink lsRaList PreProc + HiLink lsRaLogic PreProc + HiLink lsRaObject PreProc + HiLink lsRaRelation PreProc + HiLink lsRaType PreProc + HiLink lsRaString PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/ramda.typescript.vim b/autoload/syntax/ramda.typescript.vim new file mode 100644 index 0000000..add2a16 --- /dev/null +++ b/autoload/syntax/ramda.typescript.vim @@ -0,0 +1,46 @@ +" Vim syntax file +" Language: Ramda for typescript +" Maintainer: othree +" Last Change: 2016/05/04 +" Version: 0.21.0 +" URL: http://ramdajs.com/ + +syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptRDot +syntax match typescriptRaDot contained /\./ nextgroup=typescriptRFunctions + +syntax cluster typescriptRaaFunctions contains=typescriptRaFunction,typescriptRaMath,typescriptRaList,typescriptRaLogic,typescriptRaObject,typescriptRaRelation,typescriptRaType,typescriptRaString + +syntax keyword typescriptRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap +syntax keyword typescriptRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum +syntax keyword typescriptRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax keyword typescriptRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when +syntax keyword typescriptRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq +syntax keyword typescriptRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith +syntax keyword typescriptRaType contained is isArrayLike isNil propIs type +syntax keyword typescriptRaString contained match replace split test toLower toString toUpper trim + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_backbone_typescript_syntax_inits") + if version < 508 + let did_backbone_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptRamda Constant + + HiLink typescriptRaFunction PreProc + HiLink typescriptRaMath PreProc + HiLink typescriptRaList PreProc + HiLink typescriptRaLogic PreProc + HiLink typescriptRaObject PreProc + HiLink typescriptRaRelation PreProc + HiLink typescriptRaType PreProc + HiLink typescriptRaString PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index 8a0672e..c1c2f8e 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'react' 'flux' 'handlebars' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From fcf6038295fef212d4195dab598e7781084c2492 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 4 May 2016 13:30:39 +0800 Subject: [PATCH 60/80] Update readme --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 08144f8..6e7f5b5 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Libraries * [Jasmine](http://pivotal.github.io/jasmine/) * [Chai](http://chaijs.com/) * [Handlebars](http://handlebarsjs.com/) +* [Ramda](http://ramdajs.com/) File Types ---------- @@ -34,8 +35,6 @@ File Types * [LiveScript](http://livescript.net/) * [TypeScript](http://www.typescriptlang.org/) -Will be more when SyntaxComplete has new version. - Install ------- @@ -70,6 +69,7 @@ Support libs id: * Jasmine: jasmine * Chai: chai * Handlebars: handlebars +* Ramda: ramda Default lib set is: `jquery,underscore,backbone` @@ -103,6 +103,9 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.5 +* Add Ramda + ### Version 0.4 * Add React, Flux, Chai, Handlbars * Default lib set @@ -151,10 +154,13 @@ Credits * Bruno Michel, [jQuery : Syntax file for jQuery][jquery.vim] * [Peter Renström][], for [summarize and explain AngularJS stuff][issue1]. +* [Benedict Aas][], for [summarize Ramda stuff][issue34] [jquery.vim]:http://www.vim.org/scripts/script.php?script_id=2416 [Peter Renström]:https://github.com/renstrom [issue1]:https://github.com/othree/javascript-libraries-syntax.vim/issues/1 +[Benedict Aas]:https://github.com/Shou +[issue34]:https://github.com/othree/javascript-libraries-syntax.vim/issues/34#issuecomment-216404353 License ------- From 13f752fc7c0ba933c622bc462a924d14d5348530 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 4 May 2016 20:21:54 +0800 Subject: [PATCH 61/80] Fix ramda syntax --- autoload/syntax/ramda.coffee.vim | 13 +++++++------ autoload/syntax/ramda.javascript.vim | 13 +++++++------ autoload/syntax/ramda.ls.vim | 13 +++++++------ autoload/syntax/ramda.typescript.vim | 13 +++++++------ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/autoload/syntax/ramda.coffee.vim b/autoload/syntax/ramda.coffee.vim index 99b72de..aeb4f0f 100644 --- a/autoload/syntax/ramda.coffee.vim +++ b/autoload/syntax/ramda.coffee.vim @@ -5,14 +5,15 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeRDot -syntax match coffeeRaDot contained /\./ nextgroup=coffeeRFunctions +syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeRDot +syntax match coffeeRaDot contained /\./ nextgroup=coffeeRaFunctions -syntax cluster coffeeRaaFunctions contains=coffeeRaFunction,coffeeRaMath,coffeeRaList,coffeeRaLogic,coffeeRaObject,coffeeRaRelation,coffeeRaType,coffeeRaString +syntax cluster coffeeRaFunctions contains=coffeeRaFunction,coffeeRaMath,coffeeRaList,coffeeRaLogic,coffeeRaObject,coffeeRaRelation,coffeeRaType,coffeeRaString syntax keyword coffeeRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap syntax keyword coffeeRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum -syntax keyword coffeeRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax match coffeeRaList contained /contains/ +syntax keyword coffeeRaList contained adjust all allUniq any aperture append chain concat drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith syntax keyword coffeeRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when syntax keyword coffeeRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq syntax keyword coffeeRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith @@ -23,9 +24,9 @@ syntax keyword coffeeRaString contained match replace split test toLower toStrin " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_backbone_coffee_syntax_inits") +if version >= 508 || !exists("did_ramda_coffee_syntax_inits") if version < 508 - let did_backbone_coffee_syntax_inits = 1 + let did_ramda_coffee_syntax_inits = 1 command -nargs=+ HiLink hi link else command -nargs=+ HiLink hi def link diff --git a/autoload/syntax/ramda.javascript.vim b/autoload/syntax/ramda.javascript.vim index 1fdfe18..5c362b2 100644 --- a/autoload/syntax/ramda.javascript.vim +++ b/autoload/syntax/ramda.javascript.vim @@ -5,14 +5,15 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptRDot -syntax match javascriptRaDot contained /\./ nextgroup=javascriptRFunctions +syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptRDot +syntax match javascriptRaDot contained /\./ nextgroup=javascriptRaFunctions -syntax cluster javascriptRaaFunctions contains=javascriptRaFunction,javascriptRaMath,javascriptRaList,javascriptRaLogic,javascriptRaObject,javascriptRaRelation,javascriptRaType,javascriptRaString +syntax cluster javascriptRaFunctions contains=javascriptRaFunction,javascriptRaMath,javascriptRaList,javascriptRaLogic,javascriptRaObject,javascriptRaRelation,javascriptRaType,javascriptRaString syntax keyword javascriptRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap syntax keyword javascriptRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum -syntax keyword javascriptRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax match javascriptRaList contained /contains/ +syntax keyword javascriptRaList contained adjust all allUniq any aperture append chain concat drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith syntax keyword javascriptRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when syntax keyword javascriptRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq syntax keyword javascriptRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith @@ -23,9 +24,9 @@ syntax keyword javascriptRaString contained match replace split test toLower toS " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_backbone_javascript_syntax_inits") +if version >= 508 || !exists("did_ramda_javascript_syntax_inits") if version < 508 - let did_backbone_javascript_syntax_inits = 1 + let did_ramda_javascript_syntax_inits = 1 command -nargs=+ HiLink hi link else command -nargs=+ HiLink hi def link diff --git a/autoload/syntax/ramda.ls.vim b/autoload/syntax/ramda.ls.vim index 3b12e24..dcefbd7 100644 --- a/autoload/syntax/ramda.ls.vim +++ b/autoload/syntax/ramda.ls.vim @@ -5,14 +5,15 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsRDot -syntax match lsRaDot contained /\./ nextgroup=lsRFunctions +syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsRDot +syntax match lsRaDot contained /\./ nextgroup=lsRaFunctions -syntax cluster lsRaaFunctions contains=lsRaFunction,lsRaMath,lsRaList,lsRaLogic,lsRaObject,lsRaRelation,lsRaType,lsRaString +syntax cluster lsRaFunctions contains=lsRaFunction,lsRaMath,lsRaList,lsRaLogic,lsRaObject,lsRaRelation,lsRaType,lsRaString syntax keyword lsRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap syntax keyword lsRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum -syntax keyword lsRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax match lsRaList contained /contains/ +syntax keyword lsRaList contained adjust all allUniq any aperture append chain concat drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith syntax keyword lsRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when syntax keyword lsRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq syntax keyword lsRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith @@ -23,9 +24,9 @@ syntax keyword lsRaString contained match replace split test toLower toString to " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_backbone_ls_syntax_inits") +if version >= 508 || !exists("did_ramda_ls_syntax_inits") if version < 508 - let did_backbone_ls_syntax_inits = 1 + let did_ramda_ls_syntax_inits = 1 command -nargs=+ HiLink hi link else command -nargs=+ HiLink hi def link diff --git a/autoload/syntax/ramda.typescript.vim b/autoload/syntax/ramda.typescript.vim index add2a16..df3ae6d 100644 --- a/autoload/syntax/ramda.typescript.vim +++ b/autoload/syntax/ramda.typescript.vim @@ -5,14 +5,15 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptRDot -syntax match typescriptRaDot contained /\./ nextgroup=typescriptRFunctions +syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptRDot +syntax match typescriptRaDot contained /\./ nextgroup=typescriptRaFunctions -syntax cluster typescriptRaaFunctions contains=typescriptRaFunction,typescriptRaMath,typescriptRaList,typescriptRaLogic,typescriptRaObject,typescriptRaRelation,typescriptRaType,typescriptRaString +syntax cluster typescriptRaFunctions contains=typescriptRaFunction,typescriptRaMath,typescriptRaList,typescriptRaLogic,typescriptRaObject,typescriptRaRelation,typescriptRaType,typescriptRaString syntax keyword typescriptRaFunction contained __ addIndex always ap apply applySpec binary bind call comparator compose composeK composeP construct constructN converge curry curryN empty F flip identity invoker juxt lift liftN memoize nAry nthArg of once partial partialRight pipe pipeK pipeP T tap tryCatch unapply unary uncurryN useWith wrap syntax keyword typescriptRaMath contained add dec divide inc mathMod mean median modulo multiply negate product subtract sum -syntax keyword typescriptRaList contained adjust all allUniq any aperture append chain concat contains drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith +syntax match typescriptRaList contained /contains/ +syntax keyword typescriptRaList contained adjust all allUniq any aperture append chain concat drop dropLast dropLastWhile dropRepeats dropRepeatsWith dropWhile filter find findIndex findLast findLastIndex flatten forEach fromPairs groupBy groupWith head indexBy indexOf init insert insertAll intersperse into join last lastIndexOf length map mapAccum mapAccumRight mergeAll none nth pair partition pluck prepend range reduce reduceBy reduced reduceRight reject remove repeat reverse scan sequence slice sort splitAt splitEvery splitWhen tail take takeLast takeLastWhile takeWhile times transduce transpose traverse unfold uniq uniqBy uniqWith unnest update without xprod zip zipObj zipWith syntax keyword typescriptRaLogic contained allPass and anyPass both complement cond defaultTo either ifElse isEmpty not or pathSatisfies propSatisfies unless until when syntax keyword typescriptRaObject contained assoc assocPath clone dissoc dissocPath eqProps evolve has hasIn invert invertObj keys keysIn lens lensIndex lensPath lensProp mapObjIndexed merge mergeWith mergeWithKey objOf omit over path pathOr pick pickAll pickBy project prop propOr props set toPairs toPairsIn values valuesIn view where whereEq syntax keyword typescriptRaRelation contained clamp countBy difference differenceWith eqBy equals gt gte identical intersection intersectionWith lt lte max maxBy min minBy pathEq propEq sortBy symmetricDifference symmetricDifferenceWith union unionWith @@ -23,9 +24,9 @@ syntax keyword typescriptRaString contained match replace split test toLower toS " Define the default highlighting. " For version 5.7 and earlier: only when not done already " For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_backbone_typescript_syntax_inits") +if version >= 508 || !exists("did_ramda_typescript_syntax_inits") if version < 508 - let did_backbone_typescript_syntax_inits = 1 + let did_ramda_typescript_syntax_inits = 1 command -nargs=+ HiLink hi link else command -nargs=+ HiLink hi def link From 9cea41e1fcf9bc9c72c9682c4faccde286c3bc27 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Thu, 30 Jun 2016 11:33:19 +0200 Subject: [PATCH 62/80] Add Angular component type --- autoload/syntax/angularjs.javascript.vim | 4 ++-- autoload/syntax/angularjs.ls.vim | 4 ++-- autoload/syntax/angularjs.typescript.vim | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index ad6d087..75db0a8 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -58,8 +58,8 @@ syntax keyword javascriptAScookieStoreMethods contained get put remove syntax cluster javascriptAFunctions contains=javascriptAMFunctions syntax cluster javascriptAAttrs contains=javascriptAMAttrs -syntax keyword javascriptAMFunctions contained config constant controller directive factory -syntax keyword javascriptAMFunctions contained filter provider run service value +syntax keyword javascriptAMFunctions contained config constant controller component directive +syntax keyword javascriptAMFunctions contained factory filter provider run service value syntax keyword javascriptAMAttrs contained name requires diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index f60b395..52b5e0f 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -58,8 +58,8 @@ syntax keyword lsAScookieStoreMethods contained get put remove syntax cluster lsAFunctions contains=lsAMFunctions syntax cluster lsAAttrs contains=lsAMAttrs -syntax keyword lsAMFunctions contained config constant controller directive factory -syntax keyword lsAMFunctions contained filter provider run service value +syntax keyword lsAMFunctions contained config constant controller component directive +syntax keyword lsAMFunctions contained factory filter provider run service value syntax keyword lsAMAttrs contained name requires diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index 568fbbc..4a4fcb7 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -58,8 +58,8 @@ syntax keyword typescriptAScookieStoreMethods contained get put remove syntax cluster typescriptAFunctions contains=typescriptAMFunctions syntax cluster typescriptAAttrs contains=typescriptAMAttrs -syntax keyword typescriptAMFunctions contained config constant controller directive factory -syntax keyword typescriptAMFunctions contained filter provider run service value +syntax keyword typescriptAMFunctions contained config constant controller component directive +syntax keyword typescriptAMFunctions contained factory filter provider run service value syntax keyword typescriptAMAttrs contained name requires From 2aba8f485c5e60f723d5ef62201818a462b086c2 Mon Sep 17 00:00:00 2001 From: othree Date: Sat, 1 Oct 2016 00:16:10 +0800 Subject: [PATCH 63/80] Fix #55, add $element and $attributes to AngularJS --- autoload/syntax/angularjs.coffee.vim | 6 ++++++ autoload/syntax/angularjs.javascript.vim | 6 ++++++ autoload/syntax/angularjs.ls.vim | 6 ++++++ autoload/syntax/angularjs.typescript.vim | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 14c598c..0f1713a 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -18,6 +18,11 @@ syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineCommen syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $locale $parse $rootElement syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $routeParams $templateCache $window syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $cookies $resource $sanitize +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $element + +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $attributes nextgroup=coffeeASattributesdot +syntax match coffeeASattributesdot contained /\./ nextgroup=coffeeASattributesMethods +syntax keyword coffeeASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $http nextgroup=coffeeAShttpdot syntax match coffeeAShttpdot contained /\./ nextgroup=coffeeAShttpMethods @@ -81,6 +86,7 @@ if version >= 508 || !exists("did_angularjs_coffee_syntax_inits") HiLink coffeeAMFunctions PreProc HiLink coffeeAMAttrs PreProc + HiLink coffeeASattributesMethods PreProc HiLink coffeeAShttpMethods PreProc HiLink coffeeASinterpolateMethods PreProc HiLink coffeeASlocationMethods PreProc diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index 75db0a8..f0e1633 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -18,6 +18,11 @@ syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascri syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $locale $parse $rootElement syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $routeParams $templateCache $window syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $cookies $resource $sanitize +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $element + +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $attributes nextgroup=javascriptASattributesdot +syntax match javascriptASattributesdot contained /\./ nextgroup=javascriptASattributesMethods +syntax keyword javascriptASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $http nextgroup=javascriptAShttpdot syntax match javascriptAShttpdot contained /\./ nextgroup=javascriptAShttpMethods @@ -81,6 +86,7 @@ if version >= 508 || !exists("did_angularjs_javascript_syntax_inits") HiLink javascriptAMFunctions PreProc HiLink javascriptAMAttrs PreProc + HiLink javascriptASattributesMethods PreProc HiLink javascriptAShttpMethods PreProc HiLink javascriptASinterpolateMethods PreProc HiLink javascriptASlocationMethods PreProc diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index 52b5e0f..22be190 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -18,6 +18,11 @@ syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $ syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $locale $parse $rootElement syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $routeParams $templateCache $window syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $cookies $resource $sanitize +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $element + +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $attributes nextgroup=lsASattributesdot +syntax match lsASattributesdot contained /\./ nextgroup=lsASattributesMethods +syntax keyword lsASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $http nextgroup=lsAShttpdot syntax match lsAShttpdot contained /\./ nextgroup=lsAShttpMethods @@ -81,6 +86,7 @@ if version >= 508 || !exists("did_angularjs_ls_syntax_inits") HiLink lsAMFunctions PreProc HiLink lsAMAttrs PreProc + HiLink lsASattributesMethods PreProc HiLink lsAShttpMethods PreProc HiLink lsASinterpolateMethods PreProc HiLink lsASlocationMethods PreProc diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index 4a4fcb7..81a3641 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -18,6 +18,11 @@ syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescri syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $locale $parse $rootElement syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $routeParams $templateCache $window syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $cookies $resource $sanitize +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $element + +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $attributes nextgroup=typescriptASattributesdot +syntax match typescriptASattributesdot contained /\./ nextgroup=typescriptASattributesMethods +syntax keyword typescriptASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $http nextgroup=typescriptAShttpdot syntax match typescriptAShttpdot contained /\./ nextgroup=typescriptAShttpMethods @@ -81,6 +86,7 @@ if version >= 508 || !exists("did_angularjs_typescript_syntax_inits") HiLink typescriptAMFunctions PreProc HiLink typescriptAMAttrs PreProc + HiLink typescriptASattributesMethods PreProc HiLink typescriptAShttpMethods PreProc HiLink typescriptASinterpolateMethods PreProc HiLink typescriptASlocationMethods PreProc From e7624e9bc190891d689f4348a4a5e784861b1211 Mon Sep 17 00:00:00 2001 From: othree Date: Sat, 1 Oct 2016 00:27:44 +0800 Subject: [PATCH 64/80] Update angularjs modified date --- autoload/syntax/angularjs.coffee.vim | 6 +++--- autoload/syntax/angularjs.javascript.vim | 2 +- autoload/syntax/angularjs.ls.vim | 2 +- autoload/syntax/angularjs.typescript.vim | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 0f1713a..81a2732 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: AngularJS for coffee " Maintainer: othree -" Last Change: 2013/07/26 +" Last Change: 2016/10/11 " Version: 1.1.13.1 " URL: http://angularjs.org/ @@ -63,8 +63,8 @@ syntax keyword coffeeAScookieStoreMethods contained get put remove syntax cluster coffeeAFunctions contains=coffeeAMFunctions syntax cluster coffeeAAttrs contains=coffeeAMAttrs -syntax keyword coffeeAMFunctions contained config constant controller directive factory -syntax keyword coffeeAMFunctions contained filter provider run service value +syntax keyword coffeeAMFunctions contained config constant controller component directive +syntax keyword coffeeAMFunctions contained factory filter provider run service value syntax keyword coffeeAMAttrs contained name requires diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index f0e1633..0d5dabb 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: AngularJS for javascript " Maintainer: othree -" Last Change: 2013/07/26 +" Last Change: 2016/10/11 " Version: 1.1.13.1 " URL: http://angularjs.org/ diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index 22be190..74fa06b 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: AngularJS for ls " Maintainer: othree -" Last Change: 2013/07/26 +" Last Change: 2016/10/11 " Version: 1.1.13.1 " URL: http://angularjs.org/ diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index 81a3641..c27ca3a 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: AngularJS for typescript " Maintainer: othree -" Last Change: 2013/07/26 +" Last Change: 2016/10/11 " Version: 1.1.13.1 " URL: http://angularjs.org/ From e7600911c99adfd56708ad1e222685723df948ff Mon Sep 17 00:00:00 2001 From: othree Date: Sat, 1 Oct 2016 00:36:51 +0800 Subject: [PATCH 65/80] Add vue.js html special attributes --- autoload/syntax/vue.html.vim | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 autoload/syntax/vue.html.vim diff --git a/autoload/syntax/vue.html.vim b/autoload/syntax/vue.html.vim new file mode 100644 index 0000000..149dd67 --- /dev/null +++ b/autoload/syntax/vue.html.vim @@ -0,0 +1,15 @@ +" Vim syntax file +" Language: vue.js for HTML +" Maintainer: othree +" Last Change: 2016/10/11 +" Version: 1.0.27 +" URL: https://vuejs.org + +setlocal iskeyword+=- + +syntax keyword htmlArg contained v-text v-html v-if v-show v-else +syntax keyword htmlArg contained v-for v-on v-bind v-model v-ref +syntax keyword htmlArg contained v-el v-pre v-cloak + + + From a95d528066329d7523dae843d97129359d04cc13 Mon Sep 17 00:00:00 2001 From: Morton Fox Date: Sat, 1 Oct 2016 00:06:00 -0400 Subject: [PATCH 66/80] Update link to Jasmine --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e7f5b5..fb46a45 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Libraries * [Flux](https://facebook.github.io/flux/) * [RequireJS](http://requirejs.org/) * [Sugar.js](http://sugarjs.com/) -* [Jasmine](http://pivotal.github.io/jasmine/) +* [Jasmine](https://jasmine.github.io/) * [Chai](http://chaijs.com/) * [Handlebars](http://handlebarsjs.com/) * [Ramda](http://ramdajs.com/) From 07293176a2c8f088189ff27382fa57c218a5b9a3 Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 7 Oct 2016 18:15:23 +0800 Subject: [PATCH 67/80] Add Vue.js support --- README.md | 5 +++ autoload/jslibsyntax.vim | 3 +- autoload/syntax/postprocess.javascript.vim | 3 +- autoload/syntax/update.sh | 2 +- autoload/syntax/vue.coffee.vim | 45 ++++++++++++++++++++++ autoload/syntax/vue.html.vim | 33 +++++++++++++--- autoload/syntax/vue.javascript.vim | 45 ++++++++++++++++++++++ autoload/syntax/vue.ls.vim | 45 ++++++++++++++++++++++ autoload/syntax/vue.typescript.vim | 45 ++++++++++++++++++++++ config.mk | 2 +- 10 files changed, 219 insertions(+), 9 deletions(-) create mode 100644 autoload/syntax/vue.coffee.vim create mode 100644 autoload/syntax/vue.javascript.vim create mode 100644 autoload/syntax/vue.ls.vim create mode 100644 autoload/syntax/vue.typescript.vim diff --git a/README.md b/README.md index 6e7f5b5..409021c 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Libraries * [Chai](http://chaijs.com/) * [Handlebars](http://handlebarsjs.com/) * [Ramda](http://ramdajs.com/) +* [Vue](https://vuejs.org/) File Types ---------- @@ -70,6 +71,7 @@ Support libs id: * Chai: chai * Handlebars: handlebars * Ramda: ramda +* Vue.js: vue Default lib set is: `jquery,underscore,backbone` @@ -103,6 +105,9 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.6 +* Add Vue.js + ### Version 0.5 * Add Ramda diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 6d5b782..8504c33 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -20,7 +20,8 @@ let s:libs = [ \ 'ramda', \ 'react', \ 'flux', - \ 'handlebars' + \ 'handlebars', + \ 'vue' \ ] let s:default_libs = [ diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index 98e410c..87eb78b 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: JS Lib syntax post process for javascript " Maintainer: othree -" Last Change: 2016/05/04 +" Last Change: 2016/10/07 " Version: 0.5 " URL: https://github.com/othree/javascript-libraries-syntax.vim " @@ -11,6 +11,7 @@ syntax cluster props add=@javascriptpFunctions,@javascriptAFunctions,@javascript syntax cluster props add=@javascriptRaFunctions syntax cluster props add=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs syntax cluster props add=@javascriptRProp +syntax cluster props add=@javascriptVFunctions,javascriptVAttrs if !exists("javascript_props") syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@props diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index c1c2f8e..d679d28 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' 'vue' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done diff --git a/autoload/syntax/vue.coffee.vim b/autoload/syntax/vue.coffee.vim new file mode 100644 index 0000000..dd95d56 --- /dev/null +++ b/autoload/syntax/vue.coffee.vim @@ -0,0 +1,45 @@ +" Vim syntax file +" Language: vue.js for JavaScript +" Maintainer: othree +" Last Change: 2016/10/07 +" Version: 2.0 +" URL: https://vuejs.org + +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'coffee' + setlocal iskeyword+=$ +endif + +syntax keyword coffeeVue Vue vm containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution + +" Vue.* +syntax cluster coffeeVFunctions contains=coffeeVAPI,coffeeVMethods +syntax cluster coffeeVAttrs contains=coffeeVConfig,coffeeVProp + +syntax keyword coffeeVConfig contained config silent optionMergeStrategies devtools errorHandler keyCodes + +syntax keyword coffeeVAPI contained extend nextTick set delete directive filter component use mixin compile + +syntax keyword coffeeVProp contained $data $el $options $parent $root $children $slots $refs $isServer +syntax keyword coffeeVMethods contained $watch $set $delete $on $once $off $emit $mount $forceUpdate $nextTick $destory + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_coffee_syntax_inits") + if version < 508 + let did_jquery_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeVMethods Constant + + HiLink coffeeVConfig PreProc + HiLink coffeeVProp PreProc + HiLink coffeeVMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/vue.html.vim b/autoload/syntax/vue.html.vim index 149dd67..40b05ab 100644 --- a/autoload/syntax/vue.html.vim +++ b/autoload/syntax/vue.html.vim @@ -1,15 +1,38 @@ " Vim syntax file -" Language: vue.js for HTML +" Language: vue.js for HTML " Maintainer: othree -" Last Change: 2016/10/11 -" Version: 1.0.27 +" Last Change: 2016/10/07 +" Version: 2.0 " URL: https://vuejs.org setlocal iskeyword+=- syntax keyword htmlArg contained v-text v-html v-if v-show v-else -syntax keyword htmlArg contained v-for v-on v-bind v-model v-ref -syntax keyword htmlArg contained v-el v-pre v-cloak +syntax keyword htmlArg contained v-for v-pre v-cloak v-once +syntax keyword htmlArg contained key ref slot +syntax keyword htmlArg contained v-on nextgroup=vueOnColon +syntax match vueOnColon contained /:/ nextgroup=vueEvents +syntax match htmlArg contained /@/ nextgroup=vueEvents +syntax match vueEvents contained /\k\+/ nextgroup=vueEventsModDot +syntax match vueEventModDot contained /\./ nextgroup=vueEventMod +syntax keyword vueEventMod contained stop prevent capture self keyCode keyAlias native +syntax keyword htmlArg contained v-on nextgroup=vueBindColon +syntax match vueBindColon contained /:/ nextgroup=vueBindTarget +syntax match htmlArg contained /@/ nextgroup=vueBindTarget +syntax match vueBindTarget contained /\k\+/ nextgroup=vueBindModDot +syntax match vueBindModDot contained /\./ nextgroup=vueBindMod +syntax keyword vueBindMod contained prop + +syntax keyword htmlArg contained v-model nextgroup=vueModelModDot +syntax match vueModelModDot contained /\./ nextgroup=vueModelMod +syntax keyword vueModelMod contained lazy number trim + +syntax keyword htmlTagName contained component transition transition-group keep-alive slot + +" transition attributes +syntax keyword htmlArg contained appear css mode enter-class leave-class enter-active-class leave-active-class appear-class appear-active-class +" transition-group attributes +syntax keyword htmlArg contained tag move-class diff --git a/autoload/syntax/vue.javascript.vim b/autoload/syntax/vue.javascript.vim new file mode 100644 index 0000000..13af9f5 --- /dev/null +++ b/autoload/syntax/vue.javascript.vim @@ -0,0 +1,45 @@ +" Vim syntax file +" Language: vue.js for JavaScript +" Maintainer: othree +" Last Change: 2016/10/07 +" Version: 2.0 +" URL: https://vuejs.org + +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'javascript' + setlocal iskeyword+=$ +endif + +syntax keyword javascriptVue Vue vm containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution + +" Vue.* +syntax cluster javascriptVFunctions contains=javascriptVAPI,javascriptVMethods +syntax cluster javascriptVAttrs contains=javascriptVConfig,javascriptVProp + +syntax keyword javascriptVConfig contained config silent optionMergeStrategies devtools errorHandler keyCodes + +syntax keyword javascriptVAPI contained extend nextTick set delete directive filter component use mixin compile + +syntax keyword javascriptVProp contained $data $el $options $parent $root $children $slots $refs $isServer +syntax keyword javascriptVMethods contained $watch $set $delete $on $once $off $emit $mount $forceUpdate $nextTick $destory + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_javascript_syntax_inits") + if version < 508 + let did_jquery_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptVMethods Constant + + HiLink javascriptVConfig PreProc + HiLink javascriptVProp PreProc + HiLink javascriptVMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/vue.ls.vim b/autoload/syntax/vue.ls.vim new file mode 100644 index 0000000..ff39418 --- /dev/null +++ b/autoload/syntax/vue.ls.vim @@ -0,0 +1,45 @@ +" Vim syntax file +" Language: vue.js for JavaScript +" Maintainer: othree +" Last Change: 2016/10/07 +" Version: 2.0 +" URL: https://vuejs.org + +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'ls' + setlocal iskeyword+=$ +endif + +syntax keyword lsVue Vue vm containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution + +" Vue.* +syntax cluster lsVFunctions contains=lsVAPI,lsVMethods +syntax cluster lsVAttrs contains=lsVConfig,lsVProp + +syntax keyword lsVConfig contained config silent optionMergeStrategies devtools errorHandler keyCodes + +syntax keyword lsVAPI contained extend nextTick set delete directive filter component use mixin compile + +syntax keyword lsVProp contained $data $el $options $parent $root $children $slots $refs $isServer +syntax keyword lsVMethods contained $watch $set $delete $on $once $off $emit $mount $forceUpdate $nextTick $destory + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_ls_syntax_inits") + if version < 508 + let did_jquery_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsVMethods Constant + + HiLink lsVConfig PreProc + HiLink lsVProp PreProc + HiLink lsVMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/vue.typescript.vim b/autoload/syntax/vue.typescript.vim new file mode 100644 index 0000000..0811707 --- /dev/null +++ b/autoload/syntax/vue.typescript.vim @@ -0,0 +1,45 @@ +" Vim syntax file +" Language: vue.js for JavaScript +" Maintainer: othree +" Last Change: 2016/10/07 +" Version: 2.0 +" URL: https://vuejs.org + +setlocal iskeyword-=$ +if exists("b:current_syntax") && b:current_syntax == 'typescript' + setlocal iskeyword+=$ +endif + +syntax keyword typescriptVue Vue vm containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution + +" Vue.* +syntax cluster typescriptVFunctions contains=typescriptVAPI,typescriptVMethods +syntax cluster typescriptVAttrs contains=typescriptVConfig,typescriptVProp + +syntax keyword typescriptVConfig contained config silent optionMergeStrategies devtools errorHandler keyCodes + +syntax keyword typescriptVAPI contained extend nextTick set delete directive filter component use mixin compile + +syntax keyword typescriptVProp contained $data $el $options $parent $root $children $slots $refs $isServer +syntax keyword typescriptVMethods contained $watch $set $delete $on $once $off $emit $mount $forceUpdate $nextTick $destory + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jquery_typescript_syntax_inits") + if version < 508 + let did_jquery_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptVMethods Constant + + HiLink typescriptVConfig PreProc + HiLink typescriptVProp PreProc + HiLink typescriptVMethods PreProc + + delcommand HiLink +endif diff --git a/config.mk b/config.mk index 2c4980e..8fb8467 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ NAME=javascript-libraries-syntax.vim -VERSION=0.4 +VERSION=0.6 bundle-deps: $(call fetch_github,ID,REPOSITORY,BRANCH,PATH,TARGET_PATH) From e5d5f6463283ee1593d888ecff07f9c8c6eee776 Mon Sep 17 00:00:00 2001 From: sfinktah Date: Fri, 11 Nov 2016 17:14:26 +1100 Subject: [PATCH 68/80] Sfinktah - d3 (version 4) (#58) * Added d3.v4 syntax [time 07:17] * reversed jQuery change from d3 branch. This reverts commit d3cb02e49e0663abe4256be9ee52216a2c03a047. --- autoload/jslibsyntax.vim | 3 +- autoload/syntax/d3.coffee.vim | 109 ++++++++++++++++++++++++++++++ autoload/syntax/d3.javascript.vim | 109 ++++++++++++++++++++++++++++++ autoload/syntax/d3.ls.vim | 109 ++++++++++++++++++++++++++++++ autoload/syntax/d3.typescript.vim | 109 ++++++++++++++++++++++++++++++ 5 files changed, 438 insertions(+), 1 deletion(-) create mode 100644 autoload/syntax/d3.coffee.vim create mode 100644 autoload/syntax/d3.javascript.vim create mode 100644 autoload/syntax/d3.ls.vim create mode 100644 autoload/syntax/d3.typescript.vim diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index 8504c33..f32be96 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -1,7 +1,7 @@ " Vim plugin file " Language: JS Lib syntax loader " Maintainer: othree -" Last Change: 2014/10/30 +" Last Change: 2016/11/11 " Version: 0.4 " URL: https://github.com/othree/javascript-libraries-syntax.vim @@ -21,6 +21,7 @@ let s:libs = [ \ 'react', \ 'flux', \ 'handlebars', + \ 'd3', \ 'vue' \ ] diff --git a/autoload/syntax/d3.coffee.vim b/autoload/syntax/d3.coffee.vim new file mode 100644 index 0000000..ebbbc56 --- /dev/null +++ b/autoload/syntax/d3.coffee.vim @@ -0,0 +1,109 @@ +" Vim syntax file +" Language: d3.v4 for coffee +" Maintainer: othree +" Maintainer: Sfinktah +" Last Change: 2016/11/11 +" Version: 4.2.8.0 +" URL: https://github.com/d3/d3/blob/master/API.md + +syntax keyword coffeeD3 d3 containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax cluster coffee_Functions contains=@coffeeD3Arrays,coffeeD3Axes,coffeeD3Brushes,coffeeD3Chords,@coffeeD3Collections,coffeeD3Colors,coffeeD3Dispatches,coffeeD3Dragging,coffeeD3DelimiterSeparatedValues,coffeeD3Easings,coffeeD3Forces,coffeeD3NumberFormats,coffeeD3Geographies,coffeeD3GeographiesStreams,coffeeD3GeographiesTransforms,coffeeD3Hierarchies,coffeeD3Interpolators,coffeeD3Paths,coffeeD3Polygons,coffeeD3Quadtrees,coffeeD3Queues,coffeeD3RandomNumbers,coffeeD3Requests,coffeeD3Scales,coffeeD3Selections,coffeeD3Shapes,coffeeD3TimeFormats,coffeeD3TimeIntervals,coffeeD3Timers,coffeeD3Transitions,coffeeD3VoronoiDiagrams,coffeeD3Zooming + +syntax cluster coffeeD3Arrays contains=coffeeD3ArraysStatistics,coffeeD3ArraysSearch,coffeeD3ArraysTransformations,coffeeD3ArraysHistograms,coffeeD3Axes,coffeeD3Arrays +syntax keyword coffeeD3ArraysStatistics contained min max extent sum mean median quantile variance deviation +syntax keyword coffeeD3ArraysSearch contained scan bisect bisectRight bisectLeft bisector ascending descending +syntax keyword coffeeD3ArraysTransformations contained merge pairs permute shuffle ticks tickStep range transpose zip +syntax keyword coffeeD3ArraysHistograms contained histogram thresholdFreedmanDiaconis thresholdScott thresholdSturges +syntax keyword coffeeD3Axes contained axisTop axisRight axisBottom axisLeft +syntax keyword coffeeD3Brushes contained brush brushX brushY brushSelection +syntax keyword coffeeD3Chords contained chord ribbon + +syntax cluster coffeeD3Collections contains=coffeeD3CollectionsObjects,coffeeD3CollectionsMaps,coffeeD3CollectionsSets,coffeeD3CollectionsNests +syntax keyword coffeeD3CollectionsObjects contained keys values entries +syntax keyword coffeeD3CollectionsMaps contained map +syntax keyword coffeeD3CollectionsSets contained set +syntax keyword coffeeD3CollectionsNests contained nest + +syntax keyword coffeeD3Colors contained color rgb hsl lab hcl cubehelix +syntax keyword coffeeD3Dispatches contained dispatch +syntax keyword coffeeD3Dragging contained drag dragDisable dragEnable +syntax keyword coffeeD3DelimiterSeparatedValues contained dsvFormat csvParse csvParseRows csvFormat csvFormatRows tsvParse tsvParseRows tsvFormat tsvFormatRows +syntax keyword coffeeD3Easings contained easeLinear easePolyIn easePolyOut easePolyInOut easeQuad easeQuadIn easeQuadOut easeQuadInOut easeCubic easeCubicIn easeCubicOut easeCubicInOut easeSin easeSinIn easeSinOut easeSinInOut easeExp easeExpIn easeExpOut easeExpInOut easeCircle easeCircleIn easeCircleOut easeCircleInOut easeElastic easeElasticIn easeElasticOut easeElasticInOut easeBack easeBackIn easeBackOut easeBackInOut easeBounce easeBounceIn easeBounceOut easeBounceInOut +syntax keyword coffeeD3Forces contained forceSimulation forceCenter forceCollide forceLink forceManyBody forceX forceY +syntax keyword coffeeD3NumberFormats contained format formatPrefix formatSpecifier formatLocale formatDefaultLocale precisionFixed precisionPrefix precisionRound +syntax keyword coffeeD3Geographies contained geoPath geoAlbers geoAlbersUsa geoAzimuthalEqualArea geoAzimuthalEquidistant geoConicConformal geoConicEqualArea geoConicEquidistant geoEquirectangular geoGnomonic geoMercator geoOrthographic geoStereographic geoTransverseMercator geoProjection geoProjectionMutator geoAzimuthalEqualAreaRaw geoAzimuthalEquidistantRaw geoConicConformalRaw geoConicEqualAreaRaw geoConicEquidistantRaw geoEquirectangularRaw geoGnomonicRaw geoMercatorRaw geoOrthographicRaw geoStereographicRaw geoTransverseMercatorRaw geoArea geoBounds geoCentroid geoDistance geoLength geoInterpolate geoRotation geoCircle geoGraticule geoClipExtent +syntax keyword coffeeD3GeographiesStreams contained geoStream +syntax keyword coffeeD3GeographiesTransforms contained geoIdentity geoTransform +syntax keyword coffeeD3Hierarchies contained hierarchy stratify cluster tree treemap treemapBinary treemapDice treemapSlice treemapSliceDice treemapSquarify treemapResquarify partition pack packSiblings packEnclose +syntax keyword coffeeD3Interpolators contained interpolate interpolateArray interpolateDate interpolateNumber interpolateObject interpolateRound interpolateString interpolateTransformCss interpolateTransformSvg interpolateZoom interpolateRgb interpolateRgbBasis interpolateRgbBasisClosed interpolateHsl interpolateHslLong interpolateLab interpolateHcl interpolateHclLong interpolateCubehelix interpolateCubehelixLong interpolateBasis interpolateBasisClosed quantize +syntax keyword coffeeD3Paths contained path +syntax keyword coffeeD3Polygons contained polygonArea polygonCentroid polygonHull polygonContains polygonLength +syntax keyword coffeeD3Quadtrees contained quadtree +syntax keyword coffeeD3Queues contained queue +syntax keyword coffeeD3RandomNumbers contained randomUniform randomNormal randomLogNormal randomBates randomIrwinHall randomExponential +syntax keyword coffeeD3Requests contained request csv html json text tsv xml +syntax keyword coffeeD3Scales contained scaleLinear scalePow scaleSqrt scaleLog scaleIdentity scaleTime scaleUtc scaleSequential interpolateViridis interpolateInferno interpolateMagma interpolatePlasma interpolateWarm interpolateCool interpolateRainbow interpolateCubehelixDefault scaleQuantize scaleQuantile scaleThreshold scaleOrdinal scaleImplicit scaleBand scalePoint schemeCategory10 schemeCategory20 schemeCategory20b schemeCategory20c +syntax keyword coffeeD3Selections contained selection select selectAll matcher selector selectorAll window creator event customEvent mouse touch touches local namespace namespaces +syntax keyword coffeeD3Shapes contained arc pie line radialLine area radialArea curveBasis curveBasisClosed curveBasisOpen curveBundle curveCardinal curveCardinalClosed curveCardinalOpen curveCatmullRom curveCatmullRomClosed curveCatmullRomOpen curveLinear curveLinearClosed curveMonotoneX curveMonotoneY curveNatural curveStep curveStepAfter curveStepBefore symbol symbols symbolCircle symbolCross symbolDiamond symbolSquare symbolStar symbolTriangle symbolWye stack stackOrderAscending stackOrderDescending stackOrderInsideOut stackOrderNone stackOrderReverse stackOffsetExpand stackOffsetNone stackOffsetSilhouette stackOffsetWiggle +syntax keyword coffeeD3TimeFormats contained timeFormat timeParse utcFormat utcParse isoFormat isoParse timeFormatLocale timeFormatDefaultLocale +syntax keyword coffeeD3TimeIntervals contained timeInterval timeMillisecond utcMillisecond timeMilliseconds utcMilliseconds timeSecond utcSecond timeSeconds utcSeconds timeMinute utcMinute timeMinutes utcMinutes timeHour utcHour timeHours utcHours timeDay utcDay timeDays utcDays timeWeek utcWeek timeWeeks utcWeeks timeSunday utcSunday timeSundays utcSundays timeMonday utcMonday timeMondays utcMondays timeTuesday utcTuesday timeTuesdays utcTuesdays timeWednesday utcWednesday timeWednesdays utcWednesdays timeThursday utcThursday timeThursdays utcThursdays timeFriday utcFriday timeFridays utcFridays timeSaturday utcSaturday timeSaturdays utcSaturdays timeMonth utcMonth timeMonths utcMonths timeYear utcYear timeYears utcYears +syntax keyword coffeeD3Timers contained now timer timerFlush timeout interval +syntax keyword coffeeD3Transitions contained transition active interrupt +syntax keyword coffeeD3VoronoiDiagrams contained voronoi +syntax keyword coffeeD3Zooming contained zoom zoomTransform zoomIdentity + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_coffee_syntax_inits") + if version < 508 + let did_underscore_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeD3 Constant + HiLink coffeeD3ArraysStatistics PreProc + HiLink coffeeD3ArraysSearch PreProc + HiLink coffeeD3ArraysTransformations PreProc + HiLink coffeeD3ArraysHistograms PreProc + HiLink coffeeD3Axes PreProc + HiLink coffeeD3Brushes PreProc + HiLink coffeeD3Chords PreProc + HiLink coffeeD3CollectionsObjects PreProc + HiLink coffeeD3CollectionsMaps PreProc + HiLink coffeeD3CollectionsSets PreProc + HiLink coffeeD3CollectionsNests PreProc + HiLink coffeeD3Colors PreProc + HiLink coffeeD3Dispatches PreProc + HiLink coffeeD3Dragging PreProc + HiLink coffeeD3DelimiterSeparatedValues PreProc + HiLink coffeeD3Easings PreProc + HiLink coffeeD3Forces PreProc + HiLink coffeeD3NumberFormats PreProc + HiLink coffeeD3Geographies PreProc + HiLink coffeeD3GeographiesStreams PreProc + HiLink coffeeD3GeographiesTransforms PreProc + HiLink coffeeD3Hierarchies PreProc + HiLink coffeeD3Interpolators PreProc + HiLink coffeeD3Paths PreProc + HiLink coffeeD3Polygons PreProc + HiLink coffeeD3Quadtrees PreProc + HiLink coffeeD3Queues PreProc + HiLink coffeeD3RandomNumbers PreProc + HiLink coffeeD3Requests PreProc + HiLink coffeeD3Scales PreProc + HiLink coffeeD3Selections PreProc + HiLink coffeeD3Shapes PreProc + HiLink coffeeD3TimeFormats PreProc + HiLink coffeeD3TimeIntervals PreProc + HiLink coffeeD3Timers PreProc + HiLink coffeeD3Transitions PreProc + HiLink coffeeD3VoronoiDiagrams PreProc + HiLink coffeeD3Zooming PreProc + + delcommand HiLink +endif + + diff --git a/autoload/syntax/d3.javascript.vim b/autoload/syntax/d3.javascript.vim new file mode 100644 index 0000000..0da5faa --- /dev/null +++ b/autoload/syntax/d3.javascript.vim @@ -0,0 +1,109 @@ +" Vim syntax file +" Language: d3.v4 for javascript +" Maintainer: othree +" Maintainer: Sfinktah +" Last Change: 2016/11/11 +" Version: 4.2.8.0 +" URL: https://github.com/d3/d3/blob/master/API.md + +syntax keyword javascriptD3 d3 containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax cluster javascript_Functions contains=@javascriptD3Arrays,javascriptD3Axes,javascriptD3Brushes,javascriptD3Chords,@javascriptD3Collections,javascriptD3Colors,javascriptD3Dispatches,javascriptD3Dragging,javascriptD3DelimiterSeparatedValues,javascriptD3Easings,javascriptD3Forces,javascriptD3NumberFormats,javascriptD3Geographies,javascriptD3GeographiesStreams,javascriptD3GeographiesTransforms,javascriptD3Hierarchies,javascriptD3Interpolators,javascriptD3Paths,javascriptD3Polygons,javascriptD3Quadtrees,javascriptD3Queues,javascriptD3RandomNumbers,javascriptD3Requests,javascriptD3Scales,javascriptD3Selections,javascriptD3Shapes,javascriptD3TimeFormats,javascriptD3TimeIntervals,javascriptD3Timers,javascriptD3Transitions,javascriptD3VoronoiDiagrams,javascriptD3Zooming + +syntax cluster javascriptD3Arrays contains=javascriptD3ArraysStatistics,javascriptD3ArraysSearch,javascriptD3ArraysTransformations,javascriptD3ArraysHistograms,javascriptD3Axes,javascriptD3Arrays +syntax keyword javascriptD3ArraysStatistics contained min max extent sum mean median quantile variance deviation +syntax keyword javascriptD3ArraysSearch contained scan bisect bisectRight bisectLeft bisector ascending descending +syntax keyword javascriptD3ArraysTransformations contained merge pairs permute shuffle ticks tickStep range transpose zip +syntax keyword javascriptD3ArraysHistograms contained histogram thresholdFreedmanDiaconis thresholdScott thresholdSturges +syntax keyword javascriptD3Axes contained axisTop axisRight axisBottom axisLeft +syntax keyword javascriptD3Brushes contained brush brushX brushY brushSelection +syntax keyword javascriptD3Chords contained chord ribbon + +syntax cluster javascriptD3Collections contains=javascriptD3CollectionsObjects,javascriptD3CollectionsMaps,javascriptD3CollectionsSets,javascriptD3CollectionsNests +syntax keyword javascriptD3CollectionsObjects contained keys values entries +syntax keyword javascriptD3CollectionsMaps contained map +syntax keyword javascriptD3CollectionsSets contained set +syntax keyword javascriptD3CollectionsNests contained nest + +syntax keyword javascriptD3Colors contained color rgb hsl lab hcl cubehelix +syntax keyword javascriptD3Dispatches contained dispatch +syntax keyword javascriptD3Dragging contained drag dragDisable dragEnable +syntax keyword javascriptD3DelimiterSeparatedValues contained dsvFormat csvParse csvParseRows csvFormat csvFormatRows tsvParse tsvParseRows tsvFormat tsvFormatRows +syntax keyword javascriptD3Easings contained easeLinear easePolyIn easePolyOut easePolyInOut easeQuad easeQuadIn easeQuadOut easeQuadInOut easeCubic easeCubicIn easeCubicOut easeCubicInOut easeSin easeSinIn easeSinOut easeSinInOut easeExp easeExpIn easeExpOut easeExpInOut easeCircle easeCircleIn easeCircleOut easeCircleInOut easeElastic easeElasticIn easeElasticOut easeElasticInOut easeBack easeBackIn easeBackOut easeBackInOut easeBounce easeBounceIn easeBounceOut easeBounceInOut +syntax keyword javascriptD3Forces contained forceSimulation forceCenter forceCollide forceLink forceManyBody forceX forceY +syntax keyword javascriptD3NumberFormats contained format formatPrefix formatSpecifier formatLocale formatDefaultLocale precisionFixed precisionPrefix precisionRound +syntax keyword javascriptD3Geographies contained geoPath geoAlbers geoAlbersUsa geoAzimuthalEqualArea geoAzimuthalEquidistant geoConicConformal geoConicEqualArea geoConicEquidistant geoEquirectangular geoGnomonic geoMercator geoOrthographic geoStereographic geoTransverseMercator geoProjection geoProjectionMutator geoAzimuthalEqualAreaRaw geoAzimuthalEquidistantRaw geoConicConformalRaw geoConicEqualAreaRaw geoConicEquidistantRaw geoEquirectangularRaw geoGnomonicRaw geoMercatorRaw geoOrthographicRaw geoStereographicRaw geoTransverseMercatorRaw geoArea geoBounds geoCentroid geoDistance geoLength geoInterpolate geoRotation geoCircle geoGraticule geoClipExtent +syntax keyword javascriptD3GeographiesStreams contained geoStream +syntax keyword javascriptD3GeographiesTransforms contained geoIdentity geoTransform +syntax keyword javascriptD3Hierarchies contained hierarchy stratify cluster tree treemap treemapBinary treemapDice treemapSlice treemapSliceDice treemapSquarify treemapResquarify partition pack packSiblings packEnclose +syntax keyword javascriptD3Interpolators contained interpolate interpolateArray interpolateDate interpolateNumber interpolateObject interpolateRound interpolateString interpolateTransformCss interpolateTransformSvg interpolateZoom interpolateRgb interpolateRgbBasis interpolateRgbBasisClosed interpolateHsl interpolateHslLong interpolateLab interpolateHcl interpolateHclLong interpolateCubehelix interpolateCubehelixLong interpolateBasis interpolateBasisClosed quantize +syntax keyword javascriptD3Paths contained path +syntax keyword javascriptD3Polygons contained polygonArea polygonCentroid polygonHull polygonContains polygonLength +syntax keyword javascriptD3Quadtrees contained quadtree +syntax keyword javascriptD3Queues contained queue +syntax keyword javascriptD3RandomNumbers contained randomUniform randomNormal randomLogNormal randomBates randomIrwinHall randomExponential +syntax keyword javascriptD3Requests contained request csv html json text tsv xml +syntax keyword javascriptD3Scales contained scaleLinear scalePow scaleSqrt scaleLog scaleIdentity scaleTime scaleUtc scaleSequential interpolateViridis interpolateInferno interpolateMagma interpolatePlasma interpolateWarm interpolateCool interpolateRainbow interpolateCubehelixDefault scaleQuantize scaleQuantile scaleThreshold scaleOrdinal scaleImplicit scaleBand scalePoint schemeCategory10 schemeCategory20 schemeCategory20b schemeCategory20c +syntax keyword javascriptD3Selections contained selection select selectAll matcher selector selectorAll window creator event customEvent mouse touch touches local namespace namespaces +syntax keyword javascriptD3Shapes contained arc pie line radialLine area radialArea curveBasis curveBasisClosed curveBasisOpen curveBundle curveCardinal curveCardinalClosed curveCardinalOpen curveCatmullRom curveCatmullRomClosed curveCatmullRomOpen curveLinear curveLinearClosed curveMonotoneX curveMonotoneY curveNatural curveStep curveStepAfter curveStepBefore symbol symbols symbolCircle symbolCross symbolDiamond symbolSquare symbolStar symbolTriangle symbolWye stack stackOrderAscending stackOrderDescending stackOrderInsideOut stackOrderNone stackOrderReverse stackOffsetExpand stackOffsetNone stackOffsetSilhouette stackOffsetWiggle +syntax keyword javascriptD3TimeFormats contained timeFormat timeParse utcFormat utcParse isoFormat isoParse timeFormatLocale timeFormatDefaultLocale +syntax keyword javascriptD3TimeIntervals contained timeInterval timeMillisecond utcMillisecond timeMilliseconds utcMilliseconds timeSecond utcSecond timeSeconds utcSeconds timeMinute utcMinute timeMinutes utcMinutes timeHour utcHour timeHours utcHours timeDay utcDay timeDays utcDays timeWeek utcWeek timeWeeks utcWeeks timeSunday utcSunday timeSundays utcSundays timeMonday utcMonday timeMondays utcMondays timeTuesday utcTuesday timeTuesdays utcTuesdays timeWednesday utcWednesday timeWednesdays utcWednesdays timeThursday utcThursday timeThursdays utcThursdays timeFriday utcFriday timeFridays utcFridays timeSaturday utcSaturday timeSaturdays utcSaturdays timeMonth utcMonth timeMonths utcMonths timeYear utcYear timeYears utcYears +syntax keyword javascriptD3Timers contained now timer timerFlush timeout interval +syntax keyword javascriptD3Transitions contained transition active interrupt +syntax keyword javascriptD3VoronoiDiagrams contained voronoi +syntax keyword javascriptD3Zooming contained zoom zoomTransform zoomIdentity + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_javascript_syntax_inits") + if version < 508 + let did_underscore_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptD3 Constant + HiLink javascriptD3ArraysStatistics PreProc + HiLink javascriptD3ArraysSearch PreProc + HiLink javascriptD3ArraysTransformations PreProc + HiLink javascriptD3ArraysHistograms PreProc + HiLink javascriptD3Axes PreProc + HiLink javascriptD3Brushes PreProc + HiLink javascriptD3Chords PreProc + HiLink javascriptD3CollectionsObjects PreProc + HiLink javascriptD3CollectionsMaps PreProc + HiLink javascriptD3CollectionsSets PreProc + HiLink javascriptD3CollectionsNests PreProc + HiLink javascriptD3Colors PreProc + HiLink javascriptD3Dispatches PreProc + HiLink javascriptD3Dragging PreProc + HiLink javascriptD3DelimiterSeparatedValues PreProc + HiLink javascriptD3Easings PreProc + HiLink javascriptD3Forces PreProc + HiLink javascriptD3NumberFormats PreProc + HiLink javascriptD3Geographies PreProc + HiLink javascriptD3GeographiesStreams PreProc + HiLink javascriptD3GeographiesTransforms PreProc + HiLink javascriptD3Hierarchies PreProc + HiLink javascriptD3Interpolators PreProc + HiLink javascriptD3Paths PreProc + HiLink javascriptD3Polygons PreProc + HiLink javascriptD3Quadtrees PreProc + HiLink javascriptD3Queues PreProc + HiLink javascriptD3RandomNumbers PreProc + HiLink javascriptD3Requests PreProc + HiLink javascriptD3Scales PreProc + HiLink javascriptD3Selections PreProc + HiLink javascriptD3Shapes PreProc + HiLink javascriptD3TimeFormats PreProc + HiLink javascriptD3TimeIntervals PreProc + HiLink javascriptD3Timers PreProc + HiLink javascriptD3Transitions PreProc + HiLink javascriptD3VoronoiDiagrams PreProc + HiLink javascriptD3Zooming PreProc + + delcommand HiLink +endif + + diff --git a/autoload/syntax/d3.ls.vim b/autoload/syntax/d3.ls.vim new file mode 100644 index 0000000..0d05c26 --- /dev/null +++ b/autoload/syntax/d3.ls.vim @@ -0,0 +1,109 @@ +" Vim syntax file +" Language: d3.v4 for ls +" Maintainer: othree +" Maintainer: Sfinktah +" Last Change: 2016/11/11 +" Version: 4.2.8.0 +" URL: https://github.com/d3/d3/blob/master/API.md + +syntax keyword lsD3 d3 containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax cluster ls_Functions contains=@lsD3Arrays,lsD3Axes,lsD3Brushes,lsD3Chords,@lsD3Collections,lsD3Colors,lsD3Dispatches,lsD3Dragging,lsD3DelimiterSeparatedValues,lsD3Easings,lsD3Forces,lsD3NumberFormats,lsD3Geographies,lsD3GeographiesStreams,lsD3GeographiesTransforms,lsD3Hierarchies,lsD3Interpolators,lsD3Paths,lsD3Polygons,lsD3Quadtrees,lsD3Queues,lsD3RandomNumbers,lsD3Requests,lsD3Scales,lsD3Selections,lsD3Shapes,lsD3TimeFormats,lsD3TimeIntervals,lsD3Timers,lsD3Transitions,lsD3VoronoiDiagrams,lsD3Zooming + +syntax cluster lsD3Arrays contains=lsD3ArraysStatistics,lsD3ArraysSearch,lsD3ArraysTransformations,lsD3ArraysHistograms,lsD3Axes,lsD3Arrays +syntax keyword lsD3ArraysStatistics contained min max extent sum mean median quantile variance deviation +syntax keyword lsD3ArraysSearch contained scan bisect bisectRight bisectLeft bisector ascending descending +syntax keyword lsD3ArraysTransformations contained merge pairs permute shuffle ticks tickStep range transpose zip +syntax keyword lsD3ArraysHistograms contained histogram thresholdFreedmanDiaconis thresholdScott thresholdSturges +syntax keyword lsD3Axes contained axisTop axisRight axisBottom axisLeft +syntax keyword lsD3Brushes contained brush brushX brushY brushSelection +syntax keyword lsD3Chords contained chord ribbon + +syntax cluster lsD3Collections contains=lsD3CollectionsObjects,lsD3CollectionsMaps,lsD3CollectionsSets,lsD3CollectionsNests +syntax keyword lsD3CollectionsObjects contained keys values entries +syntax keyword lsD3CollectionsMaps contained map +syntax keyword lsD3CollectionsSets contained set +syntax keyword lsD3CollectionsNests contained nest + +syntax keyword lsD3Colors contained color rgb hsl lab hcl cubehelix +syntax keyword lsD3Dispatches contained dispatch +syntax keyword lsD3Dragging contained drag dragDisable dragEnable +syntax keyword lsD3DelimiterSeparatedValues contained dsvFormat csvParse csvParseRows csvFormat csvFormatRows tsvParse tsvParseRows tsvFormat tsvFormatRows +syntax keyword lsD3Easings contained easeLinear easePolyIn easePolyOut easePolyInOut easeQuad easeQuadIn easeQuadOut easeQuadInOut easeCubic easeCubicIn easeCubicOut easeCubicInOut easeSin easeSinIn easeSinOut easeSinInOut easeExp easeExpIn easeExpOut easeExpInOut easeCircle easeCircleIn easeCircleOut easeCircleInOut easeElastic easeElasticIn easeElasticOut easeElasticInOut easeBack easeBackIn easeBackOut easeBackInOut easeBounce easeBounceIn easeBounceOut easeBounceInOut +syntax keyword lsD3Forces contained forceSimulation forceCenter forceCollide forceLink forceManyBody forceX forceY +syntax keyword lsD3NumberFormats contained format formatPrefix formatSpecifier formatLocale formatDefaultLocale precisionFixed precisionPrefix precisionRound +syntax keyword lsD3Geographies contained geoPath geoAlbers geoAlbersUsa geoAzimuthalEqualArea geoAzimuthalEquidistant geoConicConformal geoConicEqualArea geoConicEquidistant geoEquirectangular geoGnomonic geoMercator geoOrthographic geoStereographic geoTransverseMercator geoProjection geoProjectionMutator geoAzimuthalEqualAreaRaw geoAzimuthalEquidistantRaw geoConicConformalRaw geoConicEqualAreaRaw geoConicEquidistantRaw geoEquirectangularRaw geoGnomonicRaw geoMercatorRaw geoOrthographicRaw geoStereographicRaw geoTransverseMercatorRaw geoArea geoBounds geoCentroid geoDistance geoLength geoInterpolate geoRotation geoCircle geoGraticule geoClipExtent +syntax keyword lsD3GeographiesStreams contained geoStream +syntax keyword lsD3GeographiesTransforms contained geoIdentity geoTransform +syntax keyword lsD3Hierarchies contained hierarchy stratify cluster tree treemap treemapBinary treemapDice treemapSlice treemapSliceDice treemapSquarify treemapResquarify partition pack packSiblings packEnclose +syntax keyword lsD3Interpolators contained interpolate interpolateArray interpolateDate interpolateNumber interpolateObject interpolateRound interpolateString interpolateTransformCss interpolateTransformSvg interpolateZoom interpolateRgb interpolateRgbBasis interpolateRgbBasisClosed interpolateHsl interpolateHslLong interpolateLab interpolateHcl interpolateHclLong interpolateCubehelix interpolateCubehelixLong interpolateBasis interpolateBasisClosed quantize +syntax keyword lsD3Paths contained path +syntax keyword lsD3Polygons contained polygonArea polygonCentroid polygonHull polygonContains polygonLength +syntax keyword lsD3Quadtrees contained quadtree +syntax keyword lsD3Queues contained queue +syntax keyword lsD3RandomNumbers contained randomUniform randomNormal randomLogNormal randomBates randomIrwinHall randomExponential +syntax keyword lsD3Requests contained request csv html json text tsv xml +syntax keyword lsD3Scales contained scaleLinear scalePow scaleSqrt scaleLog scaleIdentity scaleTime scaleUtc scaleSequential interpolateViridis interpolateInferno interpolateMagma interpolatePlasma interpolateWarm interpolateCool interpolateRainbow interpolateCubehelixDefault scaleQuantize scaleQuantile scaleThreshold scaleOrdinal scaleImplicit scaleBand scalePoint schemeCategory10 schemeCategory20 schemeCategory20b schemeCategory20c +syntax keyword lsD3Selections contained selection select selectAll matcher selector selectorAll window creator event customEvent mouse touch touches local namespace namespaces +syntax keyword lsD3Shapes contained arc pie line radialLine area radialArea curveBasis curveBasisClosed curveBasisOpen curveBundle curveCardinal curveCardinalClosed curveCardinalOpen curveCatmullRom curveCatmullRomClosed curveCatmullRomOpen curveLinear curveLinearClosed curveMonotoneX curveMonotoneY curveNatural curveStep curveStepAfter curveStepBefore symbol symbols symbolCircle symbolCross symbolDiamond symbolSquare symbolStar symbolTriangle symbolWye stack stackOrderAscending stackOrderDescending stackOrderInsideOut stackOrderNone stackOrderReverse stackOffsetExpand stackOffsetNone stackOffsetSilhouette stackOffsetWiggle +syntax keyword lsD3TimeFormats contained timeFormat timeParse utcFormat utcParse isoFormat isoParse timeFormatLocale timeFormatDefaultLocale +syntax keyword lsD3TimeIntervals contained timeInterval timeMillisecond utcMillisecond timeMilliseconds utcMilliseconds timeSecond utcSecond timeSeconds utcSeconds timeMinute utcMinute timeMinutes utcMinutes timeHour utcHour timeHours utcHours timeDay utcDay timeDays utcDays timeWeek utcWeek timeWeeks utcWeeks timeSunday utcSunday timeSundays utcSundays timeMonday utcMonday timeMondays utcMondays timeTuesday utcTuesday timeTuesdays utcTuesdays timeWednesday utcWednesday timeWednesdays utcWednesdays timeThursday utcThursday timeThursdays utcThursdays timeFriday utcFriday timeFridays utcFridays timeSaturday utcSaturday timeSaturdays utcSaturdays timeMonth utcMonth timeMonths utcMonths timeYear utcYear timeYears utcYears +syntax keyword lsD3Timers contained now timer timerFlush timeout interval +syntax keyword lsD3Transitions contained transition active interrupt +syntax keyword lsD3VoronoiDiagrams contained voronoi +syntax keyword lsD3Zooming contained zoom zoomTransform zoomIdentity + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_ls_syntax_inits") + if version < 508 + let did_underscore_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsD3 Constant + HiLink lsD3ArraysStatistics PreProc + HiLink lsD3ArraysSearch PreProc + HiLink lsD3ArraysTransformations PreProc + HiLink lsD3ArraysHistograms PreProc + HiLink lsD3Axes PreProc + HiLink lsD3Brushes PreProc + HiLink lsD3Chords PreProc + HiLink lsD3CollectionsObjects PreProc + HiLink lsD3CollectionsMaps PreProc + HiLink lsD3CollectionsSets PreProc + HiLink lsD3CollectionsNests PreProc + HiLink lsD3Colors PreProc + HiLink lsD3Dispatches PreProc + HiLink lsD3Dragging PreProc + HiLink lsD3DelimiterSeparatedValues PreProc + HiLink lsD3Easings PreProc + HiLink lsD3Forces PreProc + HiLink lsD3NumberFormats PreProc + HiLink lsD3Geographies PreProc + HiLink lsD3GeographiesStreams PreProc + HiLink lsD3GeographiesTransforms PreProc + HiLink lsD3Hierarchies PreProc + HiLink lsD3Interpolators PreProc + HiLink lsD3Paths PreProc + HiLink lsD3Polygons PreProc + HiLink lsD3Quadtrees PreProc + HiLink lsD3Queues PreProc + HiLink lsD3RandomNumbers PreProc + HiLink lsD3Requests PreProc + HiLink lsD3Scales PreProc + HiLink lsD3Selections PreProc + HiLink lsD3Shapes PreProc + HiLink lsD3TimeFormats PreProc + HiLink lsD3TimeIntervals PreProc + HiLink lsD3Timers PreProc + HiLink lsD3Transitions PreProc + HiLink lsD3VoronoiDiagrams PreProc + HiLink lsD3Zooming PreProc + + delcommand HiLink +endif + + diff --git a/autoload/syntax/d3.typescript.vim b/autoload/syntax/d3.typescript.vim new file mode 100644 index 0000000..7d61698 --- /dev/null +++ b/autoload/syntax/d3.typescript.vim @@ -0,0 +1,109 @@ +" Vim syntax file +" Language: d3.v4 for typescript +" Maintainer: othree +" Maintainer: Sfinktah +" Last Change: 2016/11/11 +" Version: 4.2.8.0 +" URL: https://github.com/d3/d3/blob/master/API.md + +syntax keyword typescriptD3 d3 containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax cluster typescript_Functions contains=@typescriptD3Arrays,typescriptD3Axes,typescriptD3Brushes,typescriptD3Chords,@typescriptD3Collections,typescriptD3Colors,typescriptD3Dispatches,typescriptD3Dragging,typescriptD3DelimiterSeparatedValues,typescriptD3Easings,typescriptD3Forces,typescriptD3NumberFormats,typescriptD3Geographies,typescriptD3GeographiesStreams,typescriptD3GeographiesTransforms,typescriptD3Hierarchies,typescriptD3Interpolators,typescriptD3Paths,typescriptD3Polygons,typescriptD3Quadtrees,typescriptD3Queues,typescriptD3RandomNumbers,typescriptD3Requests,typescriptD3Scales,typescriptD3Selections,typescriptD3Shapes,typescriptD3TimeFormats,typescriptD3TimeIntervals,typescriptD3Timers,typescriptD3Transitions,typescriptD3VoronoiDiagrams,typescriptD3Zooming + +syntax cluster typescriptD3Arrays contains=typescriptD3ArraysStatistics,typescriptD3ArraysSearch,typescriptD3ArraysTransformations,typescriptD3ArraysHistograms,typescriptD3Axes,typescriptD3Arrays +syntax keyword typescriptD3ArraysStatistics contained min max extent sum mean median quantile variance deviation +syntax keyword typescriptD3ArraysSearch contained scan bisect bisectRight bisectLeft bisector ascending descending +syntax keyword typescriptD3ArraysTransformations contained merge pairs permute shuffle ticks tickStep range transpose zip +syntax keyword typescriptD3ArraysHistograms contained histogram thresholdFreedmanDiaconis thresholdScott thresholdSturges +syntax keyword typescriptD3Axes contained axisTop axisRight axisBottom axisLeft +syntax keyword typescriptD3Brushes contained brush brushX brushY brushSelection +syntax keyword typescriptD3Chords contained chord ribbon + +syntax cluster typescriptD3Collections contains=typescriptD3CollectionsObjects,typescriptD3CollectionsMaps,typescriptD3CollectionsSets,typescriptD3CollectionsNests +syntax keyword typescriptD3CollectionsObjects contained keys values entries +syntax keyword typescriptD3CollectionsMaps contained map +syntax keyword typescriptD3CollectionsSets contained set +syntax keyword typescriptD3CollectionsNests contained nest + +syntax keyword typescriptD3Colors contained color rgb hsl lab hcl cubehelix +syntax keyword typescriptD3Dispatches contained dispatch +syntax keyword typescriptD3Dragging contained drag dragDisable dragEnable +syntax keyword typescriptD3DelimiterSeparatedValues contained dsvFormat csvParse csvParseRows csvFormat csvFormatRows tsvParse tsvParseRows tsvFormat tsvFormatRows +syntax keyword typescriptD3Easings contained easeLinear easePolyIn easePolyOut easePolyInOut easeQuad easeQuadIn easeQuadOut easeQuadInOut easeCubic easeCubicIn easeCubicOut easeCubicInOut easeSin easeSinIn easeSinOut easeSinInOut easeExp easeExpIn easeExpOut easeExpInOut easeCircle easeCircleIn easeCircleOut easeCircleInOut easeElastic easeElasticIn easeElasticOut easeElasticInOut easeBack easeBackIn easeBackOut easeBackInOut easeBounce easeBounceIn easeBounceOut easeBounceInOut +syntax keyword typescriptD3Forces contained forceSimulation forceCenter forceCollide forceLink forceManyBody forceX forceY +syntax keyword typescriptD3NumberFormats contained format formatPrefix formatSpecifier formatLocale formatDefaultLocale precisionFixed precisionPrefix precisionRound +syntax keyword typescriptD3Geographies contained geoPath geoAlbers geoAlbersUsa geoAzimuthalEqualArea geoAzimuthalEquidistant geoConicConformal geoConicEqualArea geoConicEquidistant geoEquirectangular geoGnomonic geoMercator geoOrthographic geoStereographic geoTransverseMercator geoProjection geoProjectionMutator geoAzimuthalEqualAreaRaw geoAzimuthalEquidistantRaw geoConicConformalRaw geoConicEqualAreaRaw geoConicEquidistantRaw geoEquirectangularRaw geoGnomonicRaw geoMercatorRaw geoOrthographicRaw geoStereographicRaw geoTransverseMercatorRaw geoArea geoBounds geoCentroid geoDistance geoLength geoInterpolate geoRotation geoCircle geoGraticule geoClipExtent +syntax keyword typescriptD3GeographiesStreams contained geoStream +syntax keyword typescriptD3GeographiesTransforms contained geoIdentity geoTransform +syntax keyword typescriptD3Hierarchies contained hierarchy stratify cluster tree treemap treemapBinary treemapDice treemapSlice treemapSliceDice treemapSquarify treemapResquarify partition pack packSiblings packEnclose +syntax keyword typescriptD3Interpolators contained interpolate interpolateArray interpolateDate interpolateNumber interpolateObject interpolateRound interpolateString interpolateTransformCss interpolateTransformSvg interpolateZoom interpolateRgb interpolateRgbBasis interpolateRgbBasisClosed interpolateHsl interpolateHslLong interpolateLab interpolateHcl interpolateHclLong interpolateCubehelix interpolateCubehelixLong interpolateBasis interpolateBasisClosed quantize +syntax keyword typescriptD3Paths contained path +syntax keyword typescriptD3Polygons contained polygonArea polygonCentroid polygonHull polygonContains polygonLength +syntax keyword typescriptD3Quadtrees contained quadtree +syntax keyword typescriptD3Queues contained queue +syntax keyword typescriptD3RandomNumbers contained randomUniform randomNormal randomLogNormal randomBates randomIrwinHall randomExponential +syntax keyword typescriptD3Requests contained request csv html json text tsv xml +syntax keyword typescriptD3Scales contained scaleLinear scalePow scaleSqrt scaleLog scaleIdentity scaleTime scaleUtc scaleSequential interpolateViridis interpolateInferno interpolateMagma interpolatePlasma interpolateWarm interpolateCool interpolateRainbow interpolateCubehelixDefault scaleQuantize scaleQuantile scaleThreshold scaleOrdinal scaleImplicit scaleBand scalePoint schemeCategory10 schemeCategory20 schemeCategory20b schemeCategory20c +syntax keyword typescriptD3Selections contained selection select selectAll matcher selector selectorAll window creator event customEvent mouse touch touches local namespace namespaces +syntax keyword typescriptD3Shapes contained arc pie line radialLine area radialArea curveBasis curveBasisClosed curveBasisOpen curveBundle curveCardinal curveCardinalClosed curveCardinalOpen curveCatmullRom curveCatmullRomClosed curveCatmullRomOpen curveLinear curveLinearClosed curveMonotoneX curveMonotoneY curveNatural curveStep curveStepAfter curveStepBefore symbol symbols symbolCircle symbolCross symbolDiamond symbolSquare symbolStar symbolTriangle symbolWye stack stackOrderAscending stackOrderDescending stackOrderInsideOut stackOrderNone stackOrderReverse stackOffsetExpand stackOffsetNone stackOffsetSilhouette stackOffsetWiggle +syntax keyword typescriptD3TimeFormats contained timeFormat timeParse utcFormat utcParse isoFormat isoParse timeFormatLocale timeFormatDefaultLocale +syntax keyword typescriptD3TimeIntervals contained timeInterval timeMillisecond utcMillisecond timeMilliseconds utcMilliseconds timeSecond utcSecond timeSeconds utcSeconds timeMinute utcMinute timeMinutes utcMinutes timeHour utcHour timeHours utcHours timeDay utcDay timeDays utcDays timeWeek utcWeek timeWeeks utcWeeks timeSunday utcSunday timeSundays utcSundays timeMonday utcMonday timeMondays utcMondays timeTuesday utcTuesday timeTuesdays utcTuesdays timeWednesday utcWednesday timeWednesdays utcWednesdays timeThursday utcThursday timeThursdays utcThursdays timeFriday utcFriday timeFridays utcFridays timeSaturday utcSaturday timeSaturdays utcSaturdays timeMonth utcMonth timeMonths utcMonths timeYear utcYear timeYears utcYears +syntax keyword typescriptD3Timers contained now timer timerFlush timeout interval +syntax keyword typescriptD3Transitions contained transition active interrupt +syntax keyword typescriptD3VoronoiDiagrams contained voronoi +syntax keyword typescriptD3Zooming contained zoom zoomTransform zoomIdentity + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_underscore_typescript_syntax_inits") + if version < 508 + let did_underscore_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptD3 Constant + HiLink typescriptD3ArraysStatistics PreProc + HiLink typescriptD3ArraysSearch PreProc + HiLink typescriptD3ArraysTransformations PreProc + HiLink typescriptD3ArraysHistograms PreProc + HiLink typescriptD3Axes PreProc + HiLink typescriptD3Brushes PreProc + HiLink typescriptD3Chords PreProc + HiLink typescriptD3CollectionsObjects PreProc + HiLink typescriptD3CollectionsMaps PreProc + HiLink typescriptD3CollectionsSets PreProc + HiLink typescriptD3CollectionsNests PreProc + HiLink typescriptD3Colors PreProc + HiLink typescriptD3Dispatches PreProc + HiLink typescriptD3Dragging PreProc + HiLink typescriptD3DelimiterSeparatedValues PreProc + HiLink typescriptD3Easings PreProc + HiLink typescriptD3Forces PreProc + HiLink typescriptD3NumberFormats PreProc + HiLink typescriptD3Geographies PreProc + HiLink typescriptD3GeographiesStreams PreProc + HiLink typescriptD3GeographiesTransforms PreProc + HiLink typescriptD3Hierarchies PreProc + HiLink typescriptD3Interpolators PreProc + HiLink typescriptD3Paths PreProc + HiLink typescriptD3Polygons PreProc + HiLink typescriptD3Quadtrees PreProc + HiLink typescriptD3Queues PreProc + HiLink typescriptD3RandomNumbers PreProc + HiLink typescriptD3Requests PreProc + HiLink typescriptD3Scales PreProc + HiLink typescriptD3Selections PreProc + HiLink typescriptD3Shapes PreProc + HiLink typescriptD3TimeFormats PreProc + HiLink typescriptD3TimeIntervals PreProc + HiLink typescriptD3Timers PreProc + HiLink typescriptD3Transitions PreProc + HiLink typescriptD3VoronoiDiagrams PreProc + HiLink typescriptD3Zooming PreProc + + delcommand HiLink +endif + + From 9132101724c8adddf6c707b9b5320f69157fc53b Mon Sep 17 00:00:00 2001 From: othree Date: Fri, 11 Nov 2016 14:19:26 +0800 Subject: [PATCH 69/80] Update for d3.js --- README.md | 3 +++ autoload/syntax/update.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 69f27ed..c1922bf 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Libraries * [Handlebars](http://handlebarsjs.com/) * [Ramda](http://ramdajs.com/) * [Vue](https://vuejs.org/) +* [d3](https://d3js.org/) File Types ---------- @@ -72,6 +73,7 @@ Support libs id: * Handlebars: handlebars * Ramda: ramda * Vue.js: vue +* d3.js: d3 Default lib set is: `jquery,underscore,backbone` @@ -107,6 +109,7 @@ Changes ### Version 0.6 * Add Vue.js +* Add d3.js ### Version 0.5 * Add Ramda diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index d679d28..e1830d3 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' 'vue' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' 'vue' 'd3' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From 0af81952088fe847a3dd87732f6e4ceb222f9276 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 15 Feb 2017 11:58:56 +0800 Subject: [PATCH 70/80] Fix #60 lib global object nextgroup --- autoload/syntax/angularjs.coffee.vim | 6 +++--- autoload/syntax/angularjs.javascript.vim | 6 +++--- autoload/syntax/angularjs.ls.vim | 6 +++--- autoload/syntax/angularjs.typescript.vim | 6 +++--- autoload/syntax/backbone.coffee.vim | 4 ++-- autoload/syntax/backbone.javascript.vim | 4 ++-- autoload/syntax/backbone.ls.vim | 4 ++-- autoload/syntax/backbone.typescript.vim | 4 ++-- autoload/syntax/d3.coffee.vim | 7 ++++--- autoload/syntax/d3.javascript.vim | 7 ++++--- autoload/syntax/d3.ls.vim | 7 ++++--- autoload/syntax/d3.typescript.vim | 7 ++++--- autoload/syntax/flux.coffee.vim | 7 ++++--- autoload/syntax/flux.javascript.vim | 7 ++++--- autoload/syntax/flux.ls.vim | 7 ++++--- autoload/syntax/flux.typescript.vim | 7 ++++--- autoload/syntax/handlebars.coffee.vim | 11 ++++++----- autoload/syntax/handlebars.javascript.vim | 11 ++++++----- autoload/syntax/handlebars.ls.vim | 11 ++++++----- autoload/syntax/handlebars.typescript.vim | 11 ++++++----- autoload/syntax/jquery.coffee.vim | 4 ++-- autoload/syntax/jquery.javascript.vim | 4 ++-- autoload/syntax/jquery.ls.vim | 4 ++-- autoload/syntax/jquery.typescript.vim | 4 ++-- autoload/syntax/ramda.coffee.vim | 4 ++-- autoload/syntax/ramda.javascript.vim | 4 ++-- autoload/syntax/ramda.ls.vim | 4 ++-- autoload/syntax/ramda.typescript.vim | 4 ++-- autoload/syntax/react.coffee.vim | 5 +++-- autoload/syntax/react.javascript.vim | 5 +++-- autoload/syntax/react.ls.vim | 5 +++-- autoload/syntax/react.typescript.vim | 5 +++-- autoload/syntax/vue.coffee.vim | 5 +++-- autoload/syntax/vue.javascript.vim | 5 +++-- autoload/syntax/vue.ls.vim | 5 +++-- autoload/syntax/vue.typescript.vim | 5 +++-- 36 files changed, 116 insertions(+), 96 deletions(-) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 81a2732..121b30d 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: AngularJS for coffee " Maintainer: othree -" Last Change: 2016/10/11 +" Last Change: 2017/02/15 " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngulardot -syntax match coffeeAngulardot contained /\./ nextgroup=coffeeAngularMethods +syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngularDot +syntax match coffeeAngularDot contained /\./ nextgroup=coffeeAngularMethods syntax keyword coffeeAngularMethods contained bind bootstrap copy element equals syntax keyword coffeeAngularMethods contained extend forEach fromJson identity injector syntax keyword coffeeAngularMethods contained isArray isDate isDefined isElement isFunction diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index 0d5dabb..9565be3 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: AngularJS for javascript " Maintainer: othree -" Last Change: 2016/10/11 +" Last Change: 2017/02/15 " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngulardot -syntax match javascriptAngulardot contained /\./ nextgroup=javascriptAngularMethods +syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngularDot +syntax match javascriptAngularDot contained /\./ nextgroup=javascriptAngularMethods syntax keyword javascriptAngularMethods contained bind bootstrap copy element equals syntax keyword javascriptAngularMethods contained extend forEach fromJson identity injector syntax keyword javascriptAngularMethods contained isArray isDate isDefined isElement isFunction diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index 74fa06b..3f837be 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: AngularJS for ls " Maintainer: othree -" Last Change: 2016/10/11 +" Last Change: 2017/02/15 " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngulardot -syntax match lsAngulardot contained /\./ nextgroup=lsAngularMethods +syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngularDot +syntax match lsAngularDot contained /\./ nextgroup=lsAngularMethods syntax keyword lsAngularMethods contained bind bootstrap copy element equals syntax keyword lsAngularMethods contained extend forEach fromJson identity injector syntax keyword lsAngularMethods contained isArray isDate isDefined isElement isFunction diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index c27ca3a..bfcb5c1 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: AngularJS for typescript " Maintainer: othree -" Last Change: 2016/10/11 +" Last Change: 2017/02/15 " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngulardot -syntax match typescriptAngulardot contained /\./ nextgroup=typescriptAngularMethods +syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngularDot +syntax match typescriptAngularDot contained /\./ nextgroup=typescriptAngularMethods syntax keyword typescriptAngularMethods contained bind bootstrap copy element equals syntax keyword typescriptAngularMethods contained extend forEach fromJson identity injector syntax keyword typescriptAngularMethods contained isArray isDate isDefined isElement isFunction diff --git a/autoload/syntax/backbone.coffee.vim b/autoload/syntax/backbone.coffee.vim index af0b119..1465932 100644 --- a/autoload/syntax/backbone.coffee.vim +++ b/autoload/syntax/backbone.coffee.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Backbone.js for coffee " Maintainer: othree -" Last Change: 2016/01/07 +" Last Change: 2017/02/15 " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword coffeeBackbone Backbone containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeBDot +syntax keyword coffeeBackbone Backbone containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeBDot syntax match coffeeBDot contained /\./ nextgroup=coffeeBObjects syntax keyword coffeeBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.javascript.vim b/autoload/syntax/backbone.javascript.vim index 70a5d16..b3b2564 100644 --- a/autoload/syntax/backbone.javascript.vim +++ b/autoload/syntax/backbone.javascript.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Backbone.js for javascript " Maintainer: othree -" Last Change: 2016/01/07 +" Last Change: 2017/02/15 " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword javascriptBackbone Backbone containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptBDot +syntax keyword javascriptBackbone Backbone containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptBDot syntax match javascriptBDot contained /\./ nextgroup=javascriptBObjects syntax keyword javascriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.ls.vim b/autoload/syntax/backbone.ls.vim index 63aef70..6c7fa71 100644 --- a/autoload/syntax/backbone.ls.vim +++ b/autoload/syntax/backbone.ls.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Backbone.js for ls " Maintainer: othree -" Last Change: 2016/01/07 +" Last Change: 2017/02/15 " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword lsBackbone Backbone containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsBDot +syntax keyword lsBackbone Backbone containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsBDot syntax match lsBDot contained /\./ nextgroup=lsBObjects syntax keyword lsBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.typescript.vim b/autoload/syntax/backbone.typescript.vim index 30012dd..3874c46 100644 --- a/autoload/syntax/backbone.typescript.vim +++ b/autoload/syntax/backbone.typescript.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Backbone.js for typescript " Maintainer: othree -" Last Change: 2016/01/07 +" Last Change: 2017/02/15 " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword typescriptBackbone Backbone containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptBDot +syntax keyword typescriptBackbone Backbone containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptBDot syntax match typescriptBDot contained /\./ nextgroup=typescriptBObjects syntax keyword typescriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/d3.coffee.vim b/autoload/syntax/d3.coffee.vim index ebbbc56..51c5721 100644 --- a/autoload/syntax/d3.coffee.vim +++ b/autoload/syntax/d3.coffee.vim @@ -2,12 +2,13 @@ " Language: d3.v4 for coffee " Maintainer: othree " Maintainer: Sfinktah -" Last Change: 2016/11/11 +" Last Change: 2017/02/15 " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword coffeeD3 d3 containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution -syntax cluster coffee_Functions contains=@coffeeD3Arrays,coffeeD3Axes,coffeeD3Brushes,coffeeD3Chords,@coffeeD3Collections,coffeeD3Colors,coffeeD3Dispatches,coffeeD3Dragging,coffeeD3DelimiterSeparatedValues,coffeeD3Easings,coffeeD3Forces,coffeeD3NumberFormats,coffeeD3Geographies,coffeeD3GeographiesStreams,coffeeD3GeographiesTransforms,coffeeD3Hierarchies,coffeeD3Interpolators,coffeeD3Paths,coffeeD3Polygons,coffeeD3Quadtrees,coffeeD3Queues,coffeeD3RandomNumbers,coffeeD3Requests,coffeeD3Scales,coffeeD3Selections,coffeeD3Shapes,coffeeD3TimeFormats,coffeeD3TimeIntervals,coffeeD3Timers,coffeeD3Transitions,coffeeD3VoronoiDiagrams,coffeeD3Zooming +syntax keyword coffeeD3 d3 containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeD3Dot +syntax match coffeeD3Dot contained /\./ nextgroup=coffeeD3Functions +syntax cluster coffeeD3Functions contains=@coffeeD3Arrays,coffeeD3Axes,coffeeD3Brushes,coffeeD3Chords,@coffeeD3Collections,coffeeD3Colors,coffeeD3Dispatches,coffeeD3Dragging,coffeeD3DelimiterSeparatedValues,coffeeD3Easings,coffeeD3Forces,coffeeD3NumberFormats,coffeeD3Geographies,coffeeD3GeographiesStreams,coffeeD3GeographiesTransforms,coffeeD3Hierarchies,coffeeD3Interpolators,coffeeD3Paths,coffeeD3Polygons,coffeeD3Quadtrees,coffeeD3Queues,coffeeD3RandomNumbers,coffeeD3Requests,coffeeD3Scales,coffeeD3Selections,coffeeD3Shapes,coffeeD3TimeFormats,coffeeD3TimeIntervals,coffeeD3Timers,coffeeD3Transitions,coffeeD3VoronoiDiagrams,coffeeD3Zooming syntax cluster coffeeD3Arrays contains=coffeeD3ArraysStatistics,coffeeD3ArraysSearch,coffeeD3ArraysTransformations,coffeeD3ArraysHistograms,coffeeD3Axes,coffeeD3Arrays syntax keyword coffeeD3ArraysStatistics contained min max extent sum mean median quantile variance deviation diff --git a/autoload/syntax/d3.javascript.vim b/autoload/syntax/d3.javascript.vim index 0da5faa..f07d09c 100644 --- a/autoload/syntax/d3.javascript.vim +++ b/autoload/syntax/d3.javascript.vim @@ -2,12 +2,13 @@ " Language: d3.v4 for javascript " Maintainer: othree " Maintainer: Sfinktah -" Last Change: 2016/11/11 +" Last Change: 2017/02/15 " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword javascriptD3 d3 containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution -syntax cluster javascript_Functions contains=@javascriptD3Arrays,javascriptD3Axes,javascriptD3Brushes,javascriptD3Chords,@javascriptD3Collections,javascriptD3Colors,javascriptD3Dispatches,javascriptD3Dragging,javascriptD3DelimiterSeparatedValues,javascriptD3Easings,javascriptD3Forces,javascriptD3NumberFormats,javascriptD3Geographies,javascriptD3GeographiesStreams,javascriptD3GeographiesTransforms,javascriptD3Hierarchies,javascriptD3Interpolators,javascriptD3Paths,javascriptD3Polygons,javascriptD3Quadtrees,javascriptD3Queues,javascriptD3RandomNumbers,javascriptD3Requests,javascriptD3Scales,javascriptD3Selections,javascriptD3Shapes,javascriptD3TimeFormats,javascriptD3TimeIntervals,javascriptD3Timers,javascriptD3Transitions,javascriptD3VoronoiDiagrams,javascriptD3Zooming +syntax keyword javascriptD3 d3 containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptD3Dot +syntax match javascriptD3Dot contained /\./ nextgroup=javascriptD3Functions +syntax cluster javascriptD3Functions contains=@javascriptD3Arrays,javascriptD3Axes,javascriptD3Brushes,javascriptD3Chords,@javascriptD3Collections,javascriptD3Colors,javascriptD3Dispatches,javascriptD3Dragging,javascriptD3DelimiterSeparatedValues,javascriptD3Easings,javascriptD3Forces,javascriptD3NumberFormats,javascriptD3Geographies,javascriptD3GeographiesStreams,javascriptD3GeographiesTransforms,javascriptD3Hierarchies,javascriptD3Interpolators,javascriptD3Paths,javascriptD3Polygons,javascriptD3Quadtrees,javascriptD3Queues,javascriptD3RandomNumbers,javascriptD3Requests,javascriptD3Scales,javascriptD3Selections,javascriptD3Shapes,javascriptD3TimeFormats,javascriptD3TimeIntervals,javascriptD3Timers,javascriptD3Transitions,javascriptD3VoronoiDiagrams,javascriptD3Zooming syntax cluster javascriptD3Arrays contains=javascriptD3ArraysStatistics,javascriptD3ArraysSearch,javascriptD3ArraysTransformations,javascriptD3ArraysHistograms,javascriptD3Axes,javascriptD3Arrays syntax keyword javascriptD3ArraysStatistics contained min max extent sum mean median quantile variance deviation diff --git a/autoload/syntax/d3.ls.vim b/autoload/syntax/d3.ls.vim index 0d05c26..e42d725 100644 --- a/autoload/syntax/d3.ls.vim +++ b/autoload/syntax/d3.ls.vim @@ -2,12 +2,13 @@ " Language: d3.v4 for ls " Maintainer: othree " Maintainer: Sfinktah -" Last Change: 2016/11/11 +" Last Change: 2017/02/15 " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword lsD3 d3 containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution -syntax cluster ls_Functions contains=@lsD3Arrays,lsD3Axes,lsD3Brushes,lsD3Chords,@lsD3Collections,lsD3Colors,lsD3Dispatches,lsD3Dragging,lsD3DelimiterSeparatedValues,lsD3Easings,lsD3Forces,lsD3NumberFormats,lsD3Geographies,lsD3GeographiesStreams,lsD3GeographiesTransforms,lsD3Hierarchies,lsD3Interpolators,lsD3Paths,lsD3Polygons,lsD3Quadtrees,lsD3Queues,lsD3RandomNumbers,lsD3Requests,lsD3Scales,lsD3Selections,lsD3Shapes,lsD3TimeFormats,lsD3TimeIntervals,lsD3Timers,lsD3Transitions,lsD3VoronoiDiagrams,lsD3Zooming +syntax keyword lsD3 d3 containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsD3Dot +syntax match lsD3Dot contained /\./ nextgroup=lsD3Functions +syntax cluster lsD3Functions contains=@lsD3Arrays,lsD3Axes,lsD3Brushes,lsD3Chords,@lsD3Collections,lsD3Colors,lsD3Dispatches,lsD3Dragging,lsD3DelimiterSeparatedValues,lsD3Easings,lsD3Forces,lsD3NumberFormats,lsD3Geographies,lsD3GeographiesStreams,lsD3GeographiesTransforms,lsD3Hierarchies,lsD3Interpolators,lsD3Paths,lsD3Polygons,lsD3Quadtrees,lsD3Queues,lsD3RandomNumbers,lsD3Requests,lsD3Scales,lsD3Selections,lsD3Shapes,lsD3TimeFormats,lsD3TimeIntervals,lsD3Timers,lsD3Transitions,lsD3VoronoiDiagrams,lsD3Zooming syntax cluster lsD3Arrays contains=lsD3ArraysStatistics,lsD3ArraysSearch,lsD3ArraysTransformations,lsD3ArraysHistograms,lsD3Axes,lsD3Arrays syntax keyword lsD3ArraysStatistics contained min max extent sum mean median quantile variance deviation diff --git a/autoload/syntax/d3.typescript.vim b/autoload/syntax/d3.typescript.vim index 7d61698..4447712 100644 --- a/autoload/syntax/d3.typescript.vim +++ b/autoload/syntax/d3.typescript.vim @@ -2,12 +2,13 @@ " Language: d3.v4 for typescript " Maintainer: othree " Maintainer: Sfinktah -" Last Change: 2016/11/11 +" Last Change: 2017/02/15 " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword typescriptD3 d3 containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution -syntax cluster typescript_Functions contains=@typescriptD3Arrays,typescriptD3Axes,typescriptD3Brushes,typescriptD3Chords,@typescriptD3Collections,typescriptD3Colors,typescriptD3Dispatches,typescriptD3Dragging,typescriptD3DelimiterSeparatedValues,typescriptD3Easings,typescriptD3Forces,typescriptD3NumberFormats,typescriptD3Geographies,typescriptD3GeographiesStreams,typescriptD3GeographiesTransforms,typescriptD3Hierarchies,typescriptD3Interpolators,typescriptD3Paths,typescriptD3Polygons,typescriptD3Quadtrees,typescriptD3Queues,typescriptD3RandomNumbers,typescriptD3Requests,typescriptD3Scales,typescriptD3Selections,typescriptD3Shapes,typescriptD3TimeFormats,typescriptD3TimeIntervals,typescriptD3Timers,typescriptD3Transitions,typescriptD3VoronoiDiagrams,typescriptD3Zooming +syntax keyword typescriptD3 d3 containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptD3Dot +syntax match typescriptD3Dot contained /\./ nextgroup=typescriptD3Functions +syntax cluster typescriptD3Functions contains=@typescriptD3Arrays,typescriptD3Axes,typescriptD3Brushes,typescriptD3Chords,@typescriptD3Collections,typescriptD3Colors,typescriptD3Dispatches,typescriptD3Dragging,typescriptD3DelimiterSeparatedValues,typescriptD3Easings,typescriptD3Forces,typescriptD3NumberFormats,typescriptD3Geographies,typescriptD3GeographiesStreams,typescriptD3GeographiesTransforms,typescriptD3Hierarchies,typescriptD3Interpolators,typescriptD3Paths,typescriptD3Polygons,typescriptD3Quadtrees,typescriptD3Queues,typescriptD3RandomNumbers,typescriptD3Requests,typescriptD3Scales,typescriptD3Selections,typescriptD3Shapes,typescriptD3TimeFormats,typescriptD3TimeIntervals,typescriptD3Timers,typescriptD3Transitions,typescriptD3VoronoiDiagrams,typescriptD3Zooming syntax cluster typescriptD3Arrays contains=typescriptD3ArraysStatistics,typescriptD3ArraysSearch,typescriptD3ArraysTransformations,typescriptD3ArraysHistograms,typescriptD3Axes,typescriptD3Arrays syntax keyword typescriptD3ArraysStatistics contained min max extent sum mean median quantile variance deviation diff --git a/autoload/syntax/flux.coffee.vim b/autoload/syntax/flux.coffee.vim index ade2cc0..f936c4c 100644 --- a/autoload/syntax/flux.coffee.vim +++ b/autoload/syntax/flux.coffee.vim @@ -1,15 +1,16 @@ " Vim syntax file " Language: Flux for coffee " Maintainer: othree -" Last Change: 2014/10/30 +" Last Change: 2017/02/15 " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword coffeeFlux Dispatcher containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeFlux Dispatcher containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeFDot +syntax match coffeeFDot contained /\./ nextgroup=coffeeFFunctions syntax keyword coffeeFDispatcher contained register unregister waitFor dispatch isDispatching -syntax cluster coffeeFFunction contains=coffeeFDispatcher +syntax cluster coffeeFFunctions contains=coffeeFDispatcher " Define the default highlighting. diff --git a/autoload/syntax/flux.javascript.vim b/autoload/syntax/flux.javascript.vim index 697f346..1cbf71e 100644 --- a/autoload/syntax/flux.javascript.vim +++ b/autoload/syntax/flux.javascript.vim @@ -1,15 +1,16 @@ " Vim syntax file " Language: Flux for javascript " Maintainer: othree -" Last Change: 2014/10/30 +" Last Change: 2017/02/15 " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword javascriptFlux Dispatcher containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptFlux Dispatcher containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptFDot +syntax match javascriptFDot contained /\./ nextgroup=javascriptFFunctions syntax keyword javascriptFDispatcher contained register unregister waitFor dispatch isDispatching -syntax cluster javascriptFFunction contains=javascriptFDispatcher +syntax cluster javascriptFFunctions contains=javascriptFDispatcher " Define the default highlighting. diff --git a/autoload/syntax/flux.ls.vim b/autoload/syntax/flux.ls.vim index 5aa1920..5f3fc48 100644 --- a/autoload/syntax/flux.ls.vim +++ b/autoload/syntax/flux.ls.vim @@ -1,15 +1,16 @@ " Vim syntax file " Language: Flux for ls " Maintainer: othree -" Last Change: 2014/10/30 +" Last Change: 2017/02/15 " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword lsFlux Dispatcher containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsFlux Dispatcher containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsFDot +syntax match lsFDot contained /\./ nextgroup=lsFFunctions syntax keyword lsFDispatcher contained register unregister waitFor dispatch isDispatching -syntax cluster lsFFunction contains=lsFDispatcher +syntax cluster lsFFunctions contains=lsFDispatcher " Define the default highlighting. diff --git a/autoload/syntax/flux.typescript.vim b/autoload/syntax/flux.typescript.vim index 364c83c..d7d4e67 100644 --- a/autoload/syntax/flux.typescript.vim +++ b/autoload/syntax/flux.typescript.vim @@ -1,15 +1,16 @@ " Vim syntax file " Language: Flux for typescript " Maintainer: othree -" Last Change: 2014/10/30 +" Last Change: 2017/02/15 " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword typescriptFlux Dispatcher containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptFlux Dispatcher containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptFDot +syntax match typescriptFDot contained /\./ nextgroup=typescriptFFunctions syntax keyword typescriptFDispatcher contained register unregister waitFor dispatch isDispatching -syntax cluster typescriptFFunction contains=typescriptFDispatcher +syntax cluster typescriptFFunctions contains=typescriptFDispatcher " Define the default highlighting. diff --git a/autoload/syntax/handlebars.coffee.vim b/autoload/syntax/handlebars.coffee.vim index 8c53884..98f3ffc 100644 --- a/autoload/syntax/handlebars.coffee.vim +++ b/autoload/syntax/handlebars.coffee.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: handlebars for coffee " Maintainer: othree -" Last Change: 2015/02/02 +" Last Change: 2017/02/15 " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword coffeeHandlebars Handlebars containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution -" syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions +syntax keyword coffeeHandlebars Handlebars containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeHDot,coffeeHutility +syntax match coffeeHDot contained /\./ nextgroup=@coffeeHmethods " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions syntax cluster coffeeHFunctions contains=coffeeHmethods,coffeeHutilityMethod @@ -15,9 +15,10 @@ syntax keyword coffeeHmethods contained compile precompile template unregister syntax keyword coffeeHmethods contained registerHelper unregisterHelper SafeString escapeExpression syntax keyword coffeeHmethods contained createFrame create log -syntax keyword coffeeHutility contained Utils +syntax keyword coffeeHutility contained Utils nextgroup=coffeeHUDot +syntax match coffeeHUDot contained /\./ nextgroup=@coffeeHutilityMethods -syntax keyword coffeeHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath +syntax keyword coffeeHutilityMethods contained isEmpty extend toString isArray isFunction appendContextPath " Define the default highlighting. diff --git a/autoload/syntax/handlebars.javascript.vim b/autoload/syntax/handlebars.javascript.vim index 5d377f5..15942be 100644 --- a/autoload/syntax/handlebars.javascript.vim +++ b/autoload/syntax/handlebars.javascript.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: handlebars for javascript " Maintainer: othree -" Last Change: 2015/02/02 +" Last Change: 2017/02/15 " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword javascriptHandlebars Handlebars containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution -" syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions +syntax keyword javascriptHandlebars Handlebars containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptHDot,javascriptHutility +syntax match javascriptHDot contained /\./ nextgroup=@javascriptHmethods " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions syntax cluster javascriptHFunctions contains=javascriptHmethods,javascriptHutilityMethod @@ -15,9 +15,10 @@ syntax keyword javascriptHmethods contained compile precompile template unregi syntax keyword javascriptHmethods contained registerHelper unregisterHelper SafeString escapeExpression syntax keyword javascriptHmethods contained createFrame create log -syntax keyword javascriptHutility contained Utils +syntax keyword javascriptHutility contained Utils nextgroup=javascriptHUDot +syntax match javascriptHUDot contained /\./ nextgroup=@javascriptHutilityMethods -syntax keyword javascriptHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath +syntax keyword javascriptHutilityMethods contained isEmpty extend toString isArray isFunction appendContextPath " Define the default highlighting. diff --git a/autoload/syntax/handlebars.ls.vim b/autoload/syntax/handlebars.ls.vim index 7984b4f..038c8ea 100644 --- a/autoload/syntax/handlebars.ls.vim +++ b/autoload/syntax/handlebars.ls.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: handlebars for ls " Maintainer: othree -" Last Change: 2015/02/02 +" Last Change: 2017/02/15 " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword lsHandlebars Handlebars containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution -" syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions +syntax keyword lsHandlebars Handlebars containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsHDot,lsHutility +syntax match lsHDot contained /\./ nextgroup=@lsHmethods " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions syntax cluster lsHFunctions contains=lsHmethods,lsHutilityMethod @@ -15,9 +15,10 @@ syntax keyword lsHmethods contained compile precompile template unregisterPart syntax keyword lsHmethods contained registerHelper unregisterHelper SafeString escapeExpression syntax keyword lsHmethods contained createFrame create log -syntax keyword lsHutility contained Utils +syntax keyword lsHutility contained Utils nextgroup=lsHUDot +syntax match lsHUDot contained /\./ nextgroup=@lsHutilityMethods -syntax keyword lsHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath +syntax keyword lsHutilityMethods contained isEmpty extend toString isArray isFunction appendContextPath " Define the default highlighting. diff --git a/autoload/syntax/handlebars.typescript.vim b/autoload/syntax/handlebars.typescript.vim index f8639eb..06070f5 100644 --- a/autoload/syntax/handlebars.typescript.vim +++ b/autoload/syntax/handlebars.typescript.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: handlebars for typescript " Maintainer: othree -" Last Change: 2015/02/02 +" Last Change: 2017/02/15 " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword typescriptHandlebars Handlebars containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution -" syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions +syntax keyword typescriptHandlebars Handlebars containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptHDot,typescriptHutility +syntax match typescriptHDot contained /\./ nextgroup=@typescriptHmethods " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions syntax cluster typescriptHFunctions contains=typescriptHmethods,typescriptHutilityMethod @@ -15,9 +15,10 @@ syntax keyword typescriptHmethods contained compile precompile template unregi syntax keyword typescriptHmethods contained registerHelper unregisterHelper SafeString escapeExpression syntax keyword typescriptHmethods contained createFrame create log -syntax keyword typescriptHutility contained Utils +syntax keyword typescriptHutility contained Utils nextgroup=typescriptHUDot +syntax match typescriptHUDot contained /\./ nextgroup=@typescriptHutilityMethods -syntax keyword typescriptHutilityMethod contained isEmpty extend toString isArray isFunction appendContextPath +syntax keyword typescriptHutilityMethods contained isEmpty extend toString isArray isFunction appendContextPath " Define the default highlighting. diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index e8e004f..0b5f703 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -2,7 +2,7 @@ " Language: jQuery for coffee " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'coffee' setlocal iskeyword+=$ endif -syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=@coffeeAfterIdentifier " syntax match coffeejQuerydot contained /\./ nextgroup=@coffeeQGlobals " syntax match coffeejQuerydot contained /([^)]*)\./ nextgroup=@coffeeQFunctions diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 05e53ef..9a98e73 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -2,7 +2,7 @@ " Language: jQuery for javascript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'javascript' setlocal iskeyword+=$ endif -syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=@javascriptAfterIdentifier " syntax match javascriptjQuerydot contained /\./ nextgroup=@javascriptQGlobals " syntax match javascriptjQuerydot contained /([^)]*)\./ nextgroup=@javascriptQFunctions diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index b039ca8..c636e31 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -2,7 +2,7 @@ " Language: jQuery for ls " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'ls' setlocal iskeyword+=$ endif -syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=@lsAfterIdentifier " syntax match lsjQuerydot contained /\./ nextgroup=@lsQGlobals " syntax match lsjQuerydot contained /([^)]*)\./ nextgroup=@lsQFunctions diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 750ea61..3e82850 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -2,7 +2,7 @@ " Language: jQuery for typescript " Maintainer: othree " Maintainer: Bruno Michel -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 1.9.0.2 " URL: http://api.jquery.com/ @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'typescript' setlocal iskeyword+=$ endif -syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=@typescriptAfterIdentifier " syntax match typescriptjQuerydot contained /\./ nextgroup=@typescriptQGlobals " syntax match typescriptjQuerydot contained /([^)]*)\./ nextgroup=@typescriptQFunctions diff --git a/autoload/syntax/ramda.coffee.vim b/autoload/syntax/ramda.coffee.vim index aeb4f0f..8300ece 100644 --- a/autoload/syntax/ramda.coffee.vim +++ b/autoload/syntax/ramda.coffee.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Ramda for coffee " Maintainer: othree -" Last Change: 2016/05/04 +" Last Change: 2017/02/15 " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution,coffeeRDot +syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot syntax match coffeeRaDot contained /\./ nextgroup=coffeeRaFunctions syntax cluster coffeeRaFunctions contains=coffeeRaFunction,coffeeRaMath,coffeeRaList,coffeeRaLogic,coffeeRaObject,coffeeRaRelation,coffeeRaType,coffeeRaString diff --git a/autoload/syntax/ramda.javascript.vim b/autoload/syntax/ramda.javascript.vim index 5c362b2..b3fd28a 100644 --- a/autoload/syntax/ramda.javascript.vim +++ b/autoload/syntax/ramda.javascript.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Ramda for javascript " Maintainer: othree -" Last Change: 2016/05/04 +" Last Change: 2017/02/15 " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution,javascriptRDot +syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot syntax match javascriptRaDot contained /\./ nextgroup=javascriptRaFunctions syntax cluster javascriptRaFunctions contains=javascriptRaFunction,javascriptRaMath,javascriptRaList,javascriptRaLogic,javascriptRaObject,javascriptRaRelation,javascriptRaType,javascriptRaString diff --git a/autoload/syntax/ramda.ls.vim b/autoload/syntax/ramda.ls.vim index dcefbd7..42e2430 100644 --- a/autoload/syntax/ramda.ls.vim +++ b/autoload/syntax/ramda.ls.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Ramda for ls " Maintainer: othree -" Last Change: 2016/05/04 +" Last Change: 2017/02/15 " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution,lsRDot +syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot syntax match lsRaDot contained /\./ nextgroup=lsRaFunctions syntax cluster lsRaFunctions contains=lsRaFunction,lsRaMath,lsRaList,lsRaLogic,lsRaObject,lsRaRelation,lsRaType,lsRaString diff --git a/autoload/syntax/ramda.typescript.vim b/autoload/syntax/ramda.typescript.vim index df3ae6d..67a67be 100644 --- a/autoload/syntax/ramda.typescript.vim +++ b/autoload/syntax/ramda.typescript.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Ramda for typescript " Maintainer: othree -" Last Change: 2016/05/04 +" Last Change: 2017/02/15 " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution,typescriptRDot +syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot syntax match typescriptRaDot contained /\./ nextgroup=typescriptRaFunctions syntax cluster typescriptRaFunctions contains=typescriptRaFunction,typescriptRaMath,typescriptRaList,typescriptRaLogic,typescriptRaObject,typescriptRaRelation,typescriptRaType,typescriptRaString diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim index b5ed8ec..8696cb9 100644 --- a/autoload/syntax/react.coffee.vim +++ b/autoload/syntax/react.coffee.vim @@ -1,12 +1,13 @@ " Vim syntax file " Language: React for coffee " Maintainer: othree -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 0.12.0 " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword coffeeReact React ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeReact React ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot +syntax match coffeeRDot contained /\./ nextgroup=coffeeRProp syntax keyword coffeeRTop contained createClass render unmountComponentAtNode renderToString syntax keyword coffeeRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim index 22948b9..aa724b5 100644 --- a/autoload/syntax/react.javascript.vim +++ b/autoload/syntax/react.javascript.vim @@ -1,12 +1,13 @@ " Vim syntax file " Language: React for javascript " Maintainer: othree -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 0.12.0 " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword javascriptReact React ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptReact React ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot +syntax match javascriptRDot contained /\./ nextgroup=javascriptRProp syntax keyword javascriptRTop contained createClass render unmountComponentAtNode renderToString syntax keyword javascriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim index 7e4215e..462f748 100644 --- a/autoload/syntax/react.ls.vim +++ b/autoload/syntax/react.ls.vim @@ -1,12 +1,13 @@ " Vim syntax file " Language: React for ls " Maintainer: othree -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 0.12.0 " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword lsReact React ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsReact React ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot +syntax match lsRDot contained /\./ nextgroup=lsRProp syntax keyword lsRTop contained createClass render unmountComponentAtNode renderToString syntax keyword lsRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim index 869cad3..e14d9d4 100644 --- a/autoload/syntax/react.typescript.vim +++ b/autoload/syntax/react.typescript.vim @@ -1,12 +1,13 @@ " Vim syntax file " Language: React for typescript " Maintainer: othree -" Last Change: 2014/10/29 +" Last Change: 2017/02/15 " Version: 0.12.0 " URL: https://facebook.github.io/react/docs/top-level-api.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword typescriptReact React ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptReact React ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot +syntax match typescriptRDot contained /\./ nextgroup=typescriptRProp syntax keyword typescriptRTop contained createClass render unmountComponentAtNode renderToString syntax keyword typescriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes diff --git a/autoload/syntax/vue.coffee.vim b/autoload/syntax/vue.coffee.vim index dd95d56..a679099 100644 --- a/autoload/syntax/vue.coffee.vim +++ b/autoload/syntax/vue.coffee.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: vue.js for JavaScript " Maintainer: othree -" Last Change: 2016/10/07 +" Last Change: 2017/02/15 " Version: 2.0 " URL: https://vuejs.org @@ -10,7 +10,8 @@ if exists("b:current_syntax") && b:current_syntax == 'coffee' setlocal iskeyword+=$ endif -syntax keyword coffeeVue Vue vm containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeVue Vue vm containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeVDot +syntax match coffeeVDot contained /\./ nextgroup=coffeeVFunctions,coffeeVAttrs " Vue.* syntax cluster coffeeVFunctions contains=coffeeVAPI,coffeeVMethods diff --git a/autoload/syntax/vue.javascript.vim b/autoload/syntax/vue.javascript.vim index 13af9f5..59aa9d3 100644 --- a/autoload/syntax/vue.javascript.vim +++ b/autoload/syntax/vue.javascript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: vue.js for JavaScript " Maintainer: othree -" Last Change: 2016/10/07 +" Last Change: 2017/02/15 " Version: 2.0 " URL: https://vuejs.org @@ -10,7 +10,8 @@ if exists("b:current_syntax") && b:current_syntax == 'javascript' setlocal iskeyword+=$ endif -syntax keyword javascriptVue Vue vm containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptVue Vue vm containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptVDot +syntax match javascriptVDot contained /\./ nextgroup=javascriptVFunctions,javascriptVAttrs " Vue.* syntax cluster javascriptVFunctions contains=javascriptVAPI,javascriptVMethods diff --git a/autoload/syntax/vue.ls.vim b/autoload/syntax/vue.ls.vim index ff39418..423fba0 100644 --- a/autoload/syntax/vue.ls.vim +++ b/autoload/syntax/vue.ls.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: vue.js for JavaScript " Maintainer: othree -" Last Change: 2016/10/07 +" Last Change: 2017/02/15 " Version: 2.0 " URL: https://vuejs.org @@ -10,7 +10,8 @@ if exists("b:current_syntax") && b:current_syntax == 'ls' setlocal iskeyword+=$ endif -syntax keyword lsVue Vue vm containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsVue Vue vm containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsVDot +syntax match lsVDot contained /\./ nextgroup=lsVFunctions,lsVAttrs " Vue.* syntax cluster lsVFunctions contains=lsVAPI,lsVMethods diff --git a/autoload/syntax/vue.typescript.vim b/autoload/syntax/vue.typescript.vim index 0811707..4cd8a5d 100644 --- a/autoload/syntax/vue.typescript.vim +++ b/autoload/syntax/vue.typescript.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: vue.js for JavaScript " Maintainer: othree -" Last Change: 2016/10/07 +" Last Change: 2017/02/15 " Version: 2.0 " URL: https://vuejs.org @@ -10,7 +10,8 @@ if exists("b:current_syntax") && b:current_syntax == 'typescript' setlocal iskeyword+=$ endif -syntax keyword typescriptVue Vue vm containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptVue Vue vm containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptVDot +syntax match typescriptVDot contained /\./ nextgroup=typescriptVFunctions,typescriptVAttrs " Vue.* syntax cluster typescriptVFunctions contains=typescriptVAPI,typescriptVMethods From 99fc423b743e614c3b55aaae42b480982eb9d2d8 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 15 Feb 2017 12:25:59 +0800 Subject: [PATCH 71/80] Update React to 15.4.2 --- autoload/syntax/postprocess.javascript.vim | 2 +- autoload/syntax/react.coffee.vim | 58 +++++++++++++++++----- autoload/syntax/react.javascript.vim | 58 +++++++++++++++++----- autoload/syntax/react.ls.vim | 58 +++++++++++++++++----- autoload/syntax/react.typescript.vim | 58 +++++++++++++++++----- 5 files changed, 185 insertions(+), 49 deletions(-) diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index 87eb78b..2c903ea 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -10,7 +10,7 @@ syntax cluster props add=@javascriptQFunctions,@javascript_Functions,@javascript syntax cluster props add=@javascriptpFunctions,@javascriptAFunctions,@javascriptSFunctions,@javascriptJFunctions syntax cluster props add=@javascriptRaFunctions syntax cluster props add=@javascriptQAttrs,@javascript_Attrs,@javascriptBAttrs,@javascriptpAttrs,@javascriptAAttrs,@javascriptJAttrs -syntax cluster props add=@javascriptRProp +syntax cluster props add=@javascriptRFunctions,@gavascriptRAttrs syntax cluster props add=@javascriptVFunctions,javascriptVAttrs if !exists("javascript_props") diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim index 8696cb9..defba1e 100644 --- a/autoload/syntax/react.coffee.vim +++ b/autoload/syntax/react.coffee.vim @@ -2,20 +2,49 @@ " Language: React for coffee " Maintainer: othree " Last Change: 2017/02/15 -" Version: 0.12.0 -" URL: https://facebook.github.io/react/docs/top-level-api.html +" Version: 15.4.2 +" URL: https://facebook.github.io/react/docs/react-api.html +" URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword coffeeReact React ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot -syntax match coffeeRDot contained /\./ nextgroup=coffeeRProp +syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot +syntax match coffeeRDot contained /\./ nextgroup=coffeeRProps,coffeeRMethods -syntax keyword coffeeRTop contained createClass render unmountComponentAtNode renderToString -syntax keyword coffeeRTop contained renderToStaticMarkup isValidElement DOM PropTypes -syntax keyword coffeeRTop contained initializeTouchEvents Children map forEach count only -syntax keyword coffeeRComponent contained setState replaceState forceUpdate getDOMNode -syntax keyword coffeeRComponent contained isMounted setProps replaceProps +syntax keyword coffeeReact ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDDot +syntax match coffeeRDDot contained /\./ nextgroup=coffeeRDMethods -syntax cluster coffeeRProp contains=coffeeRTop,coffeeRComponent +syntax keyword coffeeReact ReactDOMServer containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDSDot +syntax match coffeeRDSDot contained /\./ nextgroup=coffeeRDSMethods + +" React +syntax keyword coffeeRProps contained Component nextgroup=coffeeRCompMethods +syntax keyword coffeeRProps contained PureComponent Children addons +syntax keyword coffeeRProps contained PropTypes nextgroup=coffeeRPropDot +syntax match coffeeRPropDot contained /\./ nextgroup=coffeeRPropProps,coffeeRPropMethods + +syntax keyword coffeeRMethods contained createClass createElement createFactory +syntax keyword coffeeRMethods contained cloneElement isValidElement + +" ReactDOM +syntax keyword coffeeRDMethods contained render unmountComponentAtNode findDOMNode + +" ReactDOMServer +syntax keyword coffeeRDMethods contained renderToString renderToStaticMarkup + +" React.Component +syntax keyword coffeeRCompMethods contained componentWillMount render componentDidMount +syntax keyword coffeeRCompMethods contained componentWillReceiveProps shouldComponentUpdate componentWillUpdate render componentDidUpdate +syntax keyword coffeeRCompMethods contained componentWillUnmount +syntax keyword coffeeRCompMethods contained setState forceUpdate +syntax keyword coffeeRCompProps contained defaultProps displayName propTypes + +" React.PropTypes +syntax keyword coffeeRPropProps contained array bool func number object string symbol node element isRequired +syntax keyword coffeeRPropMethods contained instanceOf oneOf oneOfType arrayOf objectOf shape any + + +syntax cluster coffeeRFunctions contains=coffeeRMethods,coffeeRDMethods,coffeeRCompMethods,coffeeRPropMethods +syntax cluster coffeeRAttrs contains=coffeeRProps,coffeeRCompProps,coffeeRPropProps " Define the default highlighting. @@ -31,8 +60,13 @@ if version >= 508 || !exists("did_jquery_coffee_syntax_inits") HiLink coffeeReact Constant - HiLink coffeeRTop PreProc - HiLink coffeeRComponent PreProc + HiLink coffeeRProps PreProc + HiLink coffeeRDMethods PreProc + HiLink coffeeRCompMethods PreProc + HiLink coffeeRPropMethods PreProc + HiLink coffeeRProps PreProc + HiLink coffeeRCompProps PreProc + HiLink coffeeRPropProps PreProc delcommand HiLink endif diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim index aa724b5..b10ff0c 100644 --- a/autoload/syntax/react.javascript.vim +++ b/autoload/syntax/react.javascript.vim @@ -2,20 +2,49 @@ " Language: React for javascript " Maintainer: othree " Last Change: 2017/02/15 -" Version: 0.12.0 -" URL: https://facebook.github.io/react/docs/top-level-api.html +" Version: 15.4.2 +" URL: https://facebook.github.io/react/docs/react-api.html +" URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword javascriptReact React ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot -syntax match javascriptRDot contained /\./ nextgroup=javascriptRProp +syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot +syntax match javascriptRDot contained /\./ nextgroup=javascriptRProps,javascriptRMethods -syntax keyword javascriptRTop contained createClass render unmountComponentAtNode renderToString -syntax keyword javascriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes -syntax keyword javascriptRTop contained initializeTouchEvents Children map forEach count only -syntax keyword javascriptRComponent contained setState replaceState forceUpdate getDOMNode -syntax keyword javascriptRComponent contained isMounted setProps replaceProps +syntax keyword javascriptReact ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDDot +syntax match javascriptRDDot contained /\./ nextgroup=javascriptRDMethods -syntax cluster javascriptRProp contains=javascriptRTop,javascriptRComponent +syntax keyword javascriptReact ReactDOMServer containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDSDot +syntax match javascriptRDSDot contained /\./ nextgroup=javascriptRDSMethods + +" React +syntax keyword javascriptRProps contained Component nextgroup=javascriptRCompMethods +syntax keyword javascriptRProps contained PureComponent Children addons +syntax keyword javascriptRProps contained PropTypes nextgroup=javascriptRPropDot +syntax match javascriptRPropDot contained /\./ nextgroup=javascriptRPropProps,javascriptRPropMethods + +syntax keyword javascriptRMethods contained createClass createElement createFactory +syntax keyword javascriptRMethods contained cloneElement isValidElement + +" ReactDOM +syntax keyword javascriptRDMethods contained render unmountComponentAtNode findDOMNode + +" ReactDOMServer +syntax keyword javascriptRDMethods contained renderToString renderToStaticMarkup + +" React.Component +syntax keyword javascriptRCompMethods contained componentWillMount render componentDidMount +syntax keyword javascriptRCompMethods contained componentWillReceiveProps shouldComponentUpdate componentWillUpdate render componentDidUpdate +syntax keyword javascriptRCompMethods contained componentWillUnmount +syntax keyword javascriptRCompMethods contained setState forceUpdate +syntax keyword javascriptRCompProps contained defaultProps displayName propTypes + +" React.PropTypes +syntax keyword javascriptRPropProps contained array bool func number object string symbol node element isRequired +syntax keyword javascriptRPropMethods contained instanceOf oneOf oneOfType arrayOf objectOf shape any + + +syntax cluster javascriptRFunctions contains=javascriptRMethods,javascriptRDMethods,javascriptRCompMethods,javascriptRPropMethods +syntax cluster javascriptRAttrs contains=javascriptRProps,javascriptRCompProps,javascriptRPropProps " Define the default highlighting. @@ -31,8 +60,13 @@ if version >= 508 || !exists("did_jquery_javascript_syntax_inits") HiLink javascriptReact Constant - HiLink javascriptRTop PreProc - HiLink javascriptRComponent PreProc + HiLink javascriptRProps PreProc + HiLink javascriptRDMethods PreProc + HiLink javascriptRCompMethods PreProc + HiLink javascriptRPropMethods PreProc + HiLink javascriptRProps PreProc + HiLink javascriptRCompProps PreProc + HiLink javascriptRPropProps PreProc delcommand HiLink endif diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim index 462f748..8efbca0 100644 --- a/autoload/syntax/react.ls.vim +++ b/autoload/syntax/react.ls.vim @@ -2,20 +2,49 @@ " Language: React for ls " Maintainer: othree " Last Change: 2017/02/15 -" Version: 0.12.0 -" URL: https://facebook.github.io/react/docs/top-level-api.html +" Version: 15.4.2 +" URL: https://facebook.github.io/react/docs/react-api.html +" URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword lsReact React ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot -syntax match lsRDot contained /\./ nextgroup=lsRProp +syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot +syntax match lsRDot contained /\./ nextgroup=lsRProps,lsRMethods -syntax keyword lsRTop contained createClass render unmountComponentAtNode renderToString -syntax keyword lsRTop contained renderToStaticMarkup isValidElement DOM PropTypes -syntax keyword lsRTop contained initializeTouchEvents Children map forEach count only -syntax keyword lsRComponent contained setState replaceState forceUpdate getDOMNode -syntax keyword lsRComponent contained isMounted setProps replaceProps +syntax keyword lsReact ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDDot +syntax match lsRDDot contained /\./ nextgroup=lsRDMethods -syntax cluster lsRProp contains=lsRTop,lsRComponent +syntax keyword lsReact ReactDOMServer containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDSDot +syntax match lsRDSDot contained /\./ nextgroup=lsRDSMethods + +" React +syntax keyword lsRProps contained Component nextgroup=lsRCompMethods +syntax keyword lsRProps contained PureComponent Children addons +syntax keyword lsRProps contained PropTypes nextgroup=lsRPropDot +syntax match lsRPropDot contained /\./ nextgroup=lsRPropProps,lsRPropMethods + +syntax keyword lsRMethods contained createClass createElement createFactory +syntax keyword lsRMethods contained cloneElement isValidElement + +" ReactDOM +syntax keyword lsRDMethods contained render unmountComponentAtNode findDOMNode + +" ReactDOMServer +syntax keyword lsRDMethods contained renderToString renderToStaticMarkup + +" React.Component +syntax keyword lsRCompMethods contained componentWillMount render componentDidMount +syntax keyword lsRCompMethods contained componentWillReceiveProps shouldComponentUpdate componentWillUpdate render componentDidUpdate +syntax keyword lsRCompMethods contained componentWillUnmount +syntax keyword lsRCompMethods contained setState forceUpdate +syntax keyword lsRCompProps contained defaultProps displayName propTypes + +" React.PropTypes +syntax keyword lsRPropProps contained array bool func number object string symbol node element isRequired +syntax keyword lsRPropMethods contained instanceOf oneOf oneOfType arrayOf objectOf shape any + + +syntax cluster lsRFunctions contains=lsRMethods,lsRDMethods,lsRCompMethods,lsRPropMethods +syntax cluster lsRAttrs contains=lsRProps,lsRCompProps,lsRPropProps " Define the default highlighting. @@ -31,8 +60,13 @@ if version >= 508 || !exists("did_jquery_ls_syntax_inits") HiLink lsReact Constant - HiLink lsRTop PreProc - HiLink lsRComponent PreProc + HiLink lsRProps PreProc + HiLink lsRDMethods PreProc + HiLink lsRCompMethods PreProc + HiLink lsRPropMethods PreProc + HiLink lsRProps PreProc + HiLink lsRCompProps PreProc + HiLink lsRPropProps PreProc delcommand HiLink endif diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim index e14d9d4..4ef84ef 100644 --- a/autoload/syntax/react.typescript.vim +++ b/autoload/syntax/react.typescript.vim @@ -2,20 +2,49 @@ " Language: React for typescript " Maintainer: othree " Last Change: 2017/02/15 -" Version: 0.12.0 -" URL: https://facebook.github.io/react/docs/top-level-api.html +" Version: 15.4.2 +" URL: https://facebook.github.io/react/docs/react-api.html +" URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword typescriptReact React ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot -syntax match typescriptRDot contained /\./ nextgroup=typescriptRProp +syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot +syntax match typescriptRDot contained /\./ nextgroup=typescriptRProps,typescriptRMethods -syntax keyword typescriptRTop contained createClass render unmountComponentAtNode renderToString -syntax keyword typescriptRTop contained renderToStaticMarkup isValidElement DOM PropTypes -syntax keyword typescriptRTop contained initializeTouchEvents Children map forEach count only -syntax keyword typescriptRComponent contained setState replaceState forceUpdate getDOMNode -syntax keyword typescriptRComponent contained isMounted setProps replaceProps +syntax keyword typescriptReact ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDDot +syntax match typescriptRDDot contained /\./ nextgroup=typescriptRDMethods -syntax cluster typescriptRProp contains=typescriptRTop,typescriptRComponent +syntax keyword typescriptReact ReactDOMServer containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDSDot +syntax match typescriptRDSDot contained /\./ nextgroup=typescriptRDSMethods + +" React +syntax keyword typescriptRProps contained Component nextgroup=typescriptRCompMethods +syntax keyword typescriptRProps contained PureComponent Children addons +syntax keyword typescriptRProps contained PropTypes nextgroup=typescriptRPropDot +syntax match typescriptRPropDot contained /\./ nextgroup=typescriptRPropProps,typescriptRPropMethods + +syntax keyword typescriptRMethods contained createClass createElement createFactory +syntax keyword typescriptRMethods contained cloneElement isValidElement + +" ReactDOM +syntax keyword typescriptRDMethods contained render unmountComponentAtNode findDOMNode + +" ReactDOMServer +syntax keyword typescriptRDMethods contained renderToString renderToStaticMarkup + +" React.Component +syntax keyword typescriptRCompMethods contained componentWillMount render componentDidMount +syntax keyword typescriptRCompMethods contained componentWillReceiveProps shouldComponentUpdate componentWillUpdate render componentDidUpdate +syntax keyword typescriptRCompMethods contained componentWillUnmount +syntax keyword typescriptRCompMethods contained setState forceUpdate +syntax keyword typescriptRCompProps contained defaultProps displayName propTypes + +" React.PropTypes +syntax keyword typescriptRPropProps contained array bool func number object string symbol node element isRequired +syntax keyword typescriptRPropMethods contained instanceOf oneOf oneOfType arrayOf objectOf shape any + + +syntax cluster typescriptRFunctions contains=typescriptRMethods,typescriptRDMethods,typescriptRCompMethods,typescriptRPropMethods +syntax cluster typescriptRAttrs contains=typescriptRProps,typescriptRCompProps,typescriptRPropProps " Define the default highlighting. @@ -31,8 +60,13 @@ if version >= 508 || !exists("did_jquery_typescript_syntax_inits") HiLink typescriptReact Constant - HiLink typescriptRTop PreProc - HiLink typescriptRComponent PreProc + HiLink typescriptRProps PreProc + HiLink typescriptRDMethods PreProc + HiLink typescriptRCompMethods PreProc + HiLink typescriptRPropMethods PreProc + HiLink typescriptRProps PreProc + HiLink typescriptRCompProps PreProc + HiLink typescriptRPropProps PreProc delcommand HiLink endif From 3d0039fe05ae684787d03266a0715758eb5ac495 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Mar 2017 12:32:37 +0800 Subject: [PATCH 72/80] Expose React first level property/method --- autoload/syntax/react.coffee.vim | 24 ++++++++++++------------ autoload/syntax/react.javascript.vim | 24 ++++++++++++------------ autoload/syntax/react.ls.vim | 24 ++++++++++++------------ autoload/syntax/react.typescript.vim | 24 ++++++++++++------------ 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim index defba1e..f4d6730 100644 --- a/autoload/syntax/react.coffee.vim +++ b/autoload/syntax/react.coffee.vim @@ -1,35 +1,35 @@ " Vim syntax file " Language: React for coffee " Maintainer: othree -" Last Change: 2017/02/15 -" Version: 15.4.2 +" Last Change: 2017/03/29 +" Version: 15.4.2.1 " URL: https://facebook.github.io/react/docs/react-api.html " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot +syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot syntax match coffeeRDot contained /\./ nextgroup=coffeeRProps,coffeeRMethods -syntax keyword coffeeReact ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDDot +syntax keyword coffeeReact ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDDot syntax match coffeeRDDot contained /\./ nextgroup=coffeeRDMethods -syntax keyword coffeeReact ReactDOMServer containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDSDot +syntax keyword coffeeReact ReactDOMServer containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDSDot syntax match coffeeRDSDot contained /\./ nextgroup=coffeeRDSMethods " React -syntax keyword coffeeRProps contained Component nextgroup=coffeeRCompMethods -syntax keyword coffeeRProps contained PureComponent Children addons -syntax keyword coffeeRProps contained PropTypes nextgroup=coffeeRPropDot +syntax keyword coffeeRProps Component nextgroup=coffeeRCompMethods +syntax keyword coffeeRProps PureComponent Children addons +syntax keyword coffeeRProps PropTypes nextgroup=coffeeRPropDot syntax match coffeeRPropDot contained /\./ nextgroup=coffeeRPropProps,coffeeRPropMethods -syntax keyword coffeeRMethods contained createClass createElement createFactory -syntax keyword coffeeRMethods contained cloneElement isValidElement +syntax keyword coffeeRMethods createClass createElement createFactory +syntax keyword coffeeRMethods cloneElement isValidElement " ReactDOM -syntax keyword coffeeRDMethods contained render unmountComponentAtNode findDOMNode +syntax keyword coffeeRDMethods render unmountComponentAtNode findDOMNode " ReactDOMServer -syntax keyword coffeeRDMethods contained renderToString renderToStaticMarkup +syntax keyword coffeeRDMethods renderToString renderToStaticMarkup " React.Component syntax keyword coffeeRCompMethods contained componentWillMount render componentDidMount diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim index b10ff0c..417174d 100644 --- a/autoload/syntax/react.javascript.vim +++ b/autoload/syntax/react.javascript.vim @@ -1,35 +1,35 @@ " Vim syntax file " Language: React for javascript " Maintainer: othree -" Last Change: 2017/02/15 -" Version: 15.4.2 +" Last Change: 2017/03/29 +" Version: 15.4.2.1 " URL: https://facebook.github.io/react/docs/react-api.html " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot +syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot syntax match javascriptRDot contained /\./ nextgroup=javascriptRProps,javascriptRMethods -syntax keyword javascriptReact ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDDot +syntax keyword javascriptReact ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDDot syntax match javascriptRDDot contained /\./ nextgroup=javascriptRDMethods -syntax keyword javascriptReact ReactDOMServer containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDSDot +syntax keyword javascriptReact ReactDOMServer containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDSDot syntax match javascriptRDSDot contained /\./ nextgroup=javascriptRDSMethods " React -syntax keyword javascriptRProps contained Component nextgroup=javascriptRCompMethods -syntax keyword javascriptRProps contained PureComponent Children addons -syntax keyword javascriptRProps contained PropTypes nextgroup=javascriptRPropDot +syntax keyword javascriptRProps Component nextgroup=javascriptRCompMethods +syntax keyword javascriptRProps PureComponent Children addons +syntax keyword javascriptRProps PropTypes nextgroup=javascriptRPropDot syntax match javascriptRPropDot contained /\./ nextgroup=javascriptRPropProps,javascriptRPropMethods -syntax keyword javascriptRMethods contained createClass createElement createFactory -syntax keyword javascriptRMethods contained cloneElement isValidElement +syntax keyword javascriptRMethods createClass createElement createFactory +syntax keyword javascriptRMethods cloneElement isValidElement " ReactDOM -syntax keyword javascriptRDMethods contained render unmountComponentAtNode findDOMNode +syntax keyword javascriptRDMethods render unmountComponentAtNode findDOMNode " ReactDOMServer -syntax keyword javascriptRDMethods contained renderToString renderToStaticMarkup +syntax keyword javascriptRDMethods renderToString renderToStaticMarkup " React.Component syntax keyword javascriptRCompMethods contained componentWillMount render componentDidMount diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim index 8efbca0..44de328 100644 --- a/autoload/syntax/react.ls.vim +++ b/autoload/syntax/react.ls.vim @@ -1,35 +1,35 @@ " Vim syntax file " Language: React for ls " Maintainer: othree -" Last Change: 2017/02/15 -" Version: 15.4.2 +" Last Change: 2017/03/29 +" Version: 15.4.2.1 " URL: https://facebook.github.io/react/docs/react-api.html " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot +syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot syntax match lsRDot contained /\./ nextgroup=lsRProps,lsRMethods -syntax keyword lsReact ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDDot +syntax keyword lsReact ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDDot syntax match lsRDDot contained /\./ nextgroup=lsRDMethods -syntax keyword lsReact ReactDOMServer containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDSDot +syntax keyword lsReact ReactDOMServer containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDSDot syntax match lsRDSDot contained /\./ nextgroup=lsRDSMethods " React -syntax keyword lsRProps contained Component nextgroup=lsRCompMethods -syntax keyword lsRProps contained PureComponent Children addons -syntax keyword lsRProps contained PropTypes nextgroup=lsRPropDot +syntax keyword lsRProps Component nextgroup=lsRCompMethods +syntax keyword lsRProps PureComponent Children addons +syntax keyword lsRProps PropTypes nextgroup=lsRPropDot syntax match lsRPropDot contained /\./ nextgroup=lsRPropProps,lsRPropMethods -syntax keyword lsRMethods contained createClass createElement createFactory -syntax keyword lsRMethods contained cloneElement isValidElement +syntax keyword lsRMethods createClass createElement createFactory +syntax keyword lsRMethods cloneElement isValidElement " ReactDOM -syntax keyword lsRDMethods contained render unmountComponentAtNode findDOMNode +syntax keyword lsRDMethods render unmountComponentAtNode findDOMNode " ReactDOMServer -syntax keyword lsRDMethods contained renderToString renderToStaticMarkup +syntax keyword lsRDMethods renderToString renderToStaticMarkup " React.Component syntax keyword lsRCompMethods contained componentWillMount render componentDidMount diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim index 4ef84ef..4001d44 100644 --- a/autoload/syntax/react.typescript.vim +++ b/autoload/syntax/react.typescript.vim @@ -1,35 +1,35 @@ " Vim syntax file " Language: React for typescript " Maintainer: othree -" Last Change: 2017/02/15 -" Version: 15.4.2 +" Last Change: 2017/03/29 +" Version: 15.4.2.1 " URL: https://facebook.github.io/react/docs/react-api.html " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot +syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot syntax match typescriptRDot contained /\./ nextgroup=typescriptRProps,typescriptRMethods -syntax keyword typescriptReact ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDDot +syntax keyword typescriptReact ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDDot syntax match typescriptRDDot contained /\./ nextgroup=typescriptRDMethods -syntax keyword typescriptReact ReactDOMServer containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDSDot +syntax keyword typescriptReact ReactDOMServer containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDSDot syntax match typescriptRDSDot contained /\./ nextgroup=typescriptRDSMethods " React -syntax keyword typescriptRProps contained Component nextgroup=typescriptRCompMethods -syntax keyword typescriptRProps contained PureComponent Children addons -syntax keyword typescriptRProps contained PropTypes nextgroup=typescriptRPropDot +syntax keyword typescriptRProps Component nextgroup=typescriptRCompMethods +syntax keyword typescriptRProps PureComponent Children addons +syntax keyword typescriptRProps PropTypes nextgroup=typescriptRPropDot syntax match typescriptRPropDot contained /\./ nextgroup=typescriptRPropProps,typescriptRPropMethods -syntax keyword typescriptRMethods contained createClass createElement createFactory -syntax keyword typescriptRMethods contained cloneElement isValidElement +syntax keyword typescriptRMethods createClass createElement createFactory +syntax keyword typescriptRMethods cloneElement isValidElement " ReactDOM -syntax keyword typescriptRDMethods contained render unmountComponentAtNode findDOMNode +syntax keyword typescriptRDMethods render unmountComponentAtNode findDOMNode " ReactDOMServer -syntax keyword typescriptRDMethods contained renderToString renderToStaticMarkup +syntax keyword typescriptRDMethods renderToString renderToStaticMarkup " React.Component syntax keyword typescriptRCompMethods contained componentWillMount render componentDidMount From 6f681491207ae07d72ba19bcfdf6e918ff4ec05c Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 29 Mar 2017 12:46:49 +0800 Subject: [PATCH 73/80] Jasmine 2.5 --- autoload/syntax/jasmine.coffee.vim | 40 ++++++++++++-------------- autoload/syntax/jasmine.javascript.vim | 40 ++++++++++++-------------- autoload/syntax/jasmine.ls.vim | 40 ++++++++++++-------------- autoload/syntax/jasmine.typescript.vim | 40 ++++++++++++-------------- 4 files changed, 76 insertions(+), 84 deletions(-) diff --git a/autoload/syntax/jasmine.coffee.vim b/autoload/syntax/jasmine.coffee.vim index d8626d2..add12a0 100644 --- a/autoload/syntax/jasmine.coffee.vim +++ b/autoload/syntax/jasmine.coffee.vim @@ -1,40 +1,38 @@ " Vim syntax file " Language: jasmine for coffee " Maintainer: othree -" Last Change: 2016/04/19 -" Version: 2.0 +" Last Change: 2017/03/29 +" Version: 2.5 " URL: http://jasmine.github.io/ syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeJdot -syntax match coffeeJdot contained /\./ nextgroup=coffeeJMethods -syntax keyword coffeeJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv +syntax match coffeeJdot contained /\./ nextgroup=coffeeJMethods +syntax keyword coffeeJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching -syntax keyword coffeeJMethods contained tick useMock -syntax keyword coffeeJMethods contained addReporter specFilter +syntax keyword coffeeJMethods contained tick useMock +syntax keyword coffeeJMethods contained addReporter specFilter syntax cluster coffeeJFunctions contains=coffeeJMethods,coffeeJEnvMethods,coffeeJEnvMethods,coffeeJExpectMethods,coffeeJSpyMethods,coffeeJSpyAndMethods,coffeeJSpyCallsMethods -syntax cluster coffeeJAttrs contains=coffeeJExpectNot,coffeeJSpyAnd,coffeeJSpyCalls +syntax cluster coffeeJAttrs contains=coffeeJExpectNot,coffeeJSpyAnd,coffeeJSpyCalls -syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJSpyAnd and contained -syntax keyword coffeeJSpyAndMethods returnValue callFake throwError stub contained -syntax keyword coffeeJSpyCalls calls contained -syntax keyword coffeeJSpyMethods andReturn andCallThrough callThrough contained -syntax keyword coffeeJCallsMethods any count argsFor allArgs all mostRecent first reset contained +syntax keyword coffeeJSpyAnd contained and +syntax keyword coffeeJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub +syntax keyword coffeeJSpyCalls contained calls +syntax keyword coffeeJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword coffeeJGlobalMethod expect containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJExpectNot not contained nextgroup=coffeeJExpectNotdot - -syntax keyword coffeeJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained -syntax keyword coffeeJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained -syntax keyword coffeeJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained +syntax keyword coffeeJGlobalMethod expect fail pending containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJExpectNot contained not contained nextgroup=coffeeJExpectNotdot +syntax keyword coffeeJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch +syntax keyword coffeeJExpectMethods contained toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy +syntax keyword coffeeJExpectMethods contained toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/jasmine.javascript.vim b/autoload/syntax/jasmine.javascript.vim index 383036f..689057d 100644 --- a/autoload/syntax/jasmine.javascript.vim +++ b/autoload/syntax/jasmine.javascript.vim @@ -1,40 +1,38 @@ " Vim syntax file " Language: jasmine for javascript " Maintainer: othree -" Last Change: 2016/04/19 -" Version: 2.0 +" Last Change: 2017/03/29 +" Version: 2.5 " URL: http://jasmine.github.io/ syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptJdot -syntax match javascriptJdot contained /\./ nextgroup=javascriptJMethods -syntax keyword javascriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv +syntax match javascriptJdot contained /\./ nextgroup=javascriptJMethods +syntax keyword javascriptJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching -syntax keyword javascriptJMethods contained tick useMock -syntax keyword javascriptJMethods contained addReporter specFilter +syntax keyword javascriptJMethods contained tick useMock +syntax keyword javascriptJMethods contained addReporter specFilter syntax cluster javascriptJFunctions contains=javascriptJMethods,javascriptJEnvMethods,javascriptJEnvMethods,javascriptJExpectMethods,javascriptJSpyMethods,javascriptJSpyAndMethods,javascriptJSpyCallsMethods -syntax cluster javascriptJAttrs contains=javascriptJExpectNot,javascriptJSpyAnd,javascriptJSpyCalls +syntax cluster javascriptJAttrs contains=javascriptJExpectNot,javascriptJSpyAnd,javascriptJSpyCalls -syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJSpyAnd and contained -syntax keyword javascriptJSpyAndMethods returnValue callFake throwError stub contained -syntax keyword javascriptJSpyCalls calls contained -syntax keyword javascriptJSpyMethods andReturn andCallThrough callThrough contained -syntax keyword javascriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained +syntax keyword javascriptJSpyAnd contained and +syntax keyword javascriptJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub +syntax keyword javascriptJSpyCalls contained calls +syntax keyword javascriptJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword javascriptJGlobalMethod expect containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJExpectNot not contained nextgroup=javascriptJExpectNotdot - -syntax keyword javascriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained -syntax keyword javascriptJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained -syntax keyword javascriptJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained +syntax keyword javascriptJGlobalMethod expect fail pending containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJExpectNot contained not contained nextgroup=javascriptJExpectNotdot +syntax keyword javascriptJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch +syntax keyword javascriptJExpectMethods contained toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy +syntax keyword javascriptJExpectMethods contained toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/jasmine.ls.vim b/autoload/syntax/jasmine.ls.vim index b30865a..49033e3 100644 --- a/autoload/syntax/jasmine.ls.vim +++ b/autoload/syntax/jasmine.ls.vim @@ -1,40 +1,38 @@ " Vim syntax file " Language: jasmine for ls " Maintainer: othree -" Last Change: 2016/04/19 -" Version: 2.0 +" Last Change: 2017/03/29 +" Version: 2.5 " URL: http://jasmine.github.io/ syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsJdot -syntax match lsJdot contained /\./ nextgroup=lsJMethods -syntax keyword lsJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv +syntax match lsJdot contained /\./ nextgroup=lsJMethods +syntax keyword lsJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching -syntax keyword lsJMethods contained tick useMock -syntax keyword lsJMethods contained addReporter specFilter +syntax keyword lsJMethods contained tick useMock +syntax keyword lsJMethods contained addReporter specFilter syntax cluster lsJFunctions contains=lsJMethods,lsJEnvMethods,lsJEnvMethods,lsJExpectMethods,lsJSpyMethods,lsJSpyAndMethods,lsJSpyCallsMethods -syntax cluster lsJAttrs contains=lsJExpectNot,lsJSpyAnd,lsJSpyCalls +syntax cluster lsJAttrs contains=lsJExpectNot,lsJSpyAnd,lsJSpyCalls -syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJSpyAnd and contained -syntax keyword lsJSpyAndMethods returnValue callFake throwError stub contained -syntax keyword lsJSpyCalls calls contained -syntax keyword lsJSpyMethods andReturn andCallThrough callThrough contained -syntax keyword lsJCallsMethods any count argsFor allArgs all mostRecent first reset contained +syntax keyword lsJSpyAnd contained and +syntax keyword lsJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub +syntax keyword lsJSpyCalls contained calls +syntax keyword lsJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword lsJGlobalMethod expect containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJExpectNot not contained nextgroup=lsJExpectNotdot - -syntax keyword lsJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained -syntax keyword lsJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained -syntax keyword lsJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained +syntax keyword lsJGlobalMethod expect fail pending containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJExpectNot contained not contained nextgroup=lsJExpectNotdot +syntax keyword lsJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch +syntax keyword lsJExpectMethods contained toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy +syntax keyword lsJExpectMethods contained toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/autoload/syntax/jasmine.typescript.vim b/autoload/syntax/jasmine.typescript.vim index adaa88e..a77f785 100644 --- a/autoload/syntax/jasmine.typescript.vim +++ b/autoload/syntax/jasmine.typescript.vim @@ -1,40 +1,38 @@ " Vim syntax file " Language: jasmine for typescript " Maintainer: othree -" Last Change: 2016/04/19 -" Version: 2.0 +" Last Change: 2017/03/29 +" Version: 2.5 " URL: http://jasmine.github.io/ syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptJdot -syntax match typescriptJdot contained /\./ nextgroup=typescriptJMethods -syntax keyword typescriptJMethods contained any createSpy createSpyObj HtmlReporter Clock getEnv +syntax match typescriptJdot contained /\./ nextgroup=typescriptJMethods +syntax keyword typescriptJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching -syntax keyword typescriptJMethods contained tick useMock -syntax keyword typescriptJMethods contained addReporter specFilter +syntax keyword typescriptJMethods contained tick useMock +syntax keyword typescriptJMethods contained addReporter specFilter syntax cluster typescriptJFunctions contains=typescriptJMethods,typescriptJEnvMethods,typescriptJEnvMethods,typescriptJExpectMethods,typescriptJSpyMethods,typescriptJSpyAndMethods,typescriptJSpyCallsMethods -syntax cluster typescriptJAttrs contains=typescriptJExpectNot,typescriptJSpyAnd,typescriptJSpyCalls +syntax cluster typescriptJAttrs contains=typescriptJExpectNot,typescriptJSpyAnd,typescriptJSpyCalls -syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJSpyAnd and contained -syntax keyword typescriptJSpyAndMethods returnValue callFake throwError stub contained -syntax keyword typescriptJSpyCalls calls contained -syntax keyword typescriptJSpyMethods andReturn andCallThrough callThrough contained -syntax keyword typescriptJCallsMethods any count argsFor allArgs all mostRecent first reset contained +syntax keyword typescriptJSpyAnd contained and +syntax keyword typescriptJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub +syntax keyword typescriptJSpyCalls contained calls +syntax keyword typescriptJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword typescriptJGlobalMethod expect containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJExpectNot not contained nextgroup=typescriptJExpectNotdot - -syntax keyword typescriptJExpectMethods toHaveBeenCalled toHaveBeenCalledWith toEqual toBe toMatch contained -syntax keyword typescriptJExpectMethods toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy contained -syntax keyword typescriptJExpectMethods toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow contained +syntax keyword typescriptJGlobalMethod expect fail pending containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJExpectNot contained not contained nextgroup=typescriptJExpectNotdot +syntax keyword typescriptJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch +syntax keyword typescriptJExpectMethods contained toBeDefined toBeUndefined toBeNull toBeTruthy toBeFalsy +syntax keyword typescriptJExpectMethods contained toContain toBeCloseTo toBeLessThan toBeGreaterThan toThrow " Define the default highlighting. " For version 5.7 and earlier: only when not done already From 6b16bf54cc89a6f81a6126c0df73a3407df491bf Mon Sep 17 00:00:00 2001 From: othree Date: Tue, 18 Apr 2017 11:21:10 +0800 Subject: [PATCH 74/80] Detect b:current_syntax before load --- after/syntax/coffee.vim | 6 +++--- after/syntax/html.vim | 6 +++--- after/syntax/javascript.vim | 6 +++--- after/syntax/ls.vim | 6 +++--- after/syntax/typescript.vim | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim index f70de93..0e3416d 100644 --- a/after/syntax/coffee.vim +++ b/after/syntax/coffee.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/08/26 -" Version: 0.4.1 +" Last Change: 2017/04/18 +" Version: 0.4.2 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if b:current_syntax == 'coffee' +if exists('b:current_syntax') && b:current_syntax == 'coffee' call jslibsyntax#load() endif diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 7f5ac1d..c6ea1f9 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/08/26 -" Version: 0.5.1 +" Last Change: 2017/04/18 +" Version: 0.4.2 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if b:current_syntax == 'html' +if exists('b:current_syntax') && b:current_syntax == 'html' call jslibsyntax#load() endif diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim index ff0e5a4..fb997ca 100644 --- a/after/syntax/javascript.vim +++ b/after/syntax/javascript.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/08/26 -" Version: 0.4.1 +" Last Change: 2017/04/18 +" Version: 0.4.2 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if b:current_syntax == 'javascript' +if exists('b:current_syntax') && b:current_syntax == 'javascript' call jslibsyntax#load() endif diff --git a/after/syntax/ls.vim b/after/syntax/ls.vim index 2d7e77c..9d001df 100644 --- a/after/syntax/ls.vim +++ b/after/syntax/ls.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/08/26 -" Version: 0.4.1 +" Last Change: 2017/04/18 +" Version: 0.4.2 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if b:current_syntax == 'ls' +if exists('b:current_syntax') && b:current_syntax == 'ls' call jslibsyntax#load() endif diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim index 69d3b06..5aefe85 100644 --- a/after/syntax/typescript.vim +++ b/after/syntax/typescript.vim @@ -1,10 +1,10 @@ " Vim plugin file " Language: " Maintainer: othree -" Last Change: 2013/08/26 -" Version: 0.4.1 +" Last Change: 2017/04/18 +" Version: 0.4.2 " URL: https://github.com/othree/javascript-libraries-syntax.vim -if b:current_syntax == 'typescript' +if exists('b:current_syntax') && b:current_syntax == 'typescript' call jslibsyntax#load() endif From fe6909af69db30d22df6295ab5811f3c73e33ed8 Mon Sep 17 00:00:00 2001 From: othree Date: Wed, 20 Sep 2017 10:27:40 +0800 Subject: [PATCH 75/80] Fix #66, supports coffeescript heredoc --- autoload/syntax/postprocess.coffee.vim | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/autoload/syntax/postprocess.coffee.vim b/autoload/syntax/postprocess.coffee.vim index 34898ae..70e1135 100644 --- a/autoload/syntax/postprocess.coffee.vim +++ b/autoload/syntax/postprocess.coffee.vim @@ -13,7 +13,10 @@ syntax cluster props add=@coffeeRaFunctions syntax cluster props add=@coffeeQAttrs,@coffee_Attrs,@coffeeBAttrs,@coffeepAttrs,@coffeeAAttrs,@coffeeJAttrs syntax cluster props add=@coffeeRProp " syntax match coffeeLDot /\./ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeLibraryFuncs,@coffeeLibraryAttrs -" -syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors -syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@coffeeBasicString,@jSelectors + + +syntax region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=@coffeeInterpString,@jSelectors +syntax region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=@coffeeBasicString,@jSelectors +syntax region coffeeHeredoc start=/"""/ end=/"""/ contains=@coffeeInterpString fold +syntax region coffeeHeredoc start=/'''/ end=/'''/ contains=@coffeeBasicString fold From 188b6b521f1d6424d0a2a77ef575661dc8fcd6ef Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 22 Feb 2018 17:33:38 +0800 Subject: [PATCH 76/80] Add tape support --- README.md | 4 +++- autoload/jslibsyntax.vim | 3 ++- autoload/syntax/tape.coffee.vim | 36 +++++++++++++++++++++++++++++ autoload/syntax/tape.javascript.vim | 36 +++++++++++++++++++++++++++++ autoload/syntax/tape.ls.vim | 36 +++++++++++++++++++++++++++++ autoload/syntax/tape.typescript.vim | 36 +++++++++++++++++++++++++++++ autoload/syntax/update.sh | 2 +- 7 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 autoload/syntax/tape.coffee.vim create mode 100644 autoload/syntax/tape.javascript.vim create mode 100644 autoload/syntax/tape.ls.vim create mode 100644 autoload/syntax/tape.typescript.vim diff --git a/README.md b/README.md index c1922bf..3f967da 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Libraries * [Ramda](http://ramdajs.com/) * [Vue](https://vuejs.org/) * [d3](https://d3js.org/) +* [tape](https://github.com/substack/tape), assume test and t as global object File Types ---------- @@ -74,8 +75,9 @@ Support libs id: * Ramda: ramda * Vue.js: vue * d3.js: d3 +* tape: tape -Default lib set is: `jquery,underscore,backbone` +Default lib set is: `jquery,underscore,backbone,react` You can use [local vimrc][] to setup libraries used in project. Sample code for local vimrc: diff --git a/autoload/jslibsyntax.vim b/autoload/jslibsyntax.vim index f32be96..f823899 100644 --- a/autoload/jslibsyntax.vim +++ b/autoload/jslibsyntax.vim @@ -22,7 +22,8 @@ let s:libs = [ \ 'flux', \ 'handlebars', \ 'd3', - \ 'vue' + \ 'vue', + \ 'tape' \ ] let s:default_libs = [ diff --git a/autoload/syntax/tape.coffee.vim b/autoload/syntax/tape.coffee.vim new file mode 100644 index 0000000..eeaae01 --- /dev/null +++ b/autoload/syntax/tape.coffee.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: tape for coffee +" Maintainer: othree +" Last Change: 2018/02/21 +" Version: 4.9.0 +" URL: https://github.com/substack/tape + + +syntax keyword coffeeTape test containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTdot +syntax match coffeeTdot contained /\./ nextgroup=coffeeTMethods +syntax keyword coffeeTMethods contained skip onfinish onFailure createHarness only createStream + +syntax keyword coffeeTapeAssert t containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTAssertdot +syntax match coffeeTAssertdot contained /\./ nextgroup=coffeeTAssertMethods +syntax keyword coffeeTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error +syntax keyword coffeeTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual +syntax keyword coffeeTAssertMethods contained throws dowsNotThrow test comment + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_coffee_syntax_inits") + if version < 508 + let did_requirejs_coffee_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink coffeeTape Constant + HiLink coffeeTMethods PreProc + HiLink coffeeTapeAssert Constant + HiLink coffeeTAssertMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/tape.javascript.vim b/autoload/syntax/tape.javascript.vim new file mode 100644 index 0000000..adcd0ec --- /dev/null +++ b/autoload/syntax/tape.javascript.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: tape for javascript +" Maintainer: othree +" Last Change: 2018/02/21 +" Version: 4.9.0 +" URL: https://github.com/substack/tape + + +syntax keyword javascriptTape test containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTdot +syntax match javascriptTdot contained /\./ nextgroup=javascriptTMethods +syntax keyword javascriptTMethods contained skip onfinish onFailure createHarness only createStream + +syntax keyword javascriptTapeAssert t containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTAssertdot +syntax match javascriptTAssertdot contained /\./ nextgroup=javascriptTAssertMethods +syntax keyword javascriptTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error +syntax keyword javascriptTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual +syntax keyword javascriptTAssertMethods contained throws dowsNotThrow test comment + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_javascript_syntax_inits") + if version < 508 + let did_requirejs_javascript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink javascriptTape Constant + HiLink javascriptTMethods PreProc + HiLink javascriptTapeAssert Constant + HiLink javascriptTAssertMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/tape.ls.vim b/autoload/syntax/tape.ls.vim new file mode 100644 index 0000000..e90caa9 --- /dev/null +++ b/autoload/syntax/tape.ls.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: tape for ls +" Maintainer: othree +" Last Change: 2018/02/21 +" Version: 4.9.0 +" URL: https://github.com/substack/tape + + +syntax keyword lsTape test containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTdot +syntax match lsTdot contained /\./ nextgroup=lsTMethods +syntax keyword lsTMethods contained skip onfinish onFailure createHarness only createStream + +syntax keyword lsTapeAssert t containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTAssertdot +syntax match lsTAssertdot contained /\./ nextgroup=lsTAssertMethods +syntax keyword lsTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error +syntax keyword lsTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual +syntax keyword lsTAssertMethods contained throws dowsNotThrow test comment + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_ls_syntax_inits") + if version < 508 + let did_requirejs_ls_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink lsTape Constant + HiLink lsTMethods PreProc + HiLink lsTapeAssert Constant + HiLink lsTAssertMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/tape.typescript.vim b/autoload/syntax/tape.typescript.vim new file mode 100644 index 0000000..cd0c2bd --- /dev/null +++ b/autoload/syntax/tape.typescript.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: tape for typescript +" Maintainer: othree +" Last Change: 2018/02/21 +" Version: 4.9.0 +" URL: https://github.com/substack/tape + + +syntax keyword typescriptTape test containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTdot +syntax match typescriptTdot contained /\./ nextgroup=typescriptTMethods +syntax keyword typescriptTMethods contained skip onfinish onFailure createHarness only createStream + +syntax keyword typescriptTapeAssert t containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTAssertdot +syntax match typescriptTAssertdot contained /\./ nextgroup=typescriptTAssertMethods +syntax keyword typescriptTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error +syntax keyword typescriptTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual +syntax keyword typescriptTAssertMethods contained throws dowsNotThrow test comment + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_requirejs_typescript_syntax_inits") + if version < 508 + let did_requirejs_typescript_syntax_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink typescriptTape Constant + HiLink typescriptTMethods PreProc + HiLink typescriptTapeAssert Constant + HiLink typescriptTAssertMethods PreProc + + delcommand HiLink +endif diff --git a/autoload/syntax/update.sh b/autoload/syntax/update.sh index e1830d3..f851b3d 100755 --- a/autoload/syntax/update.sh +++ b/autoload/syntax/update.sh @@ -1,6 +1,6 @@ for filetype in 'coffee' 'ls' 'typescript' do - for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' 'vue' 'd3' + for lib in 'jquery' 'underscore' 'backbone' 'prelude' 'angularjs' 'angularuirouter' 'requirejs' 'sugar' 'jasmine' 'chai' 'ramda' 'react' 'flux' 'handlebars' 'vue' 'd3' 'tape' do sed "s/javascript/$filetype/g" $lib.javascript.vim > $lib.$filetype.vim done From 687f8dba5e34eeffd05c22d71f8d94d85639ad29 Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 22 Feb 2018 17:34:27 +0800 Subject: [PATCH 77/80] Update readme for tape --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f967da..2087cea 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Libraries * [Ramda](http://ramdajs.com/) * [Vue](https://vuejs.org/) * [d3](https://d3js.org/) -* [tape](https://github.com/substack/tape), assume test and t as global object +* [tape](https://github.com/substack/tape), assume `test` and `t` are global object File Types ---------- From 2f812813cda79a3fbd53a50c57441fe58d3109cd Mon Sep 17 00:00:00 2001 From: othree Date: Thu, 22 Feb 2018 17:35:18 +0800 Subject: [PATCH 78/80] Update changelog --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2087cea..18a5e88 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,9 @@ All repeat defination will be removed when SyntaxComplete supports this feature. Changes ------- +### Version 0.7 +* Add tape + ### Version 0.6 * Add Vue.js * Add d3.js From 8938f6f5739352fd1dd7dcb775e1470460039263 Mon Sep 17 00:00:00 2001 From: Zhengang Li Date: Mon, 2 Jul 2018 12:12:05 +0930 Subject: [PATCH 79/80] exclude RegexpString group from jquery keyword to fix conflicts on yajs (#70) Thanks, this is the correct solution :) --- autoload/syntax/jquery.javascript.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/syntax/jquery.javascript.vim b/autoload/syntax/jquery.javascript.vim index 9a98e73..fb6c795 100644 --- a/autoload/syntax/jquery.javascript.vim +++ b/autoload/syntax/jquery.javascript.vim @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'javascript' setlocal iskeyword+=$ endif -syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptjQuery jQuery $ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=@javascriptAfterIdentifier " syntax match javascriptjQuerydot contained /\./ nextgroup=@javascriptQGlobals " syntax match javascriptjQuerydot contained /([^)]*)\./ nextgroup=@javascriptQFunctions From 5ef435d8c28ebc3c9b52fb865f4c06db629857f7 Mon Sep 17 00:00:00 2001 From: othree Date: Mon, 2 Jul 2018 11:52:44 +0800 Subject: [PATCH 80/80] Fix #69 global object not containedin RegExp string --- autoload/syntax/angularjs.coffee.vim | 34 +++++++++---------- autoload/syntax/angularjs.javascript.vim | 34 +++++++++---------- autoload/syntax/angularjs.ls.vim | 34 +++++++++---------- autoload/syntax/angularjs.typescript.vim | 34 +++++++++---------- autoload/syntax/angularuirouter.coffee.vim | 10 +++--- .../syntax/angularuirouter.javascript.vim | 10 +++--- autoload/syntax/angularuirouter.ls.vim | 10 +++--- .../syntax/angularuirouter.typescript.vim | 10 +++--- autoload/syntax/backbone.coffee.vim | 2 +- autoload/syntax/backbone.javascript.vim | 2 +- autoload/syntax/backbone.ls.vim | 2 +- autoload/syntax/backbone.typescript.vim | 2 +- autoload/syntax/d3.coffee.vim | 2 +- autoload/syntax/d3.javascript.vim | 2 +- autoload/syntax/d3.ls.vim | 2 +- autoload/syntax/d3.typescript.vim | 2 +- autoload/syntax/flux.coffee.vim | 2 +- autoload/syntax/flux.javascript.vim | 2 +- autoload/syntax/flux.ls.vim | 2 +- autoload/syntax/flux.typescript.vim | 2 +- autoload/syntax/handlebars.coffee.vim | 2 +- autoload/syntax/handlebars.javascript.vim | 2 +- autoload/syntax/handlebars.ls.vim | 2 +- autoload/syntax/handlebars.typescript.vim | 2 +- autoload/syntax/jasmine.coffee.vim | 10 +++--- autoload/syntax/jasmine.javascript.vim | 10 +++--- autoload/syntax/jasmine.ls.vim | 10 +++--- autoload/syntax/jasmine.typescript.vim | 10 +++--- autoload/syntax/jquery.coffee.vim | 2 +- autoload/syntax/jquery.ls.vim | 2 +- autoload/syntax/jquery.typescript.vim | 2 +- autoload/syntax/postprocess.javascript.vim | 2 +- autoload/syntax/ramda.coffee.vim | 2 +- autoload/syntax/ramda.javascript.vim | 2 +- autoload/syntax/ramda.ls.vim | 2 +- autoload/syntax/ramda.typescript.vim | 2 +- autoload/syntax/react.coffee.vim | 6 ++-- autoload/syntax/react.javascript.vim | 6 ++-- autoload/syntax/react.ls.vim | 6 ++-- autoload/syntax/react.typescript.vim | 6 ++-- autoload/syntax/requirejs.coffee.vim | 4 +-- autoload/syntax/requirejs.javascript.vim | 4 +-- autoload/syntax/requirejs.ls.vim | 4 +-- autoload/syntax/requirejs.typescript.vim | 4 +-- autoload/syntax/tape.coffee.vim | 4 +-- autoload/syntax/tape.javascript.vim | 4 +-- autoload/syntax/tape.ls.vim | 4 +-- autoload/syntax/tape.typescript.vim | 4 +-- autoload/syntax/underscore.coffee.vim | 2 +- autoload/syntax/underscore.javascript.vim | 2 +- autoload/syntax/underscore.ls.vim | 2 +- autoload/syntax/underscore.typescript.vim | 2 +- autoload/syntax/vue.coffee.vim | 2 +- autoload/syntax/vue.javascript.vim | 2 +- autoload/syntax/vue.ls.vim | 2 +- autoload/syntax/vue.typescript.vim | 2 +- 56 files changed, 168 insertions(+), 168 deletions(-) diff --git a/autoload/syntax/angularjs.coffee.vim b/autoload/syntax/angularjs.coffee.vim index 121b30d..23f2772 100644 --- a/autoload/syntax/angularjs.coffee.vim +++ b/autoload/syntax/angularjs.coffee.vim @@ -5,7 +5,7 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngularDot +syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeAngularDot syntax match coffeeAngularDot contained /\./ nextgroup=coffeeAngularMethods syntax keyword coffeeAngularMethods contained bind bootstrap copy element equals syntax keyword coffeeAngularMethods contained extend forEach fromJson identity injector @@ -13,50 +13,50 @@ syntax keyword coffeeAngularMethods contained isArray isDate isDefined isElement syntax keyword coffeeAngularMethods contained isNumber isObject isString isUndefined lowercase syntax keyword coffeeAngularMethods contained mock module noop toJson uppercase version -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $anchorScroll $cacheFactory $compile $controller $document -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $exceptionHandler $filter $httpBackend -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $locale $parse $rootElement -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $routeParams $templateCache $window -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $cookies $resource $sanitize -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $element +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $anchorScroll $cacheFactory $compile $controller $document +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $exceptionHandler $filter $httpBackend +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $locale $parse $rootElement +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $routeParams $templateCache $window +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $cookies $resource $sanitize +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $element -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $attributes nextgroup=coffeeASattributesdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $attributes nextgroup=coffeeASattributesdot syntax match coffeeASattributesdot contained /\./ nextgroup=coffeeASattributesMethods syntax keyword coffeeASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $http nextgroup=coffeeAShttpdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $http nextgroup=coffeeAShttpdot syntax match coffeeAShttpdot contained /\./ nextgroup=coffeeAShttpMethods syntax keyword coffeeAShttpMethods contained get head post put delete jsonp defaults prendingRequests -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $interpolate nextgroup=coffeeASinterpolatedot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $interpolate nextgroup=coffeeASinterpolatedot syntax match coffeeASinterpolatedot contained /\./ nextgroup=coffeeASinterpolateMethods syntax keyword coffeeASinterpolateMethods contained endSymbol startSymbol -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $location nextgroup=coffeeASlocationdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $location nextgroup=coffeeASlocationdot syntax match coffeeASlocationdot contained /\./ nextgroup=coffeeASlocationMethods syntax keyword coffeeASlocationMethods contained absUrl hash host path port protocol replace search url -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $log nextgroup=coffeeASlogdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $log nextgroup=coffeeASlogdot syntax match coffeeASlogdot contained /\./ nextgroup=coffeeASlogMethods syntax keyword coffeeASlogMethods contained error info log warn -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $q nextgroup=coffeeASqdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $q nextgroup=coffeeASqdot syntax match coffeeASqdot contained /\./ nextgroup=coffeeASqMethods syntax keyword coffeeASqMethods contained all defer reject when -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $route nextgroup=coffeeASroutedot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $route nextgroup=coffeeASroutedot syntax match coffeeASroutedot contained /\./ nextgroup=coffeeASrouteMethods syntax keyword coffeeASrouteMethods contained reload current route -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $timeout nextgroup=coffeeAStimeoutdot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $timeout nextgroup=coffeeAStimeoutdot syntax match coffeeAStimeoutdot contained /\./ nextgroup=coffeeAStimeoutMethods syntax keyword coffeeAStimeoutMethods contained cancel -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $scope $rootScope nextgroup=coffeeASscopedot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $scope $rootScope nextgroup=coffeeASscopedot syntax match coffeeASscopedot contained /\./ nextgroup=coffeeASscopeMethods syntax keyword coffeeASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id -syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $cookieStore nextgroup=coffeeAScookieStoredot +syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $cookieStore nextgroup=coffeeAScookieStoredot syntax match coffeeAScookieStoredot contained /\./ nextgroup=coffeeAScookieStoreMethods syntax keyword coffeeAScookieStoreMethods contained get put remove diff --git a/autoload/syntax/angularjs.javascript.vim b/autoload/syntax/angularjs.javascript.vim index 9565be3..18fbff8 100644 --- a/autoload/syntax/angularjs.javascript.vim +++ b/autoload/syntax/angularjs.javascript.vim @@ -5,7 +5,7 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngularDot +syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptAngularDot syntax match javascriptAngularDot contained /\./ nextgroup=javascriptAngularMethods syntax keyword javascriptAngularMethods contained bind bootstrap copy element equals syntax keyword javascriptAngularMethods contained extend forEach fromJson identity injector @@ -13,50 +13,50 @@ syntax keyword javascriptAngularMethods contained isArray isDate isDefined isEle syntax keyword javascriptAngularMethods contained isNumber isObject isString isUndefined lowercase syntax keyword javascriptAngularMethods contained mock module noop toJson uppercase version -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $anchorScroll $cacheFactory $compile $controller $document -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $exceptionHandler $filter $httpBackend -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $locale $parse $rootElement -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $routeParams $templateCache $window -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $cookies $resource $sanitize -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $element +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $anchorScroll $cacheFactory $compile $controller $document +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $exceptionHandler $filter $httpBackend +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $locale $parse $rootElement +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $routeParams $templateCache $window +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $cookies $resource $sanitize +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $element -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $attributes nextgroup=javascriptASattributesdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $attributes nextgroup=javascriptASattributesdot syntax match javascriptASattributesdot contained /\./ nextgroup=javascriptASattributesMethods syntax keyword javascriptASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $http nextgroup=javascriptAShttpdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $http nextgroup=javascriptAShttpdot syntax match javascriptAShttpdot contained /\./ nextgroup=javascriptAShttpMethods syntax keyword javascriptAShttpMethods contained get head post put delete jsonp defaults prendingRequests -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $interpolate nextgroup=javascriptASinterpolatedot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $interpolate nextgroup=javascriptASinterpolatedot syntax match javascriptASinterpolatedot contained /\./ nextgroup=javascriptASinterpolateMethods syntax keyword javascriptASinterpolateMethods contained endSymbol startSymbol -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $location nextgroup=javascriptASlocationdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $location nextgroup=javascriptASlocationdot syntax match javascriptASlocationdot contained /\./ nextgroup=javascriptASlocationMethods syntax keyword javascriptASlocationMethods contained absUrl hash host path port protocol replace search url -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $log nextgroup=javascriptASlogdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $log nextgroup=javascriptASlogdot syntax match javascriptASlogdot contained /\./ nextgroup=javascriptASlogMethods syntax keyword javascriptASlogMethods contained error info log warn -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $q nextgroup=javascriptASqdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $q nextgroup=javascriptASqdot syntax match javascriptASqdot contained /\./ nextgroup=javascriptASqMethods syntax keyword javascriptASqMethods contained all defer reject when -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $route nextgroup=javascriptASroutedot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $route nextgroup=javascriptASroutedot syntax match javascriptASroutedot contained /\./ nextgroup=javascriptASrouteMethods syntax keyword javascriptASrouteMethods contained reload current route -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $timeout nextgroup=javascriptAStimeoutdot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $timeout nextgroup=javascriptAStimeoutdot syntax match javascriptAStimeoutdot contained /\./ nextgroup=javascriptAStimeoutMethods syntax keyword javascriptAStimeoutMethods contained cancel -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $scope $rootScope nextgroup=javascriptASscopedot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $scope $rootScope nextgroup=javascriptASscopedot syntax match javascriptASscopedot contained /\./ nextgroup=javascriptASscopeMethods syntax keyword javascriptASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id -syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $cookieStore nextgroup=javascriptAScookieStoredot +syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $cookieStore nextgroup=javascriptAScookieStoredot syntax match javascriptAScookieStoredot contained /\./ nextgroup=javascriptAScookieStoreMethods syntax keyword javascriptAScookieStoreMethods contained get put remove diff --git a/autoload/syntax/angularjs.ls.vim b/autoload/syntax/angularjs.ls.vim index 3f837be..e638b0d 100644 --- a/autoload/syntax/angularjs.ls.vim +++ b/autoload/syntax/angularjs.ls.vim @@ -5,7 +5,7 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngularDot +syntax keyword lsAngular angular containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsAngularDot syntax match lsAngularDot contained /\./ nextgroup=lsAngularMethods syntax keyword lsAngularMethods contained bind bootstrap copy element equals syntax keyword lsAngularMethods contained extend forEach fromJson identity injector @@ -13,50 +13,50 @@ syntax keyword lsAngularMethods contained isArray isDate isDefined isElement isF syntax keyword lsAngularMethods contained isNumber isObject isString isUndefined lowercase syntax keyword lsAngularMethods contained mock module noop toJson uppercase version -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $anchorScroll $cacheFactory $compile $controller $document -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $exceptionHandler $filter $httpBackend -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $locale $parse $rootElement -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $routeParams $templateCache $window -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $cookies $resource $sanitize -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $element +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $anchorScroll $cacheFactory $compile $controller $document +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $exceptionHandler $filter $httpBackend +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $locale $parse $rootElement +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $routeParams $templateCache $window +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $cookies $resource $sanitize +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $element -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $attributes nextgroup=lsASattributesdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $attributes nextgroup=lsASattributesdot syntax match lsASattributesdot contained /\./ nextgroup=lsASattributesMethods syntax keyword lsASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $http nextgroup=lsAShttpdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $http nextgroup=lsAShttpdot syntax match lsAShttpdot contained /\./ nextgroup=lsAShttpMethods syntax keyword lsAShttpMethods contained get head post put delete jsonp defaults prendingRequests -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $interpolate nextgroup=lsASinterpolatedot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $interpolate nextgroup=lsASinterpolatedot syntax match lsASinterpolatedot contained /\./ nextgroup=lsASinterpolateMethods syntax keyword lsASinterpolateMethods contained endSymbol startSymbol -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $location nextgroup=lsASlocationdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $location nextgroup=lsASlocationdot syntax match lsASlocationdot contained /\./ nextgroup=lsASlocationMethods syntax keyword lsASlocationMethods contained absUrl hash host path port protocol replace search url -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $log nextgroup=lsASlogdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $log nextgroup=lsASlogdot syntax match lsASlogdot contained /\./ nextgroup=lsASlogMethods syntax keyword lsASlogMethods contained error info log warn -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $q nextgroup=lsASqdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $q nextgroup=lsASqdot syntax match lsASqdot contained /\./ nextgroup=lsASqMethods syntax keyword lsASqMethods contained all defer reject when -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $route nextgroup=lsASroutedot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $route nextgroup=lsASroutedot syntax match lsASroutedot contained /\./ nextgroup=lsASrouteMethods syntax keyword lsASrouteMethods contained reload current route -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $timeout nextgroup=lsAStimeoutdot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $timeout nextgroup=lsAStimeoutdot syntax match lsAStimeoutdot contained /\./ nextgroup=lsAStimeoutMethods syntax keyword lsAStimeoutMethods contained cancel -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $scope $rootScope nextgroup=lsASscopedot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $scope $rootScope nextgroup=lsASscopedot syntax match lsASscopedot contained /\./ nextgroup=lsASscopeMethods syntax keyword lsASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id -syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsString $cookieStore nextgroup=lsAScookieStoredot +syntax keyword lsAServices containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $cookieStore nextgroup=lsAScookieStoredot syntax match lsAScookieStoredot contained /\./ nextgroup=lsAScookieStoreMethods syntax keyword lsAScookieStoreMethods contained get put remove diff --git a/autoload/syntax/angularjs.typescript.vim b/autoload/syntax/angularjs.typescript.vim index bfcb5c1..6a0a232 100644 --- a/autoload/syntax/angularjs.typescript.vim +++ b/autoload/syntax/angularjs.typescript.vim @@ -5,7 +5,7 @@ " Version: 1.1.13.1 " URL: http://angularjs.org/ -syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngularDot +syntax keyword typescriptAngular angular containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptAngularDot syntax match typescriptAngularDot contained /\./ nextgroup=typescriptAngularMethods syntax keyword typescriptAngularMethods contained bind bootstrap copy element equals syntax keyword typescriptAngularMethods contained extend forEach fromJson identity injector @@ -13,50 +13,50 @@ syntax keyword typescriptAngularMethods contained isArray isDate isDefined isEle syntax keyword typescriptAngularMethods contained isNumber isObject isString isUndefined lowercase syntax keyword typescriptAngularMethods contained mock module noop toJson uppercase version -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $anchorScroll $cacheFactory $compile $controller $document -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $exceptionHandler $filter $httpBackend -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $locale $parse $rootElement -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $routeParams $templateCache $window -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $cookies $resource $sanitize -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $element +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $anchorScroll $cacheFactory $compile $controller $document +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $exceptionHandler $filter $httpBackend +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $locale $parse $rootElement +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $routeParams $templateCache $window +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $cookies $resource $sanitize +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $element -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $attributes nextgroup=typescriptASattributesdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $attributes nextgroup=typescriptASattributesdot syntax match typescriptASattributesdot contained /\./ nextgroup=typescriptASattributesMethods syntax keyword typescriptASattributesMethods contained $normalize $addClass $removeClass $updateClass $observe $set $attr -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $http nextgroup=typescriptAShttpdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $http nextgroup=typescriptAShttpdot syntax match typescriptAShttpdot contained /\./ nextgroup=typescriptAShttpMethods syntax keyword typescriptAShttpMethods contained get head post put delete jsonp defaults prendingRequests -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $interpolate nextgroup=typescriptASinterpolatedot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $interpolate nextgroup=typescriptASinterpolatedot syntax match typescriptASinterpolatedot contained /\./ nextgroup=typescriptASinterpolateMethods syntax keyword typescriptASinterpolateMethods contained endSymbol startSymbol -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $location nextgroup=typescriptASlocationdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $location nextgroup=typescriptASlocationdot syntax match typescriptASlocationdot contained /\./ nextgroup=typescriptASlocationMethods syntax keyword typescriptASlocationMethods contained absUrl hash host path port protocol replace search url -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $log nextgroup=typescriptASlogdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $log nextgroup=typescriptASlogdot syntax match typescriptASlogdot contained /\./ nextgroup=typescriptASlogMethods syntax keyword typescriptASlogMethods contained error info log warn -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $q nextgroup=typescriptASqdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $q nextgroup=typescriptASqdot syntax match typescriptASqdot contained /\./ nextgroup=typescriptASqMethods syntax keyword typescriptASqMethods contained all defer reject when -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $route nextgroup=typescriptASroutedot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $route nextgroup=typescriptASroutedot syntax match typescriptASroutedot contained /\./ nextgroup=typescriptASrouteMethods syntax keyword typescriptASrouteMethods contained reload current route -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $timeout nextgroup=typescriptAStimeoutdot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $timeout nextgroup=typescriptAStimeoutdot syntax match typescriptAStimeoutdot contained /\./ nextgroup=typescriptAStimeoutMethods syntax keyword typescriptAStimeoutMethods contained cancel -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $scope $rootScope nextgroup=typescriptASscopedot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $scope $rootScope nextgroup=typescriptASscopedot syntax match typescriptASscopedot contained /\./ nextgroup=typescriptASscopeMethods syntax keyword typescriptASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id -syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $cookieStore nextgroup=typescriptAScookieStoredot +syntax keyword typescriptAServices containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $cookieStore nextgroup=typescriptAScookieStoredot syntax match typescriptAScookieStoredot contained /\./ nextgroup=typescriptAScookieStoreMethods syntax keyword typescriptAScookieStoreMethods contained get put remove diff --git a/autoload/syntax/angularuirouter.coffee.vim b/autoload/syntax/angularuirouter.coffee.vim index 6edfe91..e169ac0 100644 --- a/autoload/syntax/angularuirouter.coffee.vim +++ b/autoload/syntax/angularuirouter.coffee.vim @@ -3,23 +3,23 @@ " Maintainer: Dan Hansen " URL: http://angular-ui.github.io/ui-router/ -syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $stateProvider nextgroup=coffeeASstateProviderdot +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $stateProvider nextgroup=coffeeASstateProviderdot syntax match coffeeASstateProverdot contained /\./ nextgroup=coffeeASstateProviderMethods syntax keyword coffeeASstateProviderMethods contained state decorator -syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $urlRouterProvider nextgroup=coffeeASurlRouterProviderdot +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $urlRouterProvider nextgroup=coffeeASurlRouterProviderdot syntax match coffeeASstateProverdot contained /\./ nextgroup=coffeeASurlRouterProviderMethods syntax keyword coffeeASurlRouterProviderMethods contained when otherwise rule -syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $state nextgroup=coffeeASstatedot +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $state nextgroup=coffeeASstatedot syntax match coffeeASstatedot contained /\./ nextgroup=coffeeASstateMethods syntax keyword coffeeASstateMethods contained current get go href includes is reload transitionTo -syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $urlRouter nextgroup=coffeeASurlRouterdot +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $urlRouter nextgroup=coffeeASurlRouterdot syntax match coffeeASurlRouterdot contained /\./ nextgroup=coffeeASurlRouterMethods syntax keyword coffeeASurlRouterMethods contained href sync -syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString $stateParams $uiViewScroll +syntax keyword coffeeUIRouter containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString $stateParams $uiViewScroll " Define the default highlighting. diff --git a/autoload/syntax/angularuirouter.javascript.vim b/autoload/syntax/angularuirouter.javascript.vim index 878162f..cf1122a 100644 --- a/autoload/syntax/angularuirouter.javascript.vim +++ b/autoload/syntax/angularuirouter.javascript.vim @@ -3,23 +3,23 @@ " Maintainer: Dan Hansen " URL: http://angular-ui.github.io/ui-router/ -syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $stateProvider nextgroup=javascriptASstateProviderdot +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $stateProvider nextgroup=javascriptASstateProviderdot syntax match javascriptASstateProverdot contained /\./ nextgroup=javascriptASstateProviderMethods syntax keyword javascriptASstateProviderMethods contained state decorator -syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $urlRouterProvider nextgroup=javascriptASurlRouterProviderdot +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $urlRouterProvider nextgroup=javascriptASurlRouterProviderdot syntax match javascriptASstateProverdot contained /\./ nextgroup=javascriptASurlRouterProviderMethods syntax keyword javascriptASurlRouterProviderMethods contained when otherwise rule -syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $state nextgroup=javascriptASstatedot +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $state nextgroup=javascriptASstatedot syntax match javascriptASstatedot contained /\./ nextgroup=javascriptASstateMethods syntax keyword javascriptASstateMethods contained current get go href includes is reload transitionTo -syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $urlRouter nextgroup=javascriptASurlRouterdot +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $urlRouter nextgroup=javascriptASurlRouterdot syntax match javascriptASurlRouterdot contained /\./ nextgroup=javascriptASurlRouterMethods syntax keyword javascriptASurlRouterMethods contained href sync -syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString $stateParams $uiViewScroll +syntax keyword javascriptUIRouter containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString $stateParams $uiViewScroll " Define the default highlighting. diff --git a/autoload/syntax/angularuirouter.ls.vim b/autoload/syntax/angularuirouter.ls.vim index 42fbc39..2a5455b 100644 --- a/autoload/syntax/angularuirouter.ls.vim +++ b/autoload/syntax/angularuirouter.ls.vim @@ -3,23 +3,23 @@ " Maintainer: Dan Hansen " URL: http://angular-ui.github.io/ui-router/ -syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $stateProvider nextgroup=lsASstateProviderdot +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $stateProvider nextgroup=lsASstateProviderdot syntax match lsASstateProverdot contained /\./ nextgroup=lsASstateProviderMethods syntax keyword lsASstateProviderMethods contained state decorator -syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $urlRouterProvider nextgroup=lsASurlRouterProviderdot +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $urlRouterProvider nextgroup=lsASurlRouterProviderdot syntax match lsASstateProverdot contained /\./ nextgroup=lsASurlRouterProviderMethods syntax keyword lsASurlRouterProviderMethods contained when otherwise rule -syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $state nextgroup=lsASstatedot +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $state nextgroup=lsASstatedot syntax match lsASstatedot contained /\./ nextgroup=lsASstateMethods syntax keyword lsASstateMethods contained current get go href includes is reload transitionTo -syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $urlRouter nextgroup=lsASurlRouterdot +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $urlRouter nextgroup=lsASurlRouterdot syntax match lsASurlRouterdot contained /\./ nextgroup=lsASurlRouterMethods syntax keyword lsASurlRouterMethods contained href sync -syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsString $stateParams $uiViewScroll +syntax keyword lsUIRouter containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString $stateParams $uiViewScroll " Define the default highlighting. diff --git a/autoload/syntax/angularuirouter.typescript.vim b/autoload/syntax/angularuirouter.typescript.vim index b686954..b14dbb4 100644 --- a/autoload/syntax/angularuirouter.typescript.vim +++ b/autoload/syntax/angularuirouter.typescript.vim @@ -3,23 +3,23 @@ " Maintainer: Dan Hansen " URL: http://angular-ui.github.io/ui-router/ -syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $stateProvider nextgroup=typescriptASstateProviderdot +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $stateProvider nextgroup=typescriptASstateProviderdot syntax match typescriptASstateProverdot contained /\./ nextgroup=typescriptASstateProviderMethods syntax keyword typescriptASstateProviderMethods contained state decorator -syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $urlRouterProvider nextgroup=typescriptASurlRouterProviderdot +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $urlRouterProvider nextgroup=typescriptASurlRouterProviderdot syntax match typescriptASstateProverdot contained /\./ nextgroup=typescriptASurlRouterProviderMethods syntax keyword typescriptASurlRouterProviderMethods contained when otherwise rule -syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $state nextgroup=typescriptASstatedot +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $state nextgroup=typescriptASstatedot syntax match typescriptASstatedot contained /\./ nextgroup=typescriptASstateMethods syntax keyword typescriptASstateMethods contained current get go href includes is reload transitionTo -syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $urlRouter nextgroup=typescriptASurlRouterdot +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $urlRouter nextgroup=typescriptASurlRouterdot syntax match typescriptASurlRouterdot contained /\./ nextgroup=typescriptASurlRouterMethods syntax keyword typescriptASurlRouterMethods contained href sync -syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString $stateParams $uiViewScroll +syntax keyword typescriptUIRouter containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString $stateParams $uiViewScroll " Define the default highlighting. diff --git a/autoload/syntax/backbone.coffee.vim b/autoload/syntax/backbone.coffee.vim index 1465932..aeaf979 100644 --- a/autoload/syntax/backbone.coffee.vim +++ b/autoload/syntax/backbone.coffee.vim @@ -5,7 +5,7 @@ " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword coffeeBackbone Backbone containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeBDot +syntax keyword coffeeBackbone Backbone containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeBDot syntax match coffeeBDot contained /\./ nextgroup=coffeeBObjects syntax keyword coffeeBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.javascript.vim b/autoload/syntax/backbone.javascript.vim index b3b2564..94ad34c 100644 --- a/autoload/syntax/backbone.javascript.vim +++ b/autoload/syntax/backbone.javascript.vim @@ -5,7 +5,7 @@ " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword javascriptBackbone Backbone containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptBDot +syntax keyword javascriptBackbone Backbone containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptBDot syntax match javascriptBDot contained /\./ nextgroup=javascriptBObjects syntax keyword javascriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.ls.vim b/autoload/syntax/backbone.ls.vim index 6c7fa71..35f5a75 100644 --- a/autoload/syntax/backbone.ls.vim +++ b/autoload/syntax/backbone.ls.vim @@ -5,7 +5,7 @@ " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword lsBackbone Backbone containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsBDot +syntax keyword lsBackbone Backbone containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsBDot syntax match lsBDot contained /\./ nextgroup=lsBObjects syntax keyword lsBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/backbone.typescript.vim b/autoload/syntax/backbone.typescript.vim index 3874c46..f8c7433 100644 --- a/autoload/syntax/backbone.typescript.vim +++ b/autoload/syntax/backbone.typescript.vim @@ -5,7 +5,7 @@ " Version: 1.2.3 " URL: http://backbonejs.org/ -syntax keyword typescriptBackbone Backbone containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptBDot +syntax keyword typescriptBackbone Backbone containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptBDot syntax match typescriptBDot contained /\./ nextgroup=typescriptBObjects syntax keyword typescriptBObjects contained Collection Model View Events Router History Utility sync ajax emulateHTTP emulateJSON diff --git a/autoload/syntax/d3.coffee.vim b/autoload/syntax/d3.coffee.vim index 51c5721..bec50fd 100644 --- a/autoload/syntax/d3.coffee.vim +++ b/autoload/syntax/d3.coffee.vim @@ -6,7 +6,7 @@ " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword coffeeD3 d3 containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeD3Dot +syntax keyword coffeeD3 d3 containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeD3Dot syntax match coffeeD3Dot contained /\./ nextgroup=coffeeD3Functions syntax cluster coffeeD3Functions contains=@coffeeD3Arrays,coffeeD3Axes,coffeeD3Brushes,coffeeD3Chords,@coffeeD3Collections,coffeeD3Colors,coffeeD3Dispatches,coffeeD3Dragging,coffeeD3DelimiterSeparatedValues,coffeeD3Easings,coffeeD3Forces,coffeeD3NumberFormats,coffeeD3Geographies,coffeeD3GeographiesStreams,coffeeD3GeographiesTransforms,coffeeD3Hierarchies,coffeeD3Interpolators,coffeeD3Paths,coffeeD3Polygons,coffeeD3Quadtrees,coffeeD3Queues,coffeeD3RandomNumbers,coffeeD3Requests,coffeeD3Scales,coffeeD3Selections,coffeeD3Shapes,coffeeD3TimeFormats,coffeeD3TimeIntervals,coffeeD3Timers,coffeeD3Transitions,coffeeD3VoronoiDiagrams,coffeeD3Zooming diff --git a/autoload/syntax/d3.javascript.vim b/autoload/syntax/d3.javascript.vim index f07d09c..fa846f6 100644 --- a/autoload/syntax/d3.javascript.vim +++ b/autoload/syntax/d3.javascript.vim @@ -6,7 +6,7 @@ " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword javascriptD3 d3 containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptD3Dot +syntax keyword javascriptD3 d3 containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptD3Dot syntax match javascriptD3Dot contained /\./ nextgroup=javascriptD3Functions syntax cluster javascriptD3Functions contains=@javascriptD3Arrays,javascriptD3Axes,javascriptD3Brushes,javascriptD3Chords,@javascriptD3Collections,javascriptD3Colors,javascriptD3Dispatches,javascriptD3Dragging,javascriptD3DelimiterSeparatedValues,javascriptD3Easings,javascriptD3Forces,javascriptD3NumberFormats,javascriptD3Geographies,javascriptD3GeographiesStreams,javascriptD3GeographiesTransforms,javascriptD3Hierarchies,javascriptD3Interpolators,javascriptD3Paths,javascriptD3Polygons,javascriptD3Quadtrees,javascriptD3Queues,javascriptD3RandomNumbers,javascriptD3Requests,javascriptD3Scales,javascriptD3Selections,javascriptD3Shapes,javascriptD3TimeFormats,javascriptD3TimeIntervals,javascriptD3Timers,javascriptD3Transitions,javascriptD3VoronoiDiagrams,javascriptD3Zooming diff --git a/autoload/syntax/d3.ls.vim b/autoload/syntax/d3.ls.vim index e42d725..edfd088 100644 --- a/autoload/syntax/d3.ls.vim +++ b/autoload/syntax/d3.ls.vim @@ -6,7 +6,7 @@ " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword lsD3 d3 containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsD3Dot +syntax keyword lsD3 d3 containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsD3Dot syntax match lsD3Dot contained /\./ nextgroup=lsD3Functions syntax cluster lsD3Functions contains=@lsD3Arrays,lsD3Axes,lsD3Brushes,lsD3Chords,@lsD3Collections,lsD3Colors,lsD3Dispatches,lsD3Dragging,lsD3DelimiterSeparatedValues,lsD3Easings,lsD3Forces,lsD3NumberFormats,lsD3Geographies,lsD3GeographiesStreams,lsD3GeographiesTransforms,lsD3Hierarchies,lsD3Interpolators,lsD3Paths,lsD3Polygons,lsD3Quadtrees,lsD3Queues,lsD3RandomNumbers,lsD3Requests,lsD3Scales,lsD3Selections,lsD3Shapes,lsD3TimeFormats,lsD3TimeIntervals,lsD3Timers,lsD3Transitions,lsD3VoronoiDiagrams,lsD3Zooming diff --git a/autoload/syntax/d3.typescript.vim b/autoload/syntax/d3.typescript.vim index 4447712..b6cbed6 100644 --- a/autoload/syntax/d3.typescript.vim +++ b/autoload/syntax/d3.typescript.vim @@ -6,7 +6,7 @@ " Version: 4.2.8.0 " URL: https://github.com/d3/d3/blob/master/API.md -syntax keyword typescriptD3 d3 containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptD3Dot +syntax keyword typescriptD3 d3 containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptD3Dot syntax match typescriptD3Dot contained /\./ nextgroup=typescriptD3Functions syntax cluster typescriptD3Functions contains=@typescriptD3Arrays,typescriptD3Axes,typescriptD3Brushes,typescriptD3Chords,@typescriptD3Collections,typescriptD3Colors,typescriptD3Dispatches,typescriptD3Dragging,typescriptD3DelimiterSeparatedValues,typescriptD3Easings,typescriptD3Forces,typescriptD3NumberFormats,typescriptD3Geographies,typescriptD3GeographiesStreams,typescriptD3GeographiesTransforms,typescriptD3Hierarchies,typescriptD3Interpolators,typescriptD3Paths,typescriptD3Polygons,typescriptD3Quadtrees,typescriptD3Queues,typescriptD3RandomNumbers,typescriptD3Requests,typescriptD3Scales,typescriptD3Selections,typescriptD3Shapes,typescriptD3TimeFormats,typescriptD3TimeIntervals,typescriptD3Timers,typescriptD3Transitions,typescriptD3VoronoiDiagrams,typescriptD3Zooming diff --git a/autoload/syntax/flux.coffee.vim b/autoload/syntax/flux.coffee.vim index f936c4c..5eb8c95 100644 --- a/autoload/syntax/flux.coffee.vim +++ b/autoload/syntax/flux.coffee.vim @@ -5,7 +5,7 @@ " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword coffeeFlux Dispatcher containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeFDot +syntax keyword coffeeFlux Dispatcher containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeFDot syntax match coffeeFDot contained /\./ nextgroup=coffeeFFunctions syntax keyword coffeeFDispatcher contained register unregister waitFor dispatch isDispatching diff --git a/autoload/syntax/flux.javascript.vim b/autoload/syntax/flux.javascript.vim index 1cbf71e..7c037c2 100644 --- a/autoload/syntax/flux.javascript.vim +++ b/autoload/syntax/flux.javascript.vim @@ -5,7 +5,7 @@ " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword javascriptFlux Dispatcher containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptFDot +syntax keyword javascriptFlux Dispatcher containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptFDot syntax match javascriptFDot contained /\./ nextgroup=javascriptFFunctions syntax keyword javascriptFDispatcher contained register unregister waitFor dispatch isDispatching diff --git a/autoload/syntax/flux.ls.vim b/autoload/syntax/flux.ls.vim index 5f3fc48..4b522a1 100644 --- a/autoload/syntax/flux.ls.vim +++ b/autoload/syntax/flux.ls.vim @@ -5,7 +5,7 @@ " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword lsFlux Dispatcher containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsFDot +syntax keyword lsFlux Dispatcher containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsFDot syntax match lsFDot contained /\./ nextgroup=lsFFunctions syntax keyword lsFDispatcher contained register unregister waitFor dispatch isDispatching diff --git a/autoload/syntax/flux.typescript.vim b/autoload/syntax/flux.typescript.vim index d7d4e67..894ebfd 100644 --- a/autoload/syntax/flux.typescript.vim +++ b/autoload/syntax/flux.typescript.vim @@ -5,7 +5,7 @@ " Version: 2.0.2 " URL: https://facebook.github.io/flux/docs/dispatcher.html -syntax keyword typescriptFlux Dispatcher containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptFDot +syntax keyword typescriptFlux Dispatcher containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptFDot syntax match typescriptFDot contained /\./ nextgroup=typescriptFFunctions syntax keyword typescriptFDispatcher contained register unregister waitFor dispatch isDispatching diff --git a/autoload/syntax/handlebars.coffee.vim b/autoload/syntax/handlebars.coffee.vim index 98f3ffc..0b14357 100644 --- a/autoload/syntax/handlebars.coffee.vim +++ b/autoload/syntax/handlebars.coffee.vim @@ -5,7 +5,7 @@ " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword coffeeHandlebars Handlebars containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeHDot,coffeeHutility +syntax keyword coffeeHandlebars Handlebars containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeHDot,coffeeHutility syntax match coffeeHDot contained /\./ nextgroup=@coffeeHmethods " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions diff --git a/autoload/syntax/handlebars.javascript.vim b/autoload/syntax/handlebars.javascript.vim index 15942be..f0d99c5 100644 --- a/autoload/syntax/handlebars.javascript.vim +++ b/autoload/syntax/handlebars.javascript.vim @@ -5,7 +5,7 @@ " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword javascriptHandlebars Handlebars containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptHDot,javascriptHutility +syntax keyword javascriptHandlebars Handlebars containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptHDot,javascriptHutility syntax match javascriptHDot contained /\./ nextgroup=@javascriptHmethods " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions diff --git a/autoload/syntax/handlebars.ls.vim b/autoload/syntax/handlebars.ls.vim index 038c8ea..e9e9e0c 100644 --- a/autoload/syntax/handlebars.ls.vim +++ b/autoload/syntax/handlebars.ls.vim @@ -5,7 +5,7 @@ " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword lsHandlebars Handlebars containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsHDot,lsHutility +syntax keyword lsHandlebars Handlebars containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsHDot,lsHutility syntax match lsHDot contained /\./ nextgroup=@lsHmethods " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions diff --git a/autoload/syntax/handlebars.typescript.vim b/autoload/syntax/handlebars.typescript.vim index 06070f5..c82577f 100644 --- a/autoload/syntax/handlebars.typescript.vim +++ b/autoload/syntax/handlebars.typescript.vim @@ -5,7 +5,7 @@ " Version: 2.0.0 " URL: http://handlebarsjs.com/ -syntax keyword typescriptHandlebars Handlebars containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptHDot,typescriptHutility +syntax keyword typescriptHandlebars Handlebars containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptHDot,typescriptHutility syntax match typescriptHDot contained /\./ nextgroup=@typescriptHmethods " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions diff --git a/autoload/syntax/jasmine.coffee.vim b/autoload/syntax/jasmine.coffee.vim index add12a0..531c2d0 100644 --- a/autoload/syntax/jasmine.coffee.vim +++ b/autoload/syntax/jasmine.coffee.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeJdot +syntax keyword coffeeJasmine jasmine containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeJdot syntax match coffeeJdot contained /\./ nextgroup=coffeeJMethods syntax keyword coffeeJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching @@ -16,18 +16,18 @@ syntax keyword coffeeJMethods contained addReporter specFilter syntax cluster coffeeJFunctions contains=coffeeJMethods,coffeeJEnvMethods,coffeeJEnvMethods,coffeeJExpectMethods,coffeeJSpyMethods,coffeeJSpyAndMethods,coffeeJSpyCallsMethods syntax cluster coffeeJAttrs contains=coffeeJExpectNot,coffeeJSpyAnd,coffeeJSpyCalls -syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod xdescribe xit containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString nextgroup=@coffeeAfterIdentifier -syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod spyOn containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString nextgroup=@coffeeAfterIdentifier syntax keyword coffeeJSpyAnd contained and syntax keyword coffeeJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub syntax keyword coffeeJSpyCalls contained calls syntax keyword coffeeJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword coffeeJGlobalMethod expect fail pending containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=@coffeeAfterIdentifier +syntax keyword coffeeJGlobalMethod expect fail pending containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString nextgroup=@coffeeAfterIdentifier syntax keyword coffeeJExpectNot contained not contained nextgroup=coffeeJExpectNotdot syntax keyword coffeeJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch diff --git a/autoload/syntax/jasmine.javascript.vim b/autoload/syntax/jasmine.javascript.vim index 689057d..9ebf867 100644 --- a/autoload/syntax/jasmine.javascript.vim +++ b/autoload/syntax/jasmine.javascript.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptJdot +syntax keyword javascriptJasmine jasmine containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptJdot syntax match javascriptJdot contained /\./ nextgroup=javascriptJMethods syntax keyword javascriptJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching @@ -16,18 +16,18 @@ syntax keyword javascriptJMethods contained addReporter specFilter syntax cluster javascriptJFunctions contains=javascriptJMethods,javascriptJEnvMethods,javascriptJEnvMethods,javascriptJExpectMethods,javascriptJSpyMethods,javascriptJSpyAndMethods,javascriptJSpyCallsMethods syntax cluster javascriptJAttrs contains=javascriptJExpectNot,javascriptJSpyAnd,javascriptJSpyCalls -syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod xdescribe xit containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=@javascriptAfterIdentifier -syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod spyOn containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=@javascriptAfterIdentifier syntax keyword javascriptJSpyAnd contained and syntax keyword javascriptJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub syntax keyword javascriptJSpyCalls contained calls syntax keyword javascriptJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword javascriptJGlobalMethod expect fail pending containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=@javascriptAfterIdentifier +syntax keyword javascriptJGlobalMethod expect fail pending containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=@javascriptAfterIdentifier syntax keyword javascriptJExpectNot contained not contained nextgroup=javascriptJExpectNotdot syntax keyword javascriptJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch diff --git a/autoload/syntax/jasmine.ls.vim b/autoload/syntax/jasmine.ls.vim index 49033e3..f2e82eb 100644 --- a/autoload/syntax/jasmine.ls.vim +++ b/autoload/syntax/jasmine.ls.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsJdot +syntax keyword lsJasmine jasmine containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsJdot syntax match lsJdot contained /\./ nextgroup=lsJMethods syntax keyword lsJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching @@ -16,18 +16,18 @@ syntax keyword lsJMethods contained addReporter specFilter syntax cluster lsJFunctions contains=lsJMethods,lsJEnvMethods,lsJEnvMethods,lsJExpectMethods,lsJSpyMethods,lsJSpyAndMethods,lsJSpyCallsMethods syntax cluster lsJAttrs contains=lsJExpectNot,lsJSpyAnd,lsJSpyCalls -syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod xdescribe xit containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString nextgroup=@lsAfterIdentifier -syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod spyOn containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString nextgroup=@lsAfterIdentifier syntax keyword lsJSpyAnd contained and syntax keyword lsJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub syntax keyword lsJSpyCalls contained calls syntax keyword lsJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword lsJGlobalMethod expect fail pending containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=@lsAfterIdentifier +syntax keyword lsJGlobalMethod expect fail pending containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString nextgroup=@lsAfterIdentifier syntax keyword lsJExpectNot contained not contained nextgroup=lsJExpectNotdot syntax keyword lsJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch diff --git a/autoload/syntax/jasmine.typescript.vim b/autoload/syntax/jasmine.typescript.vim index a77f785..514a18f 100644 --- a/autoload/syntax/jasmine.typescript.vim +++ b/autoload/syntax/jasmine.typescript.vim @@ -6,7 +6,7 @@ " URL: http://jasmine.github.io/ -syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptJdot +syntax keyword typescriptJasmine jasmine containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptJdot syntax match typescriptJdot contained /\./ nextgroup=typescriptJMethods syntax keyword typescriptJMethods contained any anything createSpy createSpyObj HtmlReporter clock mockDate getEnv objectContaining arrayContaining stringMatching @@ -16,18 +16,18 @@ syntax keyword typescriptJMethods contained addReporter specFilter syntax cluster typescriptJFunctions contains=typescriptJMethods,typescriptJEnvMethods,typescriptJEnvMethods,typescriptJExpectMethods,typescriptJSpyMethods,typescriptJSpyAndMethods,typescriptJSpyCallsMethods syntax cluster typescriptJAttrs contains=typescriptJExpectNot,typescriptJSpyAnd,typescriptJSpyCalls -syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod describe done runs waitsFor it beforeEach afterEach beforeAll afterAll containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod xdescribe xit containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString nextgroup=@typescriptAfterIdentifier -syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod spyOn containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString nextgroup=@typescriptAfterIdentifier syntax keyword typescriptJSpyAnd contained and syntax keyword typescriptJSpyAndMethods contained callThrough returnValue returnValues callFake throwError stub syntax keyword typescriptJSpyCalls contained calls syntax keyword typescriptJCallsMethods contained any count argsFor allArgs all mostRecent first reset -syntax keyword typescriptJGlobalMethod expect fail pending containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptJGlobalMethod expect fail pending containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString nextgroup=@typescriptAfterIdentifier syntax keyword typescriptJExpectNot contained not contained nextgroup=typescriptJExpectNotdot syntax keyword typescriptJExpectMethods contained toHaveBeenCalled toHaveBeenCalledTimes toHaveBeenCalledWith toEqual toBe toMatch diff --git a/autoload/syntax/jquery.coffee.vim b/autoload/syntax/jquery.coffee.vim index 0b5f703..89dd77d 100644 --- a/autoload/syntax/jquery.coffee.vim +++ b/autoload/syntax/jquery.coffee.vim @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'coffee' setlocal iskeyword+=$ endif -syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=@coffeeAfterIdentifier +syntax keyword coffeejQuery jQuery $ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=@coffeeAfterIdentifier " syntax match coffeejQuerydot contained /\./ nextgroup=@coffeeQGlobals " syntax match coffeejQuerydot contained /([^)]*)\./ nextgroup=@coffeeQFunctions diff --git a/autoload/syntax/jquery.ls.vim b/autoload/syntax/jquery.ls.vim index c636e31..6b2fca6 100644 --- a/autoload/syntax/jquery.ls.vim +++ b/autoload/syntax/jquery.ls.vim @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'ls' setlocal iskeyword+=$ endif -syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=@lsAfterIdentifier +syntax keyword lsjQuery jQuery $ containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=@lsAfterIdentifier " syntax match lsjQuerydot contained /\./ nextgroup=@lsQGlobals " syntax match lsjQuerydot contained /([^)]*)\./ nextgroup=@lsQFunctions diff --git a/autoload/syntax/jquery.typescript.vim b/autoload/syntax/jquery.typescript.vim index 3e82850..5466f92 100644 --- a/autoload/syntax/jquery.typescript.vim +++ b/autoload/syntax/jquery.typescript.vim @@ -11,7 +11,7 @@ if exists("b:current_syntax") && b:current_syntax == 'typescript' setlocal iskeyword+=$ endif -syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=@typescriptAfterIdentifier +syntax keyword typescriptjQuery jQuery $ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=@typescriptAfterIdentifier " syntax match typescriptjQuerydot contained /\./ nextgroup=@typescriptQGlobals " syntax match typescriptjQuerydot contained /([^)]*)\./ nextgroup=@typescriptQFunctions diff --git a/autoload/syntax/postprocess.javascript.vim b/autoload/syntax/postprocess.javascript.vim index 2c903ea..88448eb 100644 --- a/autoload/syntax/postprocess.javascript.vim +++ b/autoload/syntax/postprocess.javascript.vim @@ -14,5 +14,5 @@ syntax cluster props add=@javascriptRFunctions,@gavascriptRAttrs syntax cluster props add=@javascriptVFunctions,javascriptVAttrs if !exists("javascript_props") - syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptString nextgroup=@props + syntax match javascriptLDot /\./ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=@props endif diff --git a/autoload/syntax/ramda.coffee.vim b/autoload/syntax/ramda.coffee.vim index 8300ece..8f7291b 100644 --- a/autoload/syntax/ramda.coffee.vim +++ b/autoload/syntax/ramda.coffee.vim @@ -5,7 +5,7 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot +syntax keyword coffeeRamda R containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot syntax match coffeeRaDot contained /\./ nextgroup=coffeeRaFunctions syntax cluster coffeeRaFunctions contains=coffeeRaFunction,coffeeRaMath,coffeeRaList,coffeeRaLogic,coffeeRaObject,coffeeRaRelation,coffeeRaType,coffeeRaString diff --git a/autoload/syntax/ramda.javascript.vim b/autoload/syntax/ramda.javascript.vim index b3fd28a..08d736c 100644 --- a/autoload/syntax/ramda.javascript.vim +++ b/autoload/syntax/ramda.javascript.vim @@ -5,7 +5,7 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot +syntax keyword javascriptRamda R containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot syntax match javascriptRaDot contained /\./ nextgroup=javascriptRaFunctions syntax cluster javascriptRaFunctions contains=javascriptRaFunction,javascriptRaMath,javascriptRaList,javascriptRaLogic,javascriptRaObject,javascriptRaRelation,javascriptRaType,javascriptRaString diff --git a/autoload/syntax/ramda.ls.vim b/autoload/syntax/ramda.ls.vim index 42e2430..71f1f8c 100644 --- a/autoload/syntax/ramda.ls.vim +++ b/autoload/syntax/ramda.ls.vim @@ -5,7 +5,7 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot +syntax keyword lsRamda R containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot syntax match lsRaDot contained /\./ nextgroup=lsRaFunctions syntax cluster lsRaFunctions contains=lsRaFunction,lsRaMath,lsRaList,lsRaLogic,lsRaObject,lsRaRelation,lsRaType,lsRaString diff --git a/autoload/syntax/ramda.typescript.vim b/autoload/syntax/ramda.typescript.vim index 67a67be..d891195 100644 --- a/autoload/syntax/ramda.typescript.vim +++ b/autoload/syntax/ramda.typescript.vim @@ -5,7 +5,7 @@ " Version: 0.21.0 " URL: http://ramdajs.com/ -syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot +syntax keyword typescriptRamda R containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot syntax match typescriptRaDot contained /\./ nextgroup=typescriptRaFunctions syntax cluster typescriptRaFunctions contains=typescriptRaFunction,typescriptRaMath,typescriptRaList,typescriptRaLogic,typescriptRaObject,typescriptRaRelation,typescriptRaType,typescriptRaString diff --git a/autoload/syntax/react.coffee.vim b/autoload/syntax/react.coffee.vim index f4d6730..153d929 100644 --- a/autoload/syntax/react.coffee.vim +++ b/autoload/syntax/react.coffee.vim @@ -7,13 +7,13 @@ " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot +syntax keyword coffeeReact React containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDot syntax match coffeeRDot contained /\./ nextgroup=coffeeRProps,coffeeRMethods -syntax keyword coffeeReact ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDDot +syntax keyword coffeeReact ReactDOM containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDDot syntax match coffeeRDDot contained /\./ nextgroup=coffeeRDMethods -syntax keyword coffeeReact ReactDOMServer containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDSDot +syntax keyword coffeeReact ReactDOMServer containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRDSDot syntax match coffeeRDSDot contained /\./ nextgroup=coffeeRDSMethods " React diff --git a/autoload/syntax/react.javascript.vim b/autoload/syntax/react.javascript.vim index 417174d..0e8be35 100644 --- a/autoload/syntax/react.javascript.vim +++ b/autoload/syntax/react.javascript.vim @@ -7,13 +7,13 @@ " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot +syntax keyword javascriptReact React containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDot syntax match javascriptRDot contained /\./ nextgroup=javascriptRProps,javascriptRMethods -syntax keyword javascriptReact ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDDot +syntax keyword javascriptReact ReactDOM containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDDot syntax match javascriptRDDot contained /\./ nextgroup=javascriptRDMethods -syntax keyword javascriptReact ReactDOMServer containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDSDot +syntax keyword javascriptReact ReactDOMServer containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRDSDot syntax match javascriptRDSDot contained /\./ nextgroup=javascriptRDSMethods " React diff --git a/autoload/syntax/react.ls.vim b/autoload/syntax/react.ls.vim index 44de328..e4f8079 100644 --- a/autoload/syntax/react.ls.vim +++ b/autoload/syntax/react.ls.vim @@ -7,13 +7,13 @@ " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot +syntax keyword lsReact React containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDot syntax match lsRDot contained /\./ nextgroup=lsRProps,lsRMethods -syntax keyword lsReact ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDDot +syntax keyword lsReact ReactDOM containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDDot syntax match lsRDDot contained /\./ nextgroup=lsRDMethods -syntax keyword lsReact ReactDOMServer containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDSDot +syntax keyword lsReact ReactDOMServer containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRDSDot syntax match lsRDSDot contained /\./ nextgroup=lsRDSMethods " React diff --git a/autoload/syntax/react.typescript.vim b/autoload/syntax/react.typescript.vim index 4001d44..f402448 100644 --- a/autoload/syntax/react.typescript.vim +++ b/autoload/syntax/react.typescript.vim @@ -7,13 +7,13 @@ " URL: https://facebook.github.io/react/docs/react-component.html " URL: https://facebook.github.io/react/docs/component-api.html -syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot +syntax keyword typescriptReact React containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDot syntax match typescriptRDot contained /\./ nextgroup=typescriptRProps,typescriptRMethods -syntax keyword typescriptReact ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDDot +syntax keyword typescriptReact ReactDOM containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDDot syntax match typescriptRDDot contained /\./ nextgroup=typescriptRDMethods -syntax keyword typescriptReact ReactDOMServer containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDSDot +syntax keyword typescriptReact ReactDOMServer containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRDSDot syntax match typescriptRDSDot contained /\./ nextgroup=typescriptRDSMethods " React diff --git a/autoload/syntax/requirejs.coffee.vim b/autoload/syntax/requirejs.coffee.vim index 3759655..9378388 100644 --- a/autoload/syntax/requirejs.coffee.vim +++ b/autoload/syntax/requirejs.coffee.vim @@ -6,11 +6,11 @@ " URL: http://requirejs.org/ -syntax keyword coffeeRequire require requirejs containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRequiredot +syntax keyword coffeeRequire require requirejs containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeRequiredot syntax match coffeeRequiredot contained /\./ nextgroup=coffeeRequireMethods syntax keyword coffeeRequireMethods contained config -syntax keyword coffeeRdefine define containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString nextgroup=coffeeRdefinedot +syntax keyword coffeeRdefine define containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString nextgroup=coffeeRdefinedot syntax match coffeeRdefinedot contained /\./ nextgroup=coffeeRdefineMethods syntax keyword coffeeRdefineMethods contained amd diff --git a/autoload/syntax/requirejs.javascript.vim b/autoload/syntax/requirejs.javascript.vim index 3e8afec..1ebd93a 100644 --- a/autoload/syntax/requirejs.javascript.vim +++ b/autoload/syntax/requirejs.javascript.vim @@ -6,11 +6,11 @@ " URL: http://requirejs.org/ -syntax keyword javascriptRequire require requirejs containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRequiredot +syntax keyword javascriptRequire require requirejs containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptRequiredot syntax match javascriptRequiredot contained /\./ nextgroup=javascriptRequireMethods syntax keyword javascriptRequireMethods contained config -syntax keyword javascriptRdefine define containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString nextgroup=javascriptRdefinedot +syntax keyword javascriptRdefine define containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString nextgroup=javascriptRdefinedot syntax match javascriptRdefinedot contained /\./ nextgroup=javascriptRdefineMethods syntax keyword javascriptRdefineMethods contained amd diff --git a/autoload/syntax/requirejs.ls.vim b/autoload/syntax/requirejs.ls.vim index 9c9e138..3a7c412 100644 --- a/autoload/syntax/requirejs.ls.vim +++ b/autoload/syntax/requirejs.ls.vim @@ -6,11 +6,11 @@ " URL: http://requirejs.org/ -syntax keyword lsRequire require requirejs containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRequiredot +syntax keyword lsRequire require requirejs containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsRequiredot syntax match lsRequiredot contained /\./ nextgroup=lsRequireMethods syntax keyword lsRequireMethods contained config -syntax keyword lsRdefine define containedin=ALLBUT,lsComment,lsLineComment,lsString nextgroup=lsRdefinedot +syntax keyword lsRdefine define containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString nextgroup=lsRdefinedot syntax match lsRdefinedot contained /\./ nextgroup=lsRdefineMethods syntax keyword lsRdefineMethods contained amd diff --git a/autoload/syntax/requirejs.typescript.vim b/autoload/syntax/requirejs.typescript.vim index 5c71b03..4cea3ca 100644 --- a/autoload/syntax/requirejs.typescript.vim +++ b/autoload/syntax/requirejs.typescript.vim @@ -6,11 +6,11 @@ " URL: http://requirejs.org/ -syntax keyword typescriptRequire require requirejs containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRequiredot +syntax keyword typescriptRequire require requirejs containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptRequiredot syntax match typescriptRequiredot contained /\./ nextgroup=typescriptRequireMethods syntax keyword typescriptRequireMethods contained config -syntax keyword typescriptRdefine define containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString nextgroup=typescriptRdefinedot +syntax keyword typescriptRdefine define containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString nextgroup=typescriptRdefinedot syntax match typescriptRdefinedot contained /\./ nextgroup=typescriptRdefineMethods syntax keyword typescriptRdefineMethods contained amd diff --git a/autoload/syntax/tape.coffee.vim b/autoload/syntax/tape.coffee.vim index eeaae01..e4faf31 100644 --- a/autoload/syntax/tape.coffee.vim +++ b/autoload/syntax/tape.coffee.vim @@ -6,11 +6,11 @@ " URL: https://github.com/substack/tape -syntax keyword coffeeTape test containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTdot +syntax keyword coffeeTape test containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTdot syntax match coffeeTdot contained /\./ nextgroup=coffeeTMethods syntax keyword coffeeTMethods contained skip onfinish onFailure createHarness only createStream -syntax keyword coffeeTapeAssert t containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTAssertdot +syntax keyword coffeeTapeAssert t containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeTAssertdot syntax match coffeeTAssertdot contained /\./ nextgroup=coffeeTAssertMethods syntax keyword coffeeTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error syntax keyword coffeeTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual diff --git a/autoload/syntax/tape.javascript.vim b/autoload/syntax/tape.javascript.vim index adcd0ec..7b2ddb0 100644 --- a/autoload/syntax/tape.javascript.vim +++ b/autoload/syntax/tape.javascript.vim @@ -6,11 +6,11 @@ " URL: https://github.com/substack/tape -syntax keyword javascriptTape test containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTdot +syntax keyword javascriptTape test containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTdot syntax match javascriptTdot contained /\./ nextgroup=javascriptTMethods syntax keyword javascriptTMethods contained skip onfinish onFailure createHarness only createStream -syntax keyword javascriptTapeAssert t containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTAssertdot +syntax keyword javascriptTapeAssert t containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptTAssertdot syntax match javascriptTAssertdot contained /\./ nextgroup=javascriptTAssertMethods syntax keyword javascriptTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error syntax keyword javascriptTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual diff --git a/autoload/syntax/tape.ls.vim b/autoload/syntax/tape.ls.vim index e90caa9..01bae46 100644 --- a/autoload/syntax/tape.ls.vim +++ b/autoload/syntax/tape.ls.vim @@ -6,11 +6,11 @@ " URL: https://github.com/substack/tape -syntax keyword lsTape test containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTdot +syntax keyword lsTape test containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTdot syntax match lsTdot contained /\./ nextgroup=lsTMethods syntax keyword lsTMethods contained skip onfinish onFailure createHarness only createStream -syntax keyword lsTapeAssert t containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTAssertdot +syntax keyword lsTapeAssert t containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsTAssertdot syntax match lsTAssertdot contained /\./ nextgroup=lsTAssertMethods syntax keyword lsTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error syntax keyword lsTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual diff --git a/autoload/syntax/tape.typescript.vim b/autoload/syntax/tape.typescript.vim index cd0c2bd..d1fd05b 100644 --- a/autoload/syntax/tape.typescript.vim +++ b/autoload/syntax/tape.typescript.vim @@ -6,11 +6,11 @@ " URL: https://github.com/substack/tape -syntax keyword typescriptTape test containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTdot +syntax keyword typescriptTape test containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTdot syntax match typescriptTdot contained /\./ nextgroup=typescriptTMethods syntax keyword typescriptTMethods contained skip onfinish onFailure createHarness only createStream -syntax keyword typescriptTapeAssert t containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTAssertdot +syntax keyword typescriptTapeAssert t containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptTAssertdot syntax match typescriptTAssertdot contained /\./ nextgroup=typescriptTAssertMethods syntax keyword typescriptTAssertMethods contained plan end fail pass timeoutAfter skip ok notOk error syntax keyword typescriptTAssertMethods contained equal notEqual deepEqual notDeepEqual deepLooseEqual notDeepLooseEqual diff --git a/autoload/syntax/underscore.coffee.vim b/autoload/syntax/underscore.coffee.vim index 376faa6..b3df396 100644 --- a/autoload/syntax/underscore.coffee.vim +++ b/autoload/syntax/underscore.coffee.vim @@ -7,7 +7,7 @@ " LoDash: 4.0.0 " URL: http://lodash.com/ -syntax keyword coffeeunderscore _ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution +syntax keyword coffeeunderscore _ containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution " syntax match coffeeunderscoredot contained /\./ nextgroup=@coffee_Functions " syntax match coffeeunderscoredot contained /([^)]*)\./ nextgroup=@coffee_Functions diff --git a/autoload/syntax/underscore.javascript.vim b/autoload/syntax/underscore.javascript.vim index 2b50b3d..65479b7 100644 --- a/autoload/syntax/underscore.javascript.vim +++ b/autoload/syntax/underscore.javascript.vim @@ -7,7 +7,7 @@ " LoDash: 4.0.0 " URL: http://lodash.com/ -syntax keyword javascriptunderscore _ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution +syntax keyword javascriptunderscore _ containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution " syntax match javascriptunderscoredot contained /\./ nextgroup=@javascript_Functions " syntax match javascriptunderscoredot contained /([^)]*)\./ nextgroup=@javascript_Functions diff --git a/autoload/syntax/underscore.ls.vim b/autoload/syntax/underscore.ls.vim index e8dd6b7..1b4f61f 100644 --- a/autoload/syntax/underscore.ls.vim +++ b/autoload/syntax/underscore.ls.vim @@ -7,7 +7,7 @@ " LoDash: 4.0.0 " URL: http://lodash.com/ -syntax keyword lsunderscore _ containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution +syntax keyword lsunderscore _ containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution " syntax match lsunderscoredot contained /\./ nextgroup=@ls_Functions " syntax match lsunderscoredot contained /([^)]*)\./ nextgroup=@ls_Functions diff --git a/autoload/syntax/underscore.typescript.vim b/autoload/syntax/underscore.typescript.vim index 1522942..dbea40f 100644 --- a/autoload/syntax/underscore.typescript.vim +++ b/autoload/syntax/underscore.typescript.vim @@ -7,7 +7,7 @@ " LoDash: 4.0.0 " URL: http://lodash.com/ -syntax keyword typescriptunderscore _ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution +syntax keyword typescriptunderscore _ containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution " syntax match typescriptunderscoredot contained /\./ nextgroup=@typescript_Functions " syntax match typescriptunderscoredot contained /([^)]*)\./ nextgroup=@typescript_Functions diff --git a/autoload/syntax/vue.coffee.vim b/autoload/syntax/vue.coffee.vim index a679099..a540f9b 100644 --- a/autoload/syntax/vue.coffee.vim +++ b/autoload/syntax/vue.coffee.vim @@ -10,7 +10,7 @@ if exists("b:current_syntax") && b:current_syntax == 'coffee' setlocal iskeyword+=$ endif -syntax keyword coffeeVue Vue vm containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeVDot +syntax keyword coffeeVue Vue vm containedin=ALLBUT,coffeeComment,coffeeLineComment,coffeeRegexpString,coffeeString,coffeeTemplate,coffeeTemplateSubstitution nextgroup=coffeeVDot syntax match coffeeVDot contained /\./ nextgroup=coffeeVFunctions,coffeeVAttrs " Vue.* diff --git a/autoload/syntax/vue.javascript.vim b/autoload/syntax/vue.javascript.vim index 59aa9d3..368f652 100644 --- a/autoload/syntax/vue.javascript.vim +++ b/autoload/syntax/vue.javascript.vim @@ -10,7 +10,7 @@ if exists("b:current_syntax") && b:current_syntax == 'javascript' setlocal iskeyword+=$ endif -syntax keyword javascriptVue Vue vm containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptVDot +syntax keyword javascriptVue Vue vm containedin=ALLBUT,javascriptComment,javascriptLineComment,javascriptRegexpString,javascriptString,javascriptTemplate,javascriptTemplateSubstitution nextgroup=javascriptVDot syntax match javascriptVDot contained /\./ nextgroup=javascriptVFunctions,javascriptVAttrs " Vue.* diff --git a/autoload/syntax/vue.ls.vim b/autoload/syntax/vue.ls.vim index 423fba0..7ccb831 100644 --- a/autoload/syntax/vue.ls.vim +++ b/autoload/syntax/vue.ls.vim @@ -10,7 +10,7 @@ if exists("b:current_syntax") && b:current_syntax == 'ls' setlocal iskeyword+=$ endif -syntax keyword lsVue Vue vm containedin=ALLBUT,lsComment,lsLineComment,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsVDot +syntax keyword lsVue Vue vm containedin=ALLBUT,lsComment,lsLineComment,lsRegexpString,lsString,lsTemplate,lsTemplateSubstitution nextgroup=lsVDot syntax match lsVDot contained /\./ nextgroup=lsVFunctions,lsVAttrs " Vue.* diff --git a/autoload/syntax/vue.typescript.vim b/autoload/syntax/vue.typescript.vim index 4cd8a5d..2698df9 100644 --- a/autoload/syntax/vue.typescript.vim +++ b/autoload/syntax/vue.typescript.vim @@ -10,7 +10,7 @@ if exists("b:current_syntax") && b:current_syntax == 'typescript' setlocal iskeyword+=$ endif -syntax keyword typescriptVue Vue vm containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptVDot +syntax keyword typescriptVue Vue vm containedin=ALLBUT,typescriptComment,typescriptLineComment,typescriptRegexpString,typescriptString,typescriptTemplate,typescriptTemplateSubstitution nextgroup=typescriptVDot syntax match typescriptVDot contained /\./ nextgroup=typescriptVFunctions,typescriptVAttrs " Vue.*