From 31d51ea74cfba1a8b5cd891ffeb73ce8d0a1de05 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 22 Jan 2024 12:55:06 +0900
Subject: [PATCH] Fix functions indentation

---
 php-ts-mode.el                          |  6 +++---
 tests/php-ts-mode-resources/indent.erts | 27 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/php-ts-mode.el b/php-ts-mode.el
index 5e293bd..c44e82a 100644
--- a/php-ts-mode.el
+++ b/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
diff --git a/tests/php-ts-mode-resources/indent.erts b/tests/php-ts-mode-resources/indent.erts
index 0157c7e..986c2ed 100644
--- a/tests/php-ts-mode-resources/indent.erts
+++ b/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;
+}
+=-=-=