Fixed skipping escaped backslashes when dealing with formatting.

parpalak · Apr 5, 2024 · 3b9b1b9 · 3b9b1b9
1 parent 58127db
commit 3b9b1b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/S2/Rose/Helper/StringHelper.php b/src/S2/Rose/Helper/StringHelper.php
@@ -107,9 +107,8 @@ public static function clearInternalFormatting(string $text): string
 
     public static function fixUnbalancedInternalFormatting(string $text, array &$tagsNum): string
     {
-        preg_match_all('#\\\\([' . self::FORMATTING_SYMBOLS . '])#i', $text, $matches);
+        preg_match_all('#(?:\\\\{2})*(*SKIP)\K\\\\([' . self::FORMATTING_SYMBOLS . '])#i', $text, $matches);
 
-//        $tagsNum = [];
         foreach ($matches[1] as $match) {
             $lowerMatch           = strtolower($match);
             $tagsNum[$lowerMatch] = ($tagsNum[$lowerMatch] ?? 0) + ($match === $lowerMatch ? 1 : -1);

diff --git a/tests/unit/Rose/Helper/StringHelperTest.php b/tests/unit/Rose/Helper/StringHelperTest.php
@@ -118,6 +118,11 @@ public function unbalancedInternalFormattingDataProvider(): array
                 '\\iThis is \\bformatted text\\I with \\Bspecial characters\\i.\\I',
                 ['i' => 1, 'b' => 0],
             ],
+            [
+                'Normal text with escaped formatting symbols like \\\\draw or \\\\inline or \\\\\\\\uuu.',
+                'Normal text with escaped formatting symbols like \\\\draw or \\\\inline or \\\\\\\\uuu.',
+                [],
+            ],
             [
                 '',
                 '',
@@ -133,15 +138,25 @@ public function unbalancedInternalFormattingDataProvider(): array
                 '\\i456789\\I',
                 ['i' => -1],
             ],
+            [
+                '456789\\\\I',
+                '456789\\\\I',
+                [],
+            ],
+            [
+                '456789\\\\\\I',
+                '\\i456789\\\\\\I',
+                ['i' => -1],
+            ],
             [
                 '\\u456789',
                 '\\u456789\\U',
                 ['u' => 1],
             ],
             [
                 '\\u\\D\\\\I\\b',
-                '\\i\\d\\u\\D\\\\I\\b\\B\\U',
-                ['i' => -1, 'd' => -1, 'u' => 1, 'b' => 1],
+                '\\d\\u\\D\\\\I\\b\\B\\U',
+                ['d' => -1, 'u' => 1, 'b' => 1],
             ],
         ];
     }