Merge pull request #50 from emacs-php/fix/functions-indentation

Fix functions indentation

Author: zonuexe

php-ts-mode.el

@@ -73,7 +73,8 @@
        ((parent-is "program") column-0 0)
        ((parent-is "comment") parent-bol 1)
        ((parent-is "declaration_list") parent-bol ,offset)
-       ((parent-is "function_definition") parent-bol ,offset)
+       ;; "compound_statement" contains the body of many statements.
+       ;; For example function_definition, foreach_statement, etc.
        ((parent-is "compound_statement") parent-bol ,offset)
        ((parent-is "array_creation_expression") parent-bol ,offset)
        ((parent-is "base_clause") parent-bol ,offset)
@@ -85,8 +86,7 @@
        ((parent-is "switch_block") parent-bol ,offset)
        ((parent-is "case_statement") parent-bol ,offset)
        ((parent-is "assignment_expression") parent-bol ,offset)
-       ((parent-is "return_statement") parent-bol ,offset)
-       )))
+       ((parent-is "return_statement") parent-bol ,offset))))
   "Tree-sitter indent rules.")
 
 (defvar php-ts-mode--keywords

tests/php-ts-mode-resources/indent.erts

@@ -64,3 +64,30 @@ function ns_func(): void {
     return;
 }
 =-=-=
+
+Name: Function with an attribute
+
+=-=
+<?php
+
+namespace Ns;
+
+#[Attribute]
+function with_an_attr(): void {
+    return;
+}
+=-=-=
+
+Name: Function with two attributes
+
+=-=
+<?php
+
+namespace Ns;
+
+#[Attribute]
+#[Attribute]
+function with_two_attrs(): void {
+    return;
+}
+=-=-=