fix - kokororin/vscode-phpfmt#195

Author: driade

fmt.stub.php

@@ -9113,7 +9113,10 @@ public function format($source)
                             }
                         } else
                         if ($this->rightUsefulTokenIs(T_VARIABLE) && $this->rightTokenIs([T_COMMENT, T_DOC_COMMENT])) {
-                            $this->appendCode(ST_SEMI_COLON);
+                            // Don't add semicolon after control structure parentheses
+                            if (! in_array($lastParen, [T_IF, T_WHILE, T_FOR, T_FOREACH, T_ELSEIF, T_SWITCH])) {
+                                $this->appendCode(ST_SEMI_COLON);
+                            }
                         }
                         break;
 

tests/Original/539-if-comment-autosemicolon.in

@@ -0,0 +1,8 @@
+<?php
+//passes:AutoSemicolon
+// Issue 195: semicolon incorrectly added after if with inline comment
+if ($i) // comment
+    $i = 0;
+
+if ($x) /* block comment */
+    $x = 1;

tests/Original/539-if-comment-autosemicolon.out

@@ -0,0 +1,12 @@
+<?php
+//passes:AutoSemicolon
+// Issue 195: semicolon incorrectly added after if with inline comment
+if ($i) // comment
+{
+	$i = 0;
+}
+
+if ($x) /* block comment */
+{
+	$x = 1;
+}

tests/Original/539-if-comment-no-braces.in

@@ -0,0 +1,20 @@
+<?php
+// Issue 195: semicolon incorrectly added after if with inline comment
+if ($i) // comment
+    $i = 0;
+
+if ($x) /* block comment */
+    $x = 1;
+
+if ($a) // comment 1
+    if ($b) // comment 2
+        $b = 2;
+
+while ($w) // comment
+    $w = false;
+
+for ($f = 0; $f < 10; $f++) // comment
+    $f = $f;
+
+foreach ($arr as $item) // comment
+    $item = $item;

tests/Original/539-if-comment-no-braces.out

@@ -0,0 +1,34 @@
+<?php
+// Issue 195: semicolon incorrectly added after if with inline comment
+if ($i) // comment
+{
+	$i = 0;
+}
+
+if ($x) /* block comment */
+{
+	$x = 1;
+}
+
+if ($a) // comment 1
+{
+	if ($b) // comment 2
+	{
+		$b = 2;
+	}
+}
+
+while ($w) // comment
+{
+	$w = false;
+}
+
+for ($f = 0; $f < 10; $f++) // comment
+{
+	$f = $f;
+}
+
+foreach ($arr as $item) // comment
+{
+	$item = $item;
+}