Fix Handlebar lexer to parse multiple keys per line

Fix i18next#100
brickpop · May 31, 2018 · 7cc4fb8 · 7cc4fb8
1 parent 0dcb40d
commit 7cc4fb8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dist/lexers/handlebars-lexer.js b/dist/lexers/handlebars-lexer.js
@@ -61,7 +61,7 @@ HandlebarsLexer = function (_BaseLexer) {_inherits(HandlebarsLexer, _BaseLexer);
 
     {
       var functionPattern = this.functionPattern();
-      var curlyPattern = '(?:{{)' + functionPattern + '\\s+(.*)(?:}})';
+      var curlyPattern = '(?:{{)' + functionPattern + '\\s+(.*?)(?:}})';
       var parenthesisPattern = '(?:\\()' + functionPattern + '\\s+(.*)(?:\\))';
       var pattern = curlyPattern + '|' + parenthesisPattern;
       this.functionRegex = new RegExp(pattern, 'gi');

diff --git a/src/lexers/handlebars-lexer.js b/src/lexers/handlebars-lexer.js
@@ -61,7 +61,7 @@ export default class HandlebarsLexer extends BaseLexer {
 
   createFunctionRegex() {
     const functionPattern = this.functionPattern()
-    const curlyPattern = '(?:{{)' + functionPattern + '\\s+(.*)(?:}})'
+    const curlyPattern = '(?:{{)' + functionPattern + '\\s+(.*?)(?:}})'
     const parenthesisPattern = '(?:\\()' + functionPattern + '\\s+(.*)(?:\\))'
     const pattern = curlyPattern + '|' + parenthesisPattern
     this.functionRegex = new RegExp(pattern, 'gi')

diff --git a/test/lexers/handlebars-lexer.test.js b/test/lexers/handlebars-lexer.test.js
@@ -9,6 +9,13 @@ describe('HandlebarsLexer', () => {
     done()
   })
 
+  it('extracts multiple keys on a single line', (done) => {
+    const Lexer = new HandlebarsLexer()
+    const content = '<p>{{t "first"}} {{t "second"}}</p>'
+    assert.deepEqual(Lexer.extract(content), [{ key: 'first' }, { key: 'second' }])
+    done()
+  })
+
   it('extracts the second argument as defaultValue', (done) => {
     const Lexer = new HandlebarsLexer()
     const content = '<p>{{t "first" "bla"}}</p>'

diff --git a/test/templating/handlebars.hbs b/test/templating/handlebars.hbs
@@ -1,6 +1,5 @@
 <div class="foobar">
-  <p>{{t "first"}}</p>
-  <p>{{t "second" "defaultValue" option="foo" context="male"}}</p>
+  <p>{{t "first"}} {{t "second" "defaultValue" option="foo" context="male"}}</p>
   <p>{{t "third" defaultValue="defaultValue" context="female"}}</p>
   <p>{{t "fourth" context="male" bla='asd' defaultValue="defaultValue"}}</p>
   <p>{{t