From e1f8a8a6f8993c38ed163be12219e09830bb0d7e Mon Sep 17 00:00:00 2001
From: Daniel Woznicki <danwoz@nettoolkit.com>
Date: Sat, 2 Apr 2022 10:49:09 -0700
Subject: Fixed incorrect Java indentation for method chaining

---
 queries/java/indents.scm               | 3 ++-
 tests/indent/java/method_chaining.java | 6 ++++++
 tests/indent/java_spec.lua             | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/java/method_chaining.java

diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 55b955701..8e5375486 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -11,6 +11,8 @@
   (formal_parameters)
 ] @indent
 
+(expression_statement (method_invocation) @indent)
+
 [
   "("
   ")"
@@ -22,7 +24,6 @@
 
 [
   "}"
-  ")"
 ] @indent_end
 
 (line_comment) @ignore
diff --git a/tests/indent/java/method_chaining.java b/tests/indent/java/method_chaining.java
new file mode 100644
index 000000000..3245f4618
--- /dev/null
+++ b/tests/indent/java/method_chaining.java
@@ -0,0 +1,6 @@
+public class Foo {
+  void foo() {
+    new StringBuilder()
+      .append("a")
+  }
+}
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index 163020ffa..594aae3b5 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -30,5 +30,6 @@ describe("indent Java:", function()
       XFAIL
     )
     run:new_line("issue_2583.java", { on_line = 4, text = "int x = 1;", indent = 4 })
+    run:new_line("method_chaining.java", { on_line = 4, text = ".append(\"b\");", indent = 6 })
   end)
 end)
-- 
cgit v1.2.3-70-g09d2