From cc724df7825a0e052896f12ace78cf89ce5b04c0 Mon Sep 17 00:00:00 2001
From: Erik Lieben <erik@codetistic.com>
Date: Fri, 29 Dec 2017 11:59:48 +0100
Subject: [PATCH]  feat(syntax-highlight): highlight from-view / to-view,
 resolves #61 (#62)

* feat(syntax-highlight): highlight from-view / to-view, resolves #61
---
 syntaxes/html.json                   |  14 +-
 test/syntax.html/databinding.test.ts | 572 ++++++++++++++++-----------
 2 files changed, 349 insertions(+), 237 deletions(-)

diff --git a/syntaxes/html.json b/syntaxes/html.json
index 1bd9fdd7..b5a88b95 100644
--- a/syntaxes/html.json
+++ b/syntaxes/html.json
@@ -240,7 +240,7 @@
       ]
     },
     "tag-aurelia-attribute-with-databinding-attribute": {
-      "match": "(?<![\"'-])([a-zA-Z0-9:-]+)(?<!controller|bindable|view-model|show|if|naive-if|route-href)(\\.)(bind|one-way|two-way|one-time)(?![\"'-;])",
+      "match": "(?<![\"'-])([a-zA-Z0-9:-]+)(?<!controller|bindable|view-model|show|if|naive-if|route-href)(\\.)(bind|one-way|two-way|one-time|from-view|to-view)(?![\"'-;])",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.html"
@@ -296,7 +296,7 @@
       }
     },
     "tag-aurelia-view-model-attribute": {
-      "match": "(?<=[^\"-])(view-model)(?![-])(\\.)?((bind|one-way|two-way|one-time)|(ref))?",
+      "match": "(?<=[^\"-])(view-model)(?![-])(\\.)?((bind|one-way|two-way|one-time|from-view|to-view)|(ref))?",
       "captures": {
         "1": {
           "name": "view-model.attribute.html.au"
@@ -313,7 +313,7 @@
       }
     },
     "tag-aurelia-matcher-attribute": {
-      "match": "(?<=[^\"-])(matcher)(?![-])(\\.)(bind|one-way|two-way|one-time)",
+      "match": "(?<=[^\"-])(matcher)(?![-])(\\.)(bind|one-way|two-way|one-time|from-view|to-view)",
       "captures": {
         "1": {
           "name": "matcher.attribute.html.au"
@@ -327,7 +327,7 @@
       }
     },
     "tag-aurelia-model-attribute": {
-      "match": "(?=\\s)[^=-]((model)(\\.)?((bind|one-time|one-way|two-way)|(ref))?)",
+      "match": "(?=\\s)[^=-]((model)(\\.)?((bind|one-time|one-way|two-way|from-view|to-view)|(ref))?)",
       "captures": {
         "2": {
           "name": "model.attribute.html.au"
@@ -407,7 +407,7 @@
       }
     },
     "tag-aurelia-if-attribute": {
-      "match": "(?<=[^\"-])(if|naive-if)(?![-])(\\.)?(bind|one-way|two-way|one-time)?",
+      "match": "(?<=[^\"-])(if|naive-if)(?![-])(\\.)?(bind|one-way|two-way|one-time|from-view|to-view)?",
       "captures": {
         "1": {
           "name": "if.attribute.html.au"
@@ -421,7 +421,7 @@
       }
     },
     "tag-aurelia-route-href-attribute": {
-      "match": "(?<=[^\"-])(route-href)(?![-])(\\.)?(bind|one-way|two-way|one-time)?",
+      "match": "(?<=[^\"-])(route-href)(?![-])(\\.)?(bind|one-way|two-way|one-time|from-view|to-view)?",
       "captures": {
         "1": {
           "name": "route-href.attribute.html.au"
@@ -435,7 +435,7 @@
       }
     },
     "tag-aurelia-show-attribute": {
-      "match": "(?<=[^\"-])(show)(?![-])(\\.)?(bind|one-way|two-way|one-time)?",
+      "match": "(?<=[^\"-])(show)(?![-])(\\.)?(bind|one-way|two-way|one-time|from-view|to-view)?",
       "captures": {
         "1": {
           "name": "show.attribute.html.au"
diff --git a/test/syntax.html/databinding.test.ts b/test/syntax.html/databinding.test.ts
index efa05cfb..5992b2a8 100644
--- a/test/syntax.html/databinding.test.ts
+++ b/test/syntax.html/databinding.test.ts
@@ -1,230 +1,342 @@
-import { assert } from 'chai';
-import { getTokenOnCharRange, hasScope, tokenizeLine } from './test.utils';
-
-describe('The Aurelia HTML syntax databinding attributes', () => {
-
-  it(`must tokenize (some).bind="foo" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div some.bind="foo">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 10, 14);
-    assert.isOk(hasScope(token.scopes, scope));
-
-  });
-
-  it(`must tokenize (some).one-way="foo" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div some.one-way="foo">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 10, 17);
-    assert.isOk(hasScope(token.scopes, scope));
-
-  });
-
-  it(`must tokenize (some).two-way="foo" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div some.two-way="foo">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 10, 17);
-    assert.isOk(hasScope(token.scopes, scope));
-
-  });
-
-  it(`must tokenize (some).one-time="foo" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div some.one-time="foo">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 10, 18);
-    assert.isOk(hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(bind)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.bind">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 14);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x; x.(bind)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x; x.bind">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 17);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(bind)='x'; x" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.bind=\'x\'; x">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 21);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(one-way)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.one-way">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 17);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x; x.(one-way)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x; x.one-way">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 20);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(one-way)='x'; x" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.one-way=\'x\'; x">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 24);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(two-way)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.two-way">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 17);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x; x.(two-way)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x; x.two-way">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 20);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(two-way)='x; x" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.two-way=\'x\'; x">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 24);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(one-time)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.one-time">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 18);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x; x.(one-time)" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x; x.one-time">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 21);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-  it(`must not tokenize a="x.(one-time)='\'x\; x" attribute with scope "databinding.attribute.html.au"`, () => {
-
-    // arrange
-    let scope = 'databinding.attribute.html.au';
-
-    // act
-    let lineToken = tokenizeLine('<div a="x.one-time=\'x\'; x">');
-
-    // assert
-    let token = getTokenOnCharRange(lineToken, 8, 25);
-    assert.isOk(!hasScope(token.scopes, scope));
-
-  });
-
-});
+import { assert } from 'chai';
+import { getTokenOnCharRange, hasScope, tokenizeLine } from './test.utils';
+
+describe('The Aurelia HTML syntax databinding attributes', () => {
+
+  it(`must tokenize (some).bind="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.bind="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 14);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must tokenize (some).one-way="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.one-way="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 17);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must tokenize (some).two-way="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.two-way="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 17);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must tokenize (some).one-time="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.one-time="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 18);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must tokenize (some).from-view="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.from-view="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 19);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must tokenize (some).to-view="foo" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div some.to-view="foo">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 10, 17);
+    assert.isOk(hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(bind)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.bind">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 14);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(bind)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.bind">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 17);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(bind)='x'; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.bind=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 21);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(one-way)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.one-way">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 17);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(one-way)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.one-way">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 20);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(one-way)='x'; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.one-way=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 24);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(two-way)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.two-way">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 17);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(two-way)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.two-way">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 20);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(two-way)='x; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.two-way=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 24);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(one-time)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.one-time">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 18);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(one-time)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.one-time">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 21);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(one-time)='\'x\; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.one-time=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 25);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(from-view)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.from-view">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 19);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(from-view)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.from-view">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 22);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(from-view)='\'x\; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.from-view=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 26);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(to-view)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.to-view">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 17);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x; x.(to-view)" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x; x.to-view">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 20);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+  it(`must not tokenize a="x.(to-view)='\'x\; x" attribute with scope "databinding.attribute.html.au"`, () => {
+
+    // arrange
+    let scope = 'databinding.attribute.html.au';
+
+    // act
+    let lineToken = tokenizeLine('<div a="x.to-view=\'x\'; x">');
+
+    // assert
+    let token = getTokenOnCharRange(lineToken, 8, 24);
+    assert.isOk(!hasScope(token.scopes, scope));
+
+  });
+
+});