Merge pull request #214 from f22217/master

Add support for Javascript template literals

Author: oscarotero

src/Utils/JsFunctionsScanner.php

@@ -49,6 +49,12 @@ public function getFunctions(array $constants = [])
                                 break 2;
                             }
                             break;
+
+                        case 'back-tick':
+                            if ($next !== '`') {
+                                break 2;
+                            }
+                            break;
                     }
 
                     $prev = $char;
@@ -69,6 +75,7 @@ public function getFunctions(array $constants = [])
                     switch ($this->status()) {
                         case 'simple-quote':
                         case 'double-quote':
+                        case 'back-tick':
                         case 'line-comment':
                             break;
 
@@ -97,6 +104,7 @@ public function getFunctions(array $constants = [])
                         case 'line-comment':
                         case 'block-comment':
                         case 'double-quote':
+                        case 'back-tick':
                             break;
 
                         default:
@@ -114,6 +122,7 @@ public function getFunctions(array $constants = [])
                         case 'line-comment':
                         case 'block-comment':
                         case 'simple-quote':
+                        case 'back-tick':
                             break;
 
                         default:
@@ -122,13 +131,31 @@ public function getFunctions(array $constants = [])
                     }
                     break;
 
+                case '`':
+                    switch ($this->status()) {
+                        case 'back-tick':
+                            $this->upStatus();
+                            break;
+
+                        case 'line-comment':
+                        case 'block-comment':
+                        case 'simple-quote':
+                        case 'double-quote':
+                            break;
+
+                        default:
+                            $this->downStatus('back-tick');
+                            break;
+                    }
+                    break;
+
                 case '(':
                     switch ($this->status()) {
                         case 'simple-quote':
                         case 'double-quote':
+                        case 'back-tick':
                         case 'line-comment':
                         case 'block-comment':
-                        case 'line-comment':
                             break;
 
                         default:
@@ -176,6 +203,7 @@ public function getFunctions(array $constants = [])
                     switch ($this->status()) {
                         case 'double-quote':
                         case 'simple-quote':
+                        case 'back-tick':
                             break;
 
                         default:
@@ -246,7 +274,7 @@ protected function upStatus()
      */
     protected static function prepareArgument($argument)
     {
-        if ($argument && ($argument[0] === '"' || $argument[0] === "'")) {
+        if ($argument && in_array($argument[0], ['"', "'", '`'], true)) {
             return static::convertString(substr($argument, 1, -1));
         }
     }

tests/AssetsTest.php

@@ -422,7 +422,7 @@ public function testVueJs()
     {
         $translations = static::get('vuejs/input', 'VueJs');
 
-        $countTranslations = 32;
+        $countTranslations = 34;
         $countTranslated = 0;
         $countHeaders = 8;
 
@@ -501,4 +501,4 @@ public function testPhpCode4()
         $this->runTestFormat('phpcode4/YamlDictionary', $countTranslations, $countTranslated);
     }
 
-}
+}

tests/assets/vuejs/Csv.csv

@@ -21,6 +21,7 @@ some-context,js-action,
 ,t-singular2,
 ,t-v-bind,
 context,t-action,
+,back-tick-in-tag,
 ,t-v-text,
 ,t-text,
 ,t-singular,
@@ -36,6 +37,7 @@ context,t-action,
 ,t-spaces-expr2,
 ,t-p1(parentheses),
 context2,t-action2,
+,back-tick-in-mustache,
 ,t-tag-2,
 ,v-translate-attribute,
 ,v-translate-attribute-single,

tests/assets/vuejs/CsvDictionary.csv

@@ -12,6 +12,7 @@ multi-occurrence,
 t-singular2,
 t-v-bind,
 t-action,
+back-tick-in-tag,
 t-v-text,
 t-text,
 t-singular,
@@ -27,6 +28,7 @@ t-spaces-expr,
 t-spaces-expr2,
 t-p1(parentheses),
 t-action2,
+back-tick-in-mustache,
 t-tag-2,
 v-translate-attribute,
 v-translate-attribute-single,

tests/assets/vuejs/Jed.json

@@ -47,6 +47,9 @@
         "context\\u0004t-action": [
             ""
         ],
+        "back-tick-in-tag": [
+            ""
+        ],
         "t-v-text": [
             ""
         ],
@@ -92,6 +95,9 @@
         "context2\\u0004t-action2": [
             ""
         ],
+        "back-tick-in-mustache": [
+            ""
+        ],
         "t-tag-2": [
             ""
         ],

tests/assets/vuejs/Json

@@ -42,6 +42,9 @@
             "t-v-bind": [
                 ""
             ],
+            "back-tick-in-tag": [
+                ""
+            ],
             "t-v-text": [
                 ""
             ],
@@ -84,6 +87,9 @@
             "t-p1(parentheses)": [
                 ""
             ],
+            "back-tick-in-mustache": [
+                ""
+            ],
             "t-tag-2": [
                 ""
             ],

tests/assets/vuejs/Json.json

@@ -13,6 +13,7 @@
     "t-singular2": "",
     "t-v-bind": "",
     "t-action": "",
+    "back-tick-in-tag": "",
     "t-v-text": "",
     "t-text": "",
     "t-singular": "",
@@ -28,6 +29,7 @@
     "t-spaces-expr2": "",
     "t-p1(parentheses)": "",
     "t-action2": "",
+    "back-tick-in-mustache": "",
     "t-tag-2": "",
     "v-translate-attribute": "",
     "v-translate-attribute-single": ""

tests/assets/vuejs/JsonDictionary.json

@@ -65,6 +65,10 @@
       array (
         0 => '',
       ),
+      'back-tick-in-tag' => 
+      array (
+        0 => '',
+      ),
       't-v-text' => 
       array (
         0 => '',
@@ -121,6 +125,10 @@
       array (
         0 => '',
       ),
+      'back-tick-in-mustache' => 
+      array (
+        0 => '',
+      ),
       't-tag-2' => 
       array (
         0 => '',

tests/assets/vuejs/PhpArray.php

@@ -9,34 +9,34 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 
-#: ./tests/assets/vuejs/input.vue:51
+#: ./tests/assets/vuejs/input.vue:55
 msgid "js-expr1"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:51
+#: ./tests/assets/vuejs/input.vue:55
 msgid "js-expr2"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:53
+#: ./tests/assets/vuejs/input.vue:57
 msgid "js-alert"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:56
+#: ./tests/assets/vuejs/input.vue:60
 msgid "js-single"
 msgid_plural "js-plural"
 msgstr[0] ""
 
-#: ./tests/assets/vuejs/input.vue:60
+#: ./tests/assets/vuejs/input.vue:64
 msgid "js-obj-single"
 msgid_plural "js-obj-plural"
 msgstr[0] ""
 
-#: ./tests/assets/vuejs/input.vue:63
+#: ./tests/assets/vuejs/input.vue:67
 msgctxt "some-context"
 msgid "js-action"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:65
+#: ./tests/assets/vuejs/input.vue:69
 msgid "<span>js-return</span><br>"
 msgstr ""
 
@@ -73,7 +73,11 @@ msgctxt "context"
 msgid "t-action"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:43
+#: ./tests/assets/vuejs/input.vue:37
+msgid "back-tick-in-tag"
+msgstr ""
+
+#: ./tests/assets/vuejs/input.vue:47
 msgid "t-v-text"
 msgstr ""
 
@@ -136,15 +140,19 @@ msgctxt "context2"
 msgid "t-action2"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:37
+#: ./tests/assets/vuejs/input.vue:38
+msgid "back-tick-in-mustache"
+msgstr ""
+
+#: ./tests/assets/vuejs/input.vue:41
 msgid "t-tag-2"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:39
+#: ./tests/assets/vuejs/input.vue:43
 msgid "v-translate-attribute"
 msgstr ""
 
-#: ./tests/assets/vuejs/input.vue:41
+#: ./tests/assets/vuejs/input.vue:45
 msgid "v-translate-attribute-single"
 msgid_plural "v-translate-attribute-plural"
 msgstr[0] ""