feat - improve auto semicolon - #92

Author: driade

fmt.stub.php

@@ -8304,6 +8304,8 @@ public function format($source) {
             $isAttribute = false;
             $quote_stack = false;
 
+            $max = count($this->tkns);
+
 			while (list($index, $token) = $this->each($this->tkns)) {
 				list($id, $text) = $this->getToken($token);
 				$this->ptr = $index;;
@@ -8326,9 +8328,19 @@ public function format($source) {
                     if ($this->hasLnAfter() && $this->rightTokenIs(ST_CURLY_CLOSE) && ! $isMatch) {
                         $this->appendCode(ST_SEMI_COLON);
                     }
+                    else
                     if ($this->hasLnAfter() && $this->rightTokenIs([T_COMMENT, T_DOC_COMMENT]) && ! $isMatch) {
                         $this->appendCode(ST_SEMI_COLON);
                     }
+                    else
+                    if ($this->rightUsefulTokenIs(T_VARIABLE) && $this->rightTokenIs([T_COMMENT, T_DOC_COMMENT])) {
+                        $this->appendCode(ST_SEMI_COLON);
+                    }
+                    else
+                    if ($this->ptr === $max - 2 && $this->rightTokenIs([T_COMMENT, T_DOC_COMMENT])) {
+                        $this->appendCode(ST_SEMI_COLON);
+                    }
+
                     break;
 
                 case T_ATTRIBUTE:

tests/Original/512-add-semicolons.in

@@ -0,0 +1,16 @@
+<?php
+//passes:AutoSemicolon
+
+$a = 1//
+$B = 2;
+
+$a = 1
+//
+$B = 2;
+
+$a = 1
+//
+/** other comment */
+$B = 2;
+
+$a = 1// $b=2

tests/Original/512-add-semicolons.out

@@ -0,0 +1,16 @@
+<?php
+//passes:AutoSemicolon
+
+$a = 1; //
+$B = 2;
+
+$a = 1;
+//
+$B = 2;
+
+$a = 1;
+//
+/** other comment */
+$B = 2;
+
+$a = 1; // $b=2