fix - echo with function shouldn't have an space before parenthesis, …

…missing space before closing tag - kokororin/vscode-phpfmt#160
driade · Jan 8, 2025 · e24b9fa · e24b9fa
1 parent a462a58
commit e24b9fa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/fmt.stub.php b/fmt.stub.php
@@ -4829,6 +4829,7 @@ public function format($source) {
             $touchedUse = false;
             $touchedGroupedUse = false;
             $hasEchoAfterOpenTag = false;
+            $hasOpenTagWithEcho = false;
             $attributeStack = [];
 
             while (list($index, $token) = $this->each($this->tkns)) {
@@ -5148,7 +5149,7 @@ public function format($source) {
                     if ($this->leftMemoUsefulTokenIs(T_OPEN_TAG)) {
                         $hasEchoAfterOpenTag = false;
                     }
-                    $this->appendCode($text . $this->getSpace(!$this->rightTokenIs(ST_SEMI_COLON)));
+                    $this->appendCode($text . $this->getSpace(!$this->rightTokenIs(ST_SEMI_COLON) && !$this->rightTokenIs(ST_PARENTHESES_OPEN)));
                     break;
                 case T_RETURN:
                 case T_YIELD:
@@ -5379,13 +5380,21 @@ public function format($source) {
                     break;
 
                 case T_CLOSE_TAG:
-                    $this->appendCode($this->getSpace(!$hasEchoAfterOpenTag && !$this->hasLnBefore()));
+                    $space = $this->getSpace(!$hasEchoAfterOpenTag && !$this->hasLnBefore());
+                    if ($space === '') {
+                        if ($this->leftTokenIs([ST_SEMI_COLON]) && !$this->hasLnBefore() && !$hasOpenTagWithEcho) {
+                            $space = $this->getSpace();
+                        }
+                    }
+                    $this->appendCode($space);
                     $this->appendCode($text);
                     $hasEchoAfterOpenTag = false;
+                    $hasOpenTagWithEcho = false;
                     break;
 
                 case T_OPEN_TAG_WITH_ECHO:
                     $hasEchoAfterOpenTag = true;
+                    $hasOpenTagWithEcho = true;
                     $this->appendCode($text);
                     break;
 

diff --git a/tests/Original/087-arithmetic-spacing.out b/tests/Original/087-arithmetic-spacing.out
@@ -1,12 +1,12 @@
 <?php
 //version:5.6.0
 $x = (10 - 5 + 8);
-echo (5 % 3) . "\n"; // prints 2
-echo (5 % -3) . "\n"; // prints 2
-echo (-5 % 3) . "\n"; // prints -2
-echo (-5 % -3) . "\n"; // prints -2
+echo(5 % 3) . "\n"; // prints 2
+echo(5 % -3) . "\n"; // prints 2
+echo(-5 % 3) . "\n"; // prints -2
+echo(-5 % -3) . "\n"; // prints -2
 
-echo (10 ** 2);
+echo(10 ** 2);
 
 $b = $a - 10;
 $b = $a - $c;

diff --git a/tests/Original/332-autosemicolon-switch.out b/tests/Original/332-autosemicolon-switch.out
@@ -1,7 +1,7 @@
 <?php
 //passes:AutoSemicolon
 
-echo ($a);
+echo($a);
 
 foreach ($a as $v) {
 

diff --git a/tests/Original/493-missing-space-and_space-after-echo-function.in b/tests/Original/493-missing-space-and_space-after-echo-function.in
@@ -0,0 +1,8 @@
+//passes:ResizeSpaces
+<h1 class="wp-heading-inline"><?php echo esc_html( get_admin_page_title() ); ?></h1>
+<option selected="selected" value=""><?php esc_html_e( 'Select attribute', 'woodmart-child' );?></option>
+<option selected="selected" value=""><?php echa("hello"); ?></option>
+<option selected="selected" value=""><?php echo  "hello"  ; ?></option>
+<option selected="selected" value=""><?php echo("hello"); ?></option>
+<option selected="selected" value=""><?php printf("hello"); ?></option>
+<option selected="selected" value=""><?=fun("hello");?></option>
diff --git a/tests/Original/493-missing-space-and_space-after-echo-function.out b/tests/Original/493-missing-space-and_space-after-echo-function.out
@@ -0,0 +1,8 @@
+//passes:ResizeSpaces
+<h1 class="wp-heading-inline"><?php echo esc_html(get_admin_page_title()); ?></h1>
+<option selected="selected" value=""><?php esc_html_e('Select attribute', 'woodmart-child'); ?></option>
+<option selected="selected" value=""><?php echa("hello"); ?></option>
+<option selected="selected" value=""><?php echo "hello"; ?></option>
+<option selected="selected" value=""><?php echo("hello"); ?></option>
+<option selected="selected" value=""><?php printf("hello"); ?></option>
+<option selected="selected" value=""><?=fun("hello");?></option>
diff --git a/tests/PSR/047-short-open-tags.out b/tests/PSR/047-short-open-tags.out
@@ -1,5 +1,5 @@
 <?php
 
 //skipShortTag
-;?>
+; ?>
 <?php /*test*/;