fix - invalid semicolon added - kokororin/vscode-phpfmt#166

driade · Jan 17, 2025 · 4b27593 · 4b27593
1 parent 470d924
commit 4b27593
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/fmt.stub.php b/fmt.stub.php
@@ -8340,7 +8340,7 @@ public function format($source) {
                         break;
                     }
                     if ($this->rightTokenIs(ST_CURLY_CLOSE)) {
-                        if (count($realCurlyStack) > 0) {
+                        if (count($realCurlyStack) > 0 && ! $quote_stack) {
                             if (! in_array($realCurlyStack[count($realCurlyStack)-1], [T_MATCH])) {
                                 $this->appendCode(ST_SEMI_COLON);
                                 break;

diff --git a/tests/Original/501-remove-invalid-semicolon.in b/tests/Original/501-remove-invalid-semicolon.in
@@ -0,0 +1,9 @@
+<?php
+//passes:AutoSemicolon
+
+echo "Error moving file '{$file_name}' to folder: {$e->getMessage()}";
+echo "Error moving file '{$file_name}' to folder: '{$e->getMessage()}'";
+echo "Error moving file '{$file_name}' to folder: \"{$e->getMessage()}\"";
+echo 'Error moving file "{$file_name}" to folder: {$e->getMessage()}';
+echo 'Error moving file "{$file_name}" to folder: \'{$e->getMessage()}\'';
+echo 'Error moving file "{$file_name}" to folder: "{$e->getMessage()}"';
diff --git a/tests/Original/501-remove-invalid-semicolon.out b/tests/Original/501-remove-invalid-semicolon.out
@@ -0,0 +1,9 @@
+<?php
+//passes:AutoSemicolon
+
+echo "Error moving file '{$file_name}' to folder: {$e->getMessage()}";
+echo "Error moving file '{$file_name}' to folder: '{$e->getMessage()}'";
+echo "Error moving file '{$file_name}' to folder: \"{$e->getMessage()}\"";
+echo 'Error moving file "{$file_name}" to folder: {$e->getMessage()}';
+echo 'Error moving file "{$file_name}" to folder: \'{$e->getMessage()}\'';
+echo 'Error moving file "{$file_name}" to folder: "{$e->getMessage()}"';