From 1965b909e17aae498f27ab95a236c25e4dd61bc2 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Thu, 17 Dec 2020 20:07:44 +0800
Subject: [PATCH] Rust dedent after .await

---
 rc/filetype/rust.kak              | 4 ++--
 test/indent/rust/dedent-async/cmd | 1 +
 test/indent/rust/dedent-async/in  | 5 +++++
 test/indent/rust/dedent-async/out | 7 +++++++
 test/indent/rust/dedent-async/rc  | 3 +++
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 test/indent/rust/dedent-async/cmd
 create mode 100644 test/indent/rust/dedent-async/in
 create mode 100644 test/indent/rust/dedent-async/out
 create mode 100644 test/indent/rust/dedent-async/rc

diff --git a/rc/filetype/rust.kak b/rc/filetype/rust.kak
index cb97aaa7..d4016fd4 100644
--- a/rc/filetype/rust.kak
+++ b/rc/filetype/rust.kak
@@ -157,8 +157,8 @@ define-command -hidden rust-indent-on-new-line %~
             try %< execute-keys -draft k <a-x> s [^\h].+ <ret> <a-K> \A[-+*/&|^})<gt><lt>#] <ret> <a-K> [,<semicolon>{](\h*/[/*].*|)$ <ret> j <a-gt> >
             # indent after lines ending with {
             try %< execute-keys -draft k <a-x> <a-k> \{$ <ret> j <a-gt> >
-            # dedent after lines starting with . and ending with } or ) or , or ;
-            try %_ execute-keys -draft k <a-x> <a-k> ^\h*\..*[}),<semicolon>]\h*$ <ret> j <a-lt> _
+            # dedent after lines starting with . and ending with } or ) or , or ; or .await
+            try %_ execute-keys -draft k <a-x> <a-k> ^\h*\. <ret> <a-k>([}),<semicolon>]|\.await)\h*$ <ret> j <a-lt> _
             # align to opening curly brace or paren when newline is inserted before a single closing
             try %< execute-keys -draft <a-h> <a-k> ^\h*[)}] <ret> h m <a-S> 1<a-&> >
             # todo dedent additional unmatched parenthesis
diff --git a/test/indent/rust/dedent-async/cmd b/test/indent/rust/dedent-async/cmd
new file mode 100644
index 00000000..8682d51e
--- /dev/null
+++ b/test/indent/rust/dedent-async/cmd
@@ -0,0 +1 @@
+c<ret>bar<esc>
diff --git a/test/indent/rust/dedent-async/in b/test/indent/rust/dedent-async/in
new file mode 100644
index 00000000..19fba70f
--- /dev/null
+++ b/test/indent/rust/dedent-async/in
@@ -0,0 +1,5 @@
+    foo()
+        .await%( )
+
+    foo().await%( )
+
diff --git a/test/indent/rust/dedent-async/out b/test/indent/rust/dedent-async/out
new file mode 100644
index 00000000..3ed467d8
--- /dev/null
+++ b/test/indent/rust/dedent-async/out
@@ -0,0 +1,7 @@
+    foo()
+        .await
+        bar
+
+    foo().await
+        bar
+
diff --git a/test/indent/rust/dedent-async/rc b/test/indent/rust/dedent-async/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/dedent-async/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust