closes riot/riot#2167

Author: GianlucaGuarini

lib/brackets.js

@@ -20,7 +20,7 @@ var R_MLCOMMS = /\/\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//g
  * @const {RegExp}
  * @static
  */
-var R_STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'/g
+var R_STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'|`[^`\\]*(?:\\[\S\s][^`\\]*)*`/g
 
 /**
  * The {@link module:brackets.R_STRINGS|R_STRINGS} source combined with sources of

lib/compiler.js

@@ -337,7 +337,7 @@ function compileHTML (html, opts, pcex) {
  * 2016-01-18: rewritten to capture only the method name (performant)
  * @const {RegExp}
  */
-var JS_ES6SIGN = /^[ \t]*(((?:async)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
+var JS_ES6SIGN = /^[ \t]*(((?:async|\*)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
 
 /**
  * Regex for remotion of multiline and single-line JavaScript comments, merged with

src/core.js

@@ -368,7 +368,7 @@ function compileHTML (html, opts, pcex) {
  * 2016-01-18: rewritten to capture only the method name (performant)
  * @const {RegExp}
  */
-var JS_ES6SIGN = /^[ \t]*(((?:async)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
+var JS_ES6SIGN = /^[ \t]*(((?:async|\*)\s*)?([$_A-Za-z][$\w]*))\s*\([^()]*\)\s*{/m
 
 /**
  * Regex for remotion of multiline and single-line JavaScript comments, merged with

test/specs/expect/es6-async.js

@@ -6,4 +6,7 @@ riot.tag2('async', '<h1>async test</h1>', '', '', function(opts) {
       await new Promise((resolve) =>{setTimeout(resolve,2000)});
       console.log("done");
     }.bind(this)
+    this.bar =*  function(){
+      yield baz
+    }.bind(this)
 });

test/specs/expect/es6-template-strings.js

@@ -0,0 +1,11 @@
+riot.tag2('es6-template-strings', '<h1>{message}</h1>', '', '', function(opts) {
+    this.message = `http://www.riotjs.com/guide`
+
+    this.text = `
+      The message is:
+      ${ message }
+
+      ${ [1,2,3].map(function(n) { return n }) }
+      ${ [1,2,3].map(n => n) }
+`
+});

test/specs/fixtures/es6-async.tag

@@ -10,5 +10,9 @@
       await new Promise((resolve) => {setTimeout(resolve,2000)});
       console.log("done");
     }
+
+    * bar() {
+      yield baz
+    }
   </script>
 </async>

test/specs/fixtures/es6-template-strings.tag

@@ -0,0 +1,16 @@
+<es6-template-strings>
+  <h1>{ message }</h1>
+
+  <script>
+    this.message = `http://www.riotjs.com/guide`
+
+    this.text = `
+      The message is:
+      ${ message }
+
+
+      ${ [1,2,3].map(function(n) { return n }) }
+      ${ [1,2,3].map(n => n) }
+`
+  </script>
+</es6-template-strings>

test/specs/tag.js

@@ -79,6 +79,10 @@ describe('Compile tags', function () {
     testFile('es6-import')
   })
 
+  it('Es6 template strings can be properly parsed', function () {
+    testFile('es6-template-strings')
+  })
+
   it('Support short cut async functions', function () {
     testFile('es6-async')
   })