Merge pull request #22 from NullVoxPopuli/fix-parser-issues

fix(grammar): this.property is now [class][punc][property]

dist/glimmer.cjs.js

@@ -101,7 +101,7 @@ function glimmer(hljs) {
     className: {
       1: "class",
       2: "punctuation",
-      3: "variable"
+      3: "property"
     },
     match: [/this/, /\./, /[^\s}]+/]
   };

index.html

@@ -14,6 +14,7 @@
   <style type="text/css">
     .hljs-punctuation { color: #a9c; }
     .hljs-attribute { color: #d38fae; }
+    .hljs-property { color: #feb39f; }
     .hljs-class { color: #88f; }
     .hljs-operator { color: #959; }
     .hljs-comment { color: #888; }

src/glimmer.js

@@ -127,7 +127,7 @@ export default function glimmer(hljs) {
     className: {
       1: 'class',
       2: 'punctuation',
-      3: 'variable',
+      3: 'property',
     },
     match: [/this/, /\./, /[^\s}]+/],
   };

tests/index.test.js

@@ -24,3 +24,17 @@ describe('Component Invocation', () => {
     );
   });
 });
+
+describe('Expressions', () => {
+  describe('Mustache', () => {
+    test('this.property', () => {
+      let result = parse('{{this.property}}');
+
+      expect(result).toEqual(
+        stripIndent`
+          <span class="hljs-punctuation mustache">{{<span class="hljs-class">this</span><span class="hljs-punctuation">.</span><span class="hljs-property">property</span>}}</span>
+        `
+      );
+    });
+  });
+});