fix - improve invalid indentation in enums - kokororin/vscode-phpfmt#137

Author: driade

fmt.stub.php

@@ -3915,6 +3915,7 @@ public function format($source) {
 
 			$foundStack = [];
             $stack = [];
+            $is_enum = false;
 
 			while (list($index, $token) = $this->each($this->tkns)) {
 				list($id, $text) = $this->getToken($token);
@@ -3934,6 +3935,7 @@ public function format($source) {
 						$this->setIndent(+1);
 					}
 				}
+
 				switch ($id) {
 				case ST_QUOTE:
 					$this->appendCode($text);
@@ -3957,11 +3959,18 @@ public function format($source) {
 					$this->appendCode($text);
 					break;
 
+                case T_CURLY_OPEN:
+                case ST_CURLY_OPEN:
+                    if ($is_enum) {
+                        $stack[] = $is_enum;
+                        $is_enum = false;
+                    } else {
+                        $stack[] = $id;
+                    }
 				case T_DOLLAR_OPEN_CURLY_BRACES:
-				case T_CURLY_OPEN:
-				case ST_CURLY_OPEN:
 				case ST_PARENTHESES_OPEN:
 				case ST_BRACKET_OPEN:
+                    
 					$indentToken = [
 						'id' => $id,
 						'implicit' => true,
@@ -3976,7 +3985,7 @@ public function format($source) {
 
                 case T_ENUM:
                     $this->appendCode($text);
-                    $stack[] = $id;
+                    $is_enum = $id;
                     break;
 
 				case ST_CURLY_CLOSE:
@@ -4006,9 +4015,9 @@ public function format($source) {
 				case T_COMMENT:
 				case T_WHITESPACE:
 
-                    $is_enum = false;
+                    $is_enum2 = false;
                     if (count($stack) && $stack[count($stack) - 1] === T_ENUM) {
-                        $is_enum = true;
+                        $is_enum2 = true;
                     }
 
 					if (
@@ -4017,7 +4026,7 @@ public function format($source) {
                         (
                             $this->rightUsefulTokenIs([T_DEFAULT])
                             ||
-    						($this->rightUsefulTokenIs([T_CASE]) && ! $is_enum)
+    						($this->rightUsefulTokenIs([T_CASE]) && ! $is_enum2)
                         ) 
 					) {
 						$this->setIndent(-1);

tests/Original/471-invalid-indentation.in

@@ -21,4 +21,35 @@ enum ExampleEnum2:string {
     case Bar = 'b';
     // Note.
     case Qux = 'c';
+}
+enum Suit implements Colorful
+{
+    // Fulfills the interface contract.
+    case Hearts;
+    /**
+     * Note.
+     */
+    case Diamonds;
+
+    // Fulfills the interface contract.
+    public function color(): string
+    {
+        return match($this) {
+            Suit::Hearts, Suit::Diamonds => 'Red',
+            Suit::Clubs, Suit::Spades => 'Black',
+        };
+    }
+
+    // Not part of an interface; that's fine.
+    public function shape(): string
+    {
+        return "Rectangle";
+    }
+
+    # Note.
+    case Clubs;
+    /**
+     * a
+     * */
+    case Spades;
 }

tests/Original/471-invalid-indentation.out

@@ -21,4 +21,32 @@ enum ExampleEnum2: string {
 	case Bar = 'b';
 	// Note.
 	case Qux = 'c';
+}
+enum Suit implements Colorful {
+	// Fulfills the interface contract.
+	case Hearts;
+	/**
+	 * Note.
+	 */
+	case Diamonds;
+
+	// Fulfills the interface contract.
+	public function color(): string {
+		return match ($this) {
+			Suit::Hearts, Suit::Diamonds => 'Red',
+			Suit::Clubs, Suit::Spades => 'Black',
+		};
+	}
+
+	// Not part of an interface; that's fine.
+	public function shape(): string {
+		return "Rectangle";
+	}
+
+	# Note.
+	case Clubs;
+	/**
+	 * a
+	 * */
+	case Spades;
 }