fixed mulitiline extractions in jsCode #200

Author: oscarotero

src/Utils/JsFunctionsScanner.php

@@ -37,6 +37,20 @@ public function getFunctions(array $constants = [])
 
             switch ($char) {
                 case '\\':
+                    switch ($this->status()) {
+                        case 'simple-quote':
+                            if ($next !== "'") {
+                                break 2;
+                            }
+                            break;
+
+                        case 'double-quote':
+                            if ($next !== '"') {
+                                break 2;
+                            }
+                            break;
+                    }
+                    
                     $prev = $char;
                     $char = $next;
                     $pos++;
@@ -233,7 +247,46 @@ protected function upStatus()
     protected static function prepareArgument($argument)
     {
         if ($argument && ($argument[0] === '"' || $argument[0] === "'")) {
-            return substr($argument, 1, -1);
+            return static::convertString(substr($argument, 1, -1));
         }
     }
+
+    /**
+     * Decodes a string with an argument.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    protected static function convertString($value)
+    {
+        if (strpos($value, '\\') === false) {
+            return $value;
+        }
+
+        return preg_replace_callback(
+            '/\\\(n|r|t|v|e|f|"|\\\)/',
+            function ($match) {
+                switch ($match[1][0]) {
+                    case 'n':
+                        return "\n";
+                    case 'r':
+                        return "\r";
+                    case 't':
+                        return "\t";
+                    case 'v':
+                        return "\v";
+                    case 'e':
+                        return "\e";
+                    case 'f':
+                        return "\f";
+                    case '"':
+                        return '"';
+                    case '\\':
+                        return '\\';
+                }
+            },
+            $value
+        );
+    }
 }

tests/AssetsTest.php

@@ -239,7 +239,6 @@ public function testJs2Code()
         $this->assertCount($countTranslations, $translations);
         $this->assertCount($countHeaders, $translations->getHeaders());
         $this->assertEquals(0, $translations->countTranslated());
-
         $this->assertContent($translations, 'jscode2/Po');
         $this->assertContent($translations, 'jscode2/Mo');
         $this->assertContent($translations, 'jscode2/PhpArray');

tests/assets/jscode2/Csv.csv

@@ -8,6 +8,7 @@ Project-Id-Version:
 Report-Msgid-Bugs-To: 
 "
 ,"some message",
-"some context","some message in a context",
+"some context","some ""message"" in 
+a context",
 ,"%s message",
 ,"my translate 3",

tests/assets/jscode2/CsvDictionary.csv

@@ -1,4 +1,5 @@
 "some message",
-"some message in a context",
+"some ""message"" in 
+a context",
 "%s message",
 "my translate 3",

tests/assets/jscode2/Jed.json

@@ -8,7 +8,7 @@
         "some message": [
             ""
         ],
-        "some context\\u0004some message in a context": [
+        "some context\\u0004some \"message\" in \na context": [
             ""
         ],
         "%s message": [

tests/assets/jscode2/Json.json

@@ -17,7 +17,7 @@
             ]
         },
         "some context": {
-            "some message in a context": [
+            "some \"message\" in \na context": [
                 ""
             ]
         }

tests/assets/jscode2/JsonDictionary.json

@@ -1,6 +1,6 @@
 {
     "some message": "",
-    "some message in a context": "",
+    "some \"message\" in \na context": "",
     "%s message": "",
     "my translate 3": ""
 }

tests/assets/jscode2/PhpArray.php

@@ -32,7 +32,8 @@
     ),
     'some context' => 
     array (
-      'some message in a context' => 
+      'some "message" in 
+a context' => 
       array (
         0 => '',
       ),

tests/assets/jscode2/Po.po

@@ -15,7 +15,9 @@ msgstr ""
 
 #: ./tests/assets/jscode2/input.js:2
 msgctxt "some context"
-msgid "some message in a context"
+msgid ""
+"some \"message\" in \n"
+"a context"
 msgstr ""
 
 #: ./tests/assets/jscode2/input.js:3

tests/assets/jscode2/Xliff.xlf

@@ -21,13 +21,14 @@
         <target></target>
       </segment>
     </unit>
-    <unit id="79662f3fd7a86c2d14a8a9a707609a21">
+    <unit id="c3283d194287d65de0f6978057ce535a">
       <notes>
         <note category="context">some context</note>
         <note category="reference">./tests/assets/jscode2/input.js:2</note>
       </notes>
       <segment>
-        <source>some message in a context</source>
+        <source>some "message" in 
+a context</source>
         <target></target>
       </segment>
     </unit>