From 43528bbf8682f1e04d59b4ba7534dd5d3a9e1b33 Mon Sep 17 00:00:00 2001
From: Erik Lieben <erik.lieben@effectory.com>
Date: Sat, 5 Nov 2016 21:37:13 +0100
Subject: [PATCH] fix(syntax): don't tokenize attribute body something.ref with
 aurelia ref, resolves: #19

---
 syntaxes/html.json           |  8 ++++----
 test/syntax.html/ref.test.ts | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/syntaxes/html.json b/syntaxes/html.json
index 2556e25e..a6251de6 100644
--- a/syntaxes/html.json
+++ b/syntaxes/html.json
@@ -240,15 +240,15 @@
       }
     },
     "tag-aurelia-attribute-with-ref-attribute": {
-      "match": "[^=](([a-zA-Z0-9:-]+)(?<!controller|view|view-model)(\\.)(ref))",
+      "match": "(?<![\"'-])([a-zA-Z0-9:-]+)(?<!controller|view|view-model)(\\.)(ref)(?![\"'-;])",
       "captures": {
-        "2": {
+        "1": {
           "name": "entity.other.attribute-name.html"
         },
-        "3": {
+        "2": {
           "name": "punctuation.definition.tag.begin.html"
         },
-        "4": {
+        "3": {
           "name": "ref.attribute.html.au"
         }
       }
diff --git a/test/syntax.html/ref.test.ts b/test/syntax.html/ref.test.ts
index e2238041..d3f5c56e 100644
--- a/test/syntax.html/ref.test.ts
+++ b/test/syntax.html/ref.test.ts
@@ -101,4 +101,18 @@ describe('The Aurelia HTML syntax ref attribute', () => {
 
   });
 
+  it('must not tokenize client.ref* part in body of other attribute', () => {
+
+    // arrange
+    let scope = 'meta.tag.block.any.html';
+
+    // act
+    let lineToken = tokenizeLine('<div data-reference-id="client.referenceId">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 24, 42);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
 });