fix(syntax): tokenize attribute body correctly/ don't apply invoke ru…

…le on it
aurelia · Oct 4, 2016 · 1d51470 · 1d51470
1 parent 3339728
commit 1d51470
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/syntaxes/html.json b/syntaxes/html.json
@@ -236,7 +236,7 @@
       }
     },
     "tag-aurelia-attribute-with-invoke-attribute": {
-      "match": "[^=](([a-zA-Z0-9:-]+)(\\.)(trigger|delegate|call))",
+      "match": "(?=\\s)[^=](([a-zA-Z0-9:-]+)(\\.)(trigger|delegate|call))",
       "captures": {
         "2": {
           "name": "entity.other.attribute-name.html"

diff --git a/test/syntax.html/invoke.test.ts b/test/syntax.html/invoke.test.ts
@@ -45,4 +45,19 @@ suite('The Aurelia HTML syntax invoke attributes', () => {
 
   });
 
+  test('must not tokenize invokes in attribute body with scope "invoke.attribute.html.au"', () => {
+
+    // arrange
+    let scope = 'meta.tag.inline.any.html';
+
+    // act
+    let lineToken = tokenizeLine('<a b="draw.call:animate(data)">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 6, 29);
+    assert.equal(hasScope(token.scopes, scope), true);
+
+  });
+
+
 });