Fix: Determine previous non-whitespace character by trimming what has…

… been printed so far
ergebnis · Jan 5, 2018 · a1b697c · a1b697c
1 parent 2268811
commit a1b697c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Printer.php b/src/Printer.php
@@ -131,9 +131,11 @@ public function print(string $original, bool $unEscapeUnicode, bool $unEscapeSla
              */
             if ('}' === $character || ']' === $character) {
                 --$indentLevel;
-                $previousCharacter = \substr($original, $i - 1, 1);
 
-                if ('{' !== $previousCharacter && '[' !== $previousCharacter) {
+                $trimmed = \rtrim($printed);
+                $previousNonWhitespaceCharacter = \substr($trimmed, -1);
+
+                if ('{' !== $previousNonWhitespaceCharacter && '[' !== $previousNonWhitespaceCharacter) {
                     $printed .= PHP_EOL;
 
                     for ($j = 0; $j < $indentLevel; ++$j) {
@@ -143,7 +145,7 @@ public function print(string $original, bool $unEscapeUnicode, bool $unEscapeSla
                     /**
                      * Collapse empty {} and [].
                      */
-                    $printed = \rtrim($printed);
+                    $printed = $trimmed;
                 }
             }