normalizing attribute for syntax highlight

outsideris · outsideris · commit 33b937e8b93c · 2015-10-09T09:55:24.000-07:00
related #44
diff --git a/grammars/angularjs.cson b/grammars/angularjs.cson
@@ -102,7 +102,7 @@
       { 'include': 'source.js' }
     ]
   'angular-directive-attribute':
-    'begin': '\\b((?i:ng-(' +
+    'begin': '\\b((?i:(data-|x-)?ng(-|_|:)(' +
         'animate-children|app|' +
         'bind|bind-html|bind-template|blur|' +
         'change|checked|class|class-even|class-odd|click|cloak|controller|copy|csp|cut|' +
diff --git a/spec/grammar-spec.coffee b/spec/grammar-spec.coffee
@@ -82,6 +82,35 @@ describe 'directive grammar', ->
       expect(lines[0][1]).toEqual value: 'NG-INCLUDE', scopes: ['text.html.angular', 'meta.tag.block.any.html', 'entity.name.tag.block.any.html.angular']
       expect(lines[0][5]).toEqual value: 'NG-INCLUDE', scopes: ['text.html.angular', 'meta.tag.block.any.html', 'entity.name.tag.block.any.html.angular']
 
+  describe 'normalization angular tag and attribute', ->
+    it 'tokenizes data- prefixed angular attributes', ->
+      lines = grammar.tokenizeLines '''
+        <body data-ng-controller="TestCtrl">
+      '''
+
+      expect(lines[0][3]).toEqual value: 'data-ng-controller', scopes: ['text.html.angular', 'meta.tag.inline.any.html', 'meta.attribute.html.angular', 'entity.other.attribute-name.html.angular']
+
+    it 'tokenizes x- prefixed angular attributes', ->
+      lines = grammar.tokenizeLines '''
+        <body x-ng-controller="TestCtrl">
+      '''
+
+      expect(lines[0][3]).toEqual value: 'x-ng-controller', scopes: ['text.html.angular', 'meta.tag.inline.any.html', 'meta.attribute.html.angular', 'entity.other.attribute-name.html.angular']
+
+    it 'tokenizes _ suffixed angular attributes', ->
+      lines = grammar.tokenizeLines '''
+        <body ng_controller="TestCtrl">
+      '''
+
+      expect(lines[0][3]).toEqual value: 'ng_controller', scopes: ['text.html.angular', 'meta.tag.inline.any.html', 'meta.attribute.html.angular', 'entity.other.attribute-name.html.angular']
+
+    it 'tokenizes : suffixed angular attributes', ->
+      lines = grammar.tokenizeLines '''
+        <body ng:controller="TestCtrl">
+      '''
+
+      expect(lines[0][3]).toEqual value: 'ng:controller', scopes: ['text.html.angular', 'meta.tag.inline.any.html', 'meta.attribute.html.angular', 'entity.other.attribute-name.html.angular']
+
   describe 'angular expression', ->
     it 'tokenizes angular expressions in HTML tags', ->
       lines = grammar.tokenizeLines '''

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@`
`102`	`102`	`{ 'include': 'source.js' }`
`103`	`103`	`]`
`104`	`104`	`'angular-directive-attribute':`
`105`		`- 'begin': '\\b((?i:ng-(' +`
	`105`	`+ 'begin': '\\b((?i:(data-\|x-)?ng(-\|_\|:)(' +`
`106`	`106`	`'animate-children\|app\|' +`
`107`	`107`	`'bind\|bind-html\|bind-template\|blur\|' +`
`108`	`108`	`'change\|checked\|class\|class-even\|class-odd\|click\|cloak\|controller\|copy\|csp\|cut\|' +`