Skip to content

Commit e8dd2b0

Browse files
committed
Fix angularjs performance issue
1 parent 38fe28f commit e8dd2b0

4 files changed

Lines changed: 104 additions & 68 deletions

File tree

autoload/syntax/angularjs.coffee.vim

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,58 @@
11
" Vim syntax file
22
" Language: AngularJS for coffee
33
" Maintainer: othree <othree@gmail.com>
4-
" Last Change: 2013/02/22
5-
" Version: 1.1.13
4+
" Last Change: 2013/04/21
5+
" Version: 1.1.13.1
66
" URL: http://angularjs.org/
77

8-
syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment
9-
syntax match coffeeAngulardot containedin=ALLBUT,coffeeComment /\(\<angular\.\)\@<=\h\w*/ contains=coffeeAngularMethods
8+
syntax keyword coffeeAngular angular containedin=ALLBUT,coffeeComment nextgroup=coffeeAngulardot
9+
syntax match coffeeAngulardot contained /\./ nextgroup=coffeeAngularMethods
1010
syntax keyword coffeeAngularMethods contained bind bootstrap copy element equals
1111
syntax keyword coffeeAngularMethods contained extend forEach fromJson identity injector
1212
syntax keyword coffeeAngularMethods contained isArray isDate isDefined isElement isFunction
1313
syntax keyword coffeeAngularMethods contained isNumber isObject isString isUndefined lowercase
1414
syntax keyword coffeeAngularMethods contained mock module noop toJson uppercase version
1515

1616
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $anchorScroll $cacheFactory $compile $controller $document
17-
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $exceptionHandler $filter $http $httpBackend $interpolate
18-
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $locale $location $log $parse $q $rootElement $rootScope
19-
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $scope $route $routeParams $templateCache $timeout $window
20-
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $cookies $cookieStore $resource $sanitize
17+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $exceptionHandler $filter $httpBackend
18+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $locale $parse $rootElement
19+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $routeParams $templateCache $window
20+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $cookies $resource $sanitize
2121

22-
syntax match coffeeAShttpdot containedin=ALLBUT,coffeeComment /\(\<\$http\.\)\@<=\h\w*/ contains=coffeeAShttpMethods
22+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $http nextgroup=coffeeAShttpdot
23+
syntax match coffeeAShttpdot contained /\./ nextgroup=coffeeAShttpMethods
2324
syntax keyword coffeeAShttpMethods contained get head post put delete jsonp defaults prendingRequests
2425

25-
syntax match coffeeASinterpolatedot containedin=ALLBUT,coffeeComment /\(\<\$interpolate\.\)\@<=\h\w*/ contains=coffeeASinterpolateMethods
26+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $interpolate nextgroup=coffeeASinterpolatedot
27+
syntax match coffeeASinterpolatedot contained /\./ nextgroup=coffeeASinterpolateMethods
2628
syntax keyword coffeeASinterpolateMethods contained endSymbol startSymbol
2729

28-
syntax match coffeeASlocationdot containedin=ALLBUT,coffeeComment /\(\<\$location\.\)\@<=\h\w*/ contains=coffeeASlocationMethods
30+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $location nextgroup=coffeeASlocationdot
31+
syntax match coffeeASlocationdot contained /\./ nextgroup=coffeeASlocationMethods
2932
syntax keyword coffeeASlocationMethods contained absUrl hash host path port protocol replace search url
3033

31-
syntax match coffeeASlogdot containedin=ALLBUT,coffeeComment /\(\<\$log\.\)\@<=\h\w*/ contains=coffeeASlogMethods
34+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $log nextgroup=coffeeASlogdot
35+
syntax match coffeeASlogdot contained /\./ nextgroup=coffeeASlogMethods
3236
syntax keyword coffeeASlogMethods contained error info log warn
3337

34-
syntax match coffeeASqdot containedin=ALLBUT,coffeeComment /\(\<\$q\.\)\@<=\h\w*/ contains=coffeeASqMethods
38+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $q nextgroup=coffeeASqdot
39+
syntax match coffeeASqdot contained /\./ nextgroup=coffeeASqMethods
3540
syntax keyword coffeeASqMethods contained all defer reject when
3641

37-
syntax match coffeeASroutedot containedin=ALLBUT,coffeeComment /\(\<\$route\.\)\@<=\h\w*/ contains=coffeeASrouteMethods
42+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $route nextgroup=coffeeASroutedot
43+
syntax match coffeeASroutedot contained /\./ nextgroup=coffeeASrouteMethods
3844
syntax keyword coffeeASrouteMethods contained reload current route
3945

40-
syntax match coffeeAStimeoutdot containedin=ALLBUT,coffeeComment /\(\<\$timeout\.\)\@<=\h\w*/ contains=coffeeAStimeoutMethods
46+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $timeout nextgroup=coffeeAStimeoutdot
47+
syntax match coffeeAStimeoutdot contained /\./ nextgroup=coffeeAStimeoutMethods
4148
syntax keyword coffeeAStimeoutMethods contained cancel
4249

43-
syntax match coffeeASscopedot containedin=ALLBUT,coffeeComment /\(\<\$scope\.\|\$rootScope\)\@<=\h\w*/ contains=coffeeASscopeMethods
50+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $scope $rootScope nextgroup=coffeeASscopedot
51+
syntax match coffeeASscopedot contained /\./ nextgroup=coffeeASscopeMethods
4452
syntax keyword coffeeASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id
4553

46-
syntax match coffeeAScookieStoredot containedin=ALLBUT,coffeeComment /\(\<\$cookieStore\.\)\@<=\h\w*/ contains=coffeeAScookieStoreMethods
54+
syntax keyword coffeeAServices containedin=ALLBUT,coffeeComment $cookieStore nextgroup=coffeeAScookieStoredot
55+
syntax match coffeeAScookieStoredot contained /\./ nextgroup=coffeeAScookieStoreMethods
4756
syntax keyword coffeeAScookieStoreMethods contained get put remove
4857

4958
syntax cluster coffeeAFunctions contains=coffeeAMFunctions

autoload/syntax/angularjs.javascript.vim

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,58 @@
11
" Vim syntax file
22
" Language: AngularJS for javascript
33
" Maintainer: othree <othree@gmail.com>
4-
" Last Change: 2013/02/22
5-
" Version: 1.1.13
4+
" Last Change: 2013/04/21
5+
" Version: 1.1.13.1
66
" URL: http://angularjs.org/
77

8-
syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment
9-
syntax match javascriptAngulardot containedin=ALLBUT,javascriptComment /\(\<angular\.\)\@<=\h\w*/ contains=javascriptAngularMethods
8+
syntax keyword javascriptAngular angular containedin=ALLBUT,javascriptComment nextgroup=javascriptAngulardot
9+
syntax match javascriptAngulardot contained /\./ nextgroup=javascriptAngularMethods
1010
syntax keyword javascriptAngularMethods contained bind bootstrap copy element equals
1111
syntax keyword javascriptAngularMethods contained extend forEach fromJson identity injector
1212
syntax keyword javascriptAngularMethods contained isArray isDate isDefined isElement isFunction
1313
syntax keyword javascriptAngularMethods contained isNumber isObject isString isUndefined lowercase
1414
syntax keyword javascriptAngularMethods contained mock module noop toJson uppercase version
1515

1616
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $anchorScroll $cacheFactory $compile $controller $document
17-
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $exceptionHandler $filter $http $httpBackend $interpolate
18-
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $locale $location $log $parse $q $rootElement $rootScope
19-
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $scope $route $routeParams $templateCache $timeout $window
20-
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $cookies $cookieStore $resource $sanitize
17+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $exceptionHandler $filter $httpBackend
18+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $locale $parse $rootElement
19+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $routeParams $templateCache $window
20+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $cookies $resource $sanitize
2121

22-
syntax match javascriptAShttpdot containedin=ALLBUT,javascriptComment /\(\<\$http\.\)\@<=\h\w*/ contains=javascriptAShttpMethods
22+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $http nextgroup=javascriptAShttpdot
23+
syntax match javascriptAShttpdot contained /\./ nextgroup=javascriptAShttpMethods
2324
syntax keyword javascriptAShttpMethods contained get head post put delete jsonp defaults prendingRequests
2425

25-
syntax match javascriptASinterpolatedot containedin=ALLBUT,javascriptComment /\(\<\$interpolate\.\)\@<=\h\w*/ contains=javascriptASinterpolateMethods
26+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $interpolate nextgroup=javascriptASinterpolatedot
27+
syntax match javascriptASinterpolatedot contained /\./ nextgroup=javascriptASinterpolateMethods
2628
syntax keyword javascriptASinterpolateMethods contained endSymbol startSymbol
2729

28-
syntax match javascriptASlocationdot containedin=ALLBUT,javascriptComment /\(\<\$location\.\)\@<=\h\w*/ contains=javascriptASlocationMethods
30+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $location nextgroup=javascriptASlocationdot
31+
syntax match javascriptASlocationdot contained /\./ nextgroup=javascriptASlocationMethods
2932
syntax keyword javascriptASlocationMethods contained absUrl hash host path port protocol replace search url
3033

31-
syntax match javascriptASlogdot containedin=ALLBUT,javascriptComment /\(\<\$log\.\)\@<=\h\w*/ contains=javascriptASlogMethods
34+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $log nextgroup=javascriptASlogdot
35+
syntax match javascriptASlogdot contained /\./ nextgroup=javascriptASlogMethods
3236
syntax keyword javascriptASlogMethods contained error info log warn
3337

34-
syntax match javascriptASqdot containedin=ALLBUT,javascriptComment /\(\<\$q\.\)\@<=\h\w*/ contains=javascriptASqMethods
38+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $q nextgroup=javascriptASqdot
39+
syntax match javascriptASqdot contained /\./ nextgroup=javascriptASqMethods
3540
syntax keyword javascriptASqMethods contained all defer reject when
3641

37-
syntax match javascriptASroutedot containedin=ALLBUT,javascriptComment /\(\<\$route\.\)\@<=\h\w*/ contains=javascriptASrouteMethods
42+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $route nextgroup=javascriptASroutedot
43+
syntax match javascriptASroutedot contained /\./ nextgroup=javascriptASrouteMethods
3844
syntax keyword javascriptASrouteMethods contained reload current route
3945

40-
syntax match javascriptAStimeoutdot containedin=ALLBUT,javascriptComment /\(\<\$timeout\.\)\@<=\h\w*/ contains=javascriptAStimeoutMethods
46+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $timeout nextgroup=javascriptAStimeoutdot
47+
syntax match javascriptAStimeoutdot contained /\./ nextgroup=javascriptAStimeoutMethods
4148
syntax keyword javascriptAStimeoutMethods contained cancel
4249

43-
syntax match javascriptASscopedot containedin=ALLBUT,javascriptComment /\(\<\$scope\.\|\$rootScope\)\@<=\h\w*/ contains=javascriptASscopeMethods
50+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $scope $rootScope nextgroup=javascriptASscopedot
51+
syntax match javascriptASscopedot contained /\./ nextgroup=javascriptASscopeMethods
4452
syntax keyword javascriptASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id
4553

46-
syntax match javascriptAScookieStoredot containedin=ALLBUT,javascriptComment /\(\<\$cookieStore\.\)\@<=\h\w*/ contains=javascriptAScookieStoreMethods
54+
syntax keyword javascriptAServices containedin=ALLBUT,javascriptComment $cookieStore nextgroup=javascriptAScookieStoredot
55+
syntax match javascriptAScookieStoredot contained /\./ nextgroup=javascriptAScookieStoreMethods
4756
syntax keyword javascriptAScookieStoreMethods contained get put remove
4857

4958
syntax cluster javascriptAFunctions contains=javascriptAMFunctions

autoload/syntax/angularjs.ls.vim

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,58 @@
11
" Vim syntax file
22
" Language: AngularJS for ls
33
" Maintainer: othree <othree@gmail.com>
4-
" Last Change: 2013/02/22
5-
" Version: 1.1.13
4+
" Last Change: 2013/04/21
5+
" Version: 1.1.13.1
66
" URL: http://angularjs.org/
77

8-
syntax keyword lsAngular angular containedin=ALLBUT,lsComment
9-
syntax match lsAngulardot containedin=ALLBUT,lsComment /\(\<angular\.\)\@<=\h\w*/ contains=lsAngularMethods
8+
syntax keyword lsAngular angular containedin=ALLBUT,lsComment nextgroup=lsAngulardot
9+
syntax match lsAngulardot contained /\./ nextgroup=lsAngularMethods
1010
syntax keyword lsAngularMethods contained bind bootstrap copy element equals
1111
syntax keyword lsAngularMethods contained extend forEach fromJson identity injector
1212
syntax keyword lsAngularMethods contained isArray isDate isDefined isElement isFunction
1313
syntax keyword lsAngularMethods contained isNumber isObject isString isUndefined lowercase
1414
syntax keyword lsAngularMethods contained mock module noop toJson uppercase version
1515

1616
syntax keyword lsAServices containedin=ALLBUT,lsComment $anchorScroll $cacheFactory $compile $controller $document
17-
syntax keyword lsAServices containedin=ALLBUT,lsComment $exceptionHandler $filter $http $httpBackend $interpolate
18-
syntax keyword lsAServices containedin=ALLBUT,lsComment $locale $location $log $parse $q $rootElement $rootScope
19-
syntax keyword lsAServices containedin=ALLBUT,lsComment $scope $route $routeParams $templateCache $timeout $window
20-
syntax keyword lsAServices containedin=ALLBUT,lsComment $cookies $cookieStore $resource $sanitize
17+
syntax keyword lsAServices containedin=ALLBUT,lsComment $exceptionHandler $filter $httpBackend
18+
syntax keyword lsAServices containedin=ALLBUT,lsComment $locale $parse $rootElement
19+
syntax keyword lsAServices containedin=ALLBUT,lsComment $routeParams $templateCache $window
20+
syntax keyword lsAServices containedin=ALLBUT,lsComment $cookies $resource $sanitize
2121

22-
syntax match lsAShttpdot containedin=ALLBUT,lsComment /\(\<\$http\.\)\@<=\h\w*/ contains=lsAShttpMethods
22+
syntax keyword lsAServices containedin=ALLBUT,lsComment $http nextgroup=lsAShttpdot
23+
syntax match lsAShttpdot contained /\./ nextgroup=lsAShttpMethods
2324
syntax keyword lsAShttpMethods contained get head post put delete jsonp defaults prendingRequests
2425

25-
syntax match lsASinterpolatedot containedin=ALLBUT,lsComment /\(\<\$interpolate\.\)\@<=\h\w*/ contains=lsASinterpolateMethods
26+
syntax keyword lsAServices containedin=ALLBUT,lsComment $interpolate nextgroup=lsASinterpolatedot
27+
syntax match lsASinterpolatedot contained /\./ nextgroup=lsASinterpolateMethods
2628
syntax keyword lsASinterpolateMethods contained endSymbol startSymbol
2729

28-
syntax match lsASlocationdot containedin=ALLBUT,lsComment /\(\<\$location\.\)\@<=\h\w*/ contains=lsASlocationMethods
30+
syntax keyword lsAServices containedin=ALLBUT,lsComment $location nextgroup=lsASlocationdot
31+
syntax match lsASlocationdot contained /\./ nextgroup=lsASlocationMethods
2932
syntax keyword lsASlocationMethods contained absUrl hash host path port protocol replace search url
3033

31-
syntax match lsASlogdot containedin=ALLBUT,lsComment /\(\<\$log\.\)\@<=\h\w*/ contains=lsASlogMethods
34+
syntax keyword lsAServices containedin=ALLBUT,lsComment $log nextgroup=lsASlogdot
35+
syntax match lsASlogdot contained /\./ nextgroup=lsASlogMethods
3236
syntax keyword lsASlogMethods contained error info log warn
3337

34-
syntax match lsASqdot containedin=ALLBUT,lsComment /\(\<\$q\.\)\@<=\h\w*/ contains=lsASqMethods
38+
syntax keyword lsAServices containedin=ALLBUT,lsComment $q nextgroup=lsASqdot
39+
syntax match lsASqdot contained /\./ nextgroup=lsASqMethods
3540
syntax keyword lsASqMethods contained all defer reject when
3641

37-
syntax match lsASroutedot containedin=ALLBUT,lsComment /\(\<\$route\.\)\@<=\h\w*/ contains=lsASrouteMethods
42+
syntax keyword lsAServices containedin=ALLBUT,lsComment $route nextgroup=lsASroutedot
43+
syntax match lsASroutedot contained /\./ nextgroup=lsASrouteMethods
3844
syntax keyword lsASrouteMethods contained reload current route
3945

40-
syntax match lsAStimeoutdot containedin=ALLBUT,lsComment /\(\<\$timeout\.\)\@<=\h\w*/ contains=lsAStimeoutMethods
46+
syntax keyword lsAServices containedin=ALLBUT,lsComment $timeout nextgroup=lsAStimeoutdot
47+
syntax match lsAStimeoutdot contained /\./ nextgroup=lsAStimeoutMethods
4148
syntax keyword lsAStimeoutMethods contained cancel
4249

43-
syntax match lsASscopedot containedin=ALLBUT,lsComment /\(\<\$scope\.\|\$rootScope\)\@<=\h\w*/ contains=lsASscopeMethods
50+
syntax keyword lsAServices containedin=ALLBUT,lsComment $scope $rootScope nextgroup=lsASscopedot
51+
syntax match lsASscopedot contained /\./ nextgroup=lsASscopeMethods
4452
syntax keyword lsASscopeMethods contained $apply $broadcast $destroy $digest $emit $eval $evalAsync $new $on $watch $id
4553

46-
syntax match lsAScookieStoredot containedin=ALLBUT,lsComment /\(\<\$cookieStore\.\)\@<=\h\w*/ contains=lsAScookieStoreMethods
54+
syntax keyword lsAServices containedin=ALLBUT,lsComment $cookieStore nextgroup=lsAScookieStoredot
55+
syntax match lsAScookieStoredot contained /\./ nextgroup=lsAScookieStoreMethods
4756
syntax keyword lsAScookieStoreMethods contained get put remove
4857

4958
syntax cluster lsAFunctions contains=lsAMFunctions

0 commit comments

Comments
 (0)