fix regex to skip html tags, makes testShouldNotTouchHtmlTags() pass

martinlindhe · martinlindhe · commit 5367b69a6be8 · 2015-11-27T22:40:20.000+01:00
diff --git a/src/Generator.php b/src/Generator.php
@@ -80,7 +80,7 @@ private function adjustString($s)
         }
 
         return preg_replace_callback(
-            '/:\w*/',
+            '/(<[^>]*>(*SKIP)(*FAIL)|:\w*)/',
             function ($matches) {
                 return '{' . mb_substr($matches[0], 1) . '}';
             },
diff --git a/tests/GenerateTest.php b/tests/GenerateTest.php
@@ -119,7 +119,7 @@ function testNamed()
         $this->destroyLocaleFilesFrom($arr, $root);
     }
 
-    function testLeaveHtmlTags()
+    function testShouldNotTouchHtmlTags()
     {
         $arr = [
             'en' => [
@@ -135,7 +135,7 @@ function testLeaveHtmlTags()
             'export default {' . PHP_EOL
             . '    "en": {' . PHP_EOL
             . '        "help": {' . PHP_EOL
-            . '            "yes": "see <a href=\"mailto:mail@com\">",' . PHP_EOL
+            . '            "yes": "see <a href=\"mailto:mail@com\">"' . PHP_EOL
             . '        }' . PHP_EOL
             . '    }' . PHP_EOL
             . '}' . PHP_EOL,

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private function adjustString($s)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return preg_replace_callback(`
`83`		`- '/:\w*/',`
	`83`	`+ '/(<[^>]>(SKIP)(FAIL)\|:\w)/',`
`84`	`84`	`function ($matches) {`
`85`	`85`	`return '{' . mb_substr($matches[0], 1) . '}';`
`86`	`86`	`},`