Merge pull request #598 from emacs-php/fix/class-indentation

Fix anonymous class indentation

Author: zonuexe

php-mode.el

@@ -688,6 +688,7 @@ but only if the setting is enabled"
                        (case-label . +)
                        (class-open . 0)
                        (comment-intro . 0)
+                       (inexpr-class . 0)
                        (inlambda . 0)
                        (inline-open . 0)
                        (namespace-open . 0)

tests/lang/class/anonymous-class.php

@@ -0,0 +1,9 @@
+<?php
+
+$class = new class () extends IteratorAggregate {
+    // ###php-mode-test### ((indent 4))
+};
+
+is_object(1, new class () extends IteratorAggregate {
+    // ###php-mode-test### ((indent 4))
+});

tests/lang/class/anonymous-class.php.faces

@@ -0,0 +1,32 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("$" . php-variable-sigil)
+ ("class" . php-variable-name)
+ (" ")
+ ("=" . php-assignment-op)
+ (" ")
+ ("new" . php-keyword)
+ (" ")
+ ("class" . php-keyword)
+ (" () ")
+ ("extends" . php-keyword)
+ (" ")
+ ("IteratorAggregate" . font-lock-type-face)
+ (" {\n    ")
+ ("// " . font-lock-comment-delimiter-face)
+ ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
+ ("};\n\n")
+ ("is_object" . php-function-call)
+ ("(1, ")
+ ("new" . php-keyword)
+ (" ")
+ ("class" . php-keyword)
+ (" () ")
+ ("extends" . php-keyword)
+ (" ")
+ ("IteratorAggregate" . font-lock-type-face)
+ (" {\n    ")
+ ("// " . font-lock-comment-delimiter-face)
+ ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
+ ("});\n"))

tests/lang/function/closure.php

@@ -0,0 +1,9 @@
+<?php
+
+is_object(static function () {
+    // ###php-mode-test### ((indent 4))
+});
+
+is_object(static function (): void {
+    // ###php-mode-test### ((indent 4))
+});

tests/lang/function/closure.php.faces

@@ -0,0 +1,23 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("\n\n")
+ ("is_object" . php-function-call)
+ ("(")
+ ("static" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" () {\n    ")
+ ("// " . font-lock-comment-delimiter-face)
+ ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
+ ("});\n\n")
+ ("is_object" . php-function-call)
+ ("(")
+ ("static" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" (): ")
+ ("void" . font-lock-type-face)
+ (" {\n    ")
+ ("// " . font-lock-comment-delimiter-face)
+ ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
+ ("});\n"))

tests/php-mode-test.el

@@ -540,7 +540,8 @@ style from Drupal."
 (ert-deftest php-mode-test-issue-227 ()
   "multi-line strings indents "
   (custom-set-variables '(php-lineup-cascaded-calls t))
-  (with-php-mode-test ("issue-227.php" :indent t :style pear)))
+  (with-php-mode-test ("issue-227.php" :indent t :style pear :magic t)))
+
 (ert-deftest php-mode-test-issue-237 ()
   "Indent chaining method for PSR2."
   (with-php-mode-test ("issue-237.php" :indent t :style psr2 :magic t)))
@@ -680,7 +681,9 @@ Meant for `php-mode-test-issue-503'."
                                     (t t))))
   (with-php-mode-test ("doc-comment/return-type.php" :faces t))
   (with-php-mode-test ("doc-comment/inheritdoc.php" :faces t))
+  (with-php-mode-test ("lang/class/anonymous-class.php" :indent t :magic t :faces t))
   (with-php-mode-test ("lang/function/calls.php" :faces t))
+  (with-php-mode-test ("lang/function/closure.php" :indent t :magic t :faces t))
   (with-php-mode-test ("lang/try-cactch/multiple.php" :faces t))
   (with-php-mode-test ("lang/types/cast.php" :faces t))
   (with-php-mode-test ("lang/types/function.php" :faces t))