From e237bf6f1584eab02d3f1b4ecf57963e4364bbf7 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Fri, 28 Sep 2018 12:28:21 +0100
Subject: [PATCH] Better Lisp and Clojure indent

Algol-like indenting doesn't work for Lisp as we tend to open (and
close) many forms on one line.  This generally puts the cursor
where it should be, though it is probably confused by strings
with brackets and things.
---
 rc/base/clojure.kak | 27 ++++++++++++++++++++++++++-
 rc/base/lisp.kak    | 24 +++++++++++++++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/rc/base/clojure.kak b/rc/base/clojure.kak
index 8d448a57..19c31bc9 100644
--- a/rc/base/clojure.kak
+++ b/rc/base/clojure.kak
@@ -158,7 +158,32 @@ evaluate-commands %sh{
 # ‾‾‾‾‾‾‾‾
 
 define-command -hidden clojure-filter-around-selections lisp-filter-around-selections
-define-command -hidden clojure-indent-on-new-line       lisp-indent-on-new-line
+
+declare-option \
+    -docstring 'regex matching the head of forms which have options *and* indented bodies' \
+    regex clojure_special_indent_forms \
+    '(?:def.*|doseq|for|fn\*?|if(-.*|)|let.*|loop|ns|testing|with-.*|when(-.*|))'
+
+define-command -hidden clojure-indent-on-new-line %{
+    # registers: i = best align point so far; w = start of first word of form
+    evaluate-commands -draft -save-regs '/"|^@iw' -itersel %{
+        execute-keys -draft 'gk"iZ'
+        try %{
+            execute-keys -draft '[bl"i<a-Z><gt>"wZ'
+
+            try %{
+                # If a special form, indent another space
+                execute-keys -draft '"wze<a-k>\A' %opt{clojure_special_indent_forms} '\z<ret><a-L>s.\K.*<ret><a-;>;"i<a-Z><gt>'
+            } catch %{
+                # If not special and parameter appears on line 1, indent to parameter
+                execute-keys -draft '"wze<a-l>s\h\K[^\s].*<ret><a-;>;"i<a-Z><gt>'
+            }
+        }
+        try %{ execute-keys -draft '[rl"i<a-Z><gt>' }
+        try %{ execute-keys -draft '[Bl"i<a-Z><gt>' }
+        execute-keys -draft '"i<a-z>a&<space>'
+    }
+}
 
 # Initialization
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak
index bbba5db6..46a08d17 100644
--- a/rc/base/lisp.kak
+++ b/rc/base/lisp.kak
@@ -31,12 +31,26 @@ define-command -hidden lisp-filter-around-selections %{
     try %{ execute-keys -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
+declare-option \
+    -docstring 'regex matching the head of forms which have options *and* indented bodies' \
+    regex lisp_special_indent_forms \
+    '(?:def.*|if(-.*|)|let.*|lambda|with-.*|when(-.*|))'
+
 define-command -hidden lisp-indent-on-new-line %{
-    evaluate-commands -draft -itersel %{
-        # preserve previous line indent
-        try %{ execute-keys -draft \; K <a-&> }
-        # indent when matches opening paren
-        try %{ execute-keys -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> <a-\;> \; <a-gt> }
+    # registers: i = best align point so far; w = start of first word of form
+    evaluate-commands -draft -save-regs '/"|^@iw' -itersel %{
+        execute-keys -draft 'gk"iZ'
+        try %{
+            execute-keys -draft '[bl"i<a-Z><gt>"wZ'
+
+            try %{ execute-keys -draft '"wz<a-l>s.\K.*<ret><a-;>;"i<a-Z><gt>' }
+
+            # If not "special" form and parameter appears on line 1, indent to parameter
+            execute-keys -draft '"wze<a-K>\A' %opt{lisp_special_indent_forms} '\z<ret>' '<a-l>s\h\K[^\s].*<ret><a-;>;"i<a-Z><gt>'
+        }
+        try %{ execute-keys -draft '[rl"i<a-Z><gt>' }
+        try %{ execute-keys -draft '[Bl"i<a-Z><gt>' }
+        execute-keys -draft '"i<a-z>a&<space>'
     }
 }