Fix indentation of function calls when treesit node is nil

Previously indenting 2 spaces for function calls only worked when we
were indenting where some node was after the point. Indentation fell
back to picking up the "parent 'list_lit' then indent 1 rule" because
node can sometime be nil and there was nothing to capture in the query.
Queries cannot bind nil to a captured var, simply not possible.

We don't really care what the node at point is, instead we just want to
know the parent of wherever the point is. A function is used to make
the match instead of a query. The function can ignore node and focus
only on the parent node.

This will most likely be an important strategy in semantic indentation.

Author: dannyfreeman

Diff for: clojure-ts-mode.el

@@ -335,19 +335,6 @@
    '((derefing_lit
       marker: "@" @font-lock-warning-face))))
 
-(defvar clojure-ts--fixed-indent-rules
-  ;; This is in contrast to semantic rules
-  ;; fixed-indent-rules come from https://tonsky.me/blog/clojurefmt/
-  '((clojure
-     ((parent-is "source") parent-bol 0)
-     ;; Lists beginning with a symbol indent 2 spaces (usually a function/macro call)
-     ((query "(list_lit . (sym_lit) _* @indent)") parent 2)
-     ((or (parent-is "vec_lit")
-          (parent-is "map_lit")
-          (parent-is "list_lit")) parent 1)
-     ((parent-is "set_lit") parent 2))))
-
-
 ;; Node predicates
 
 (defun clojure-ts--list-node-p (node)
@@ -358,6 +345,10 @@
   "Return non-nil if NODE is a Clojure symbol."
   (string-equal "sym_lit" (treesit-node-type node)))
 
+(defun clojure-ts--keyword-node-p (node)
+  "Return non-nil if NODE is a Clojure keyword."
+  (string-equal "kwd_lit" (treesit-node-type node)))
+
 (defun clojure-ts--named-node-text (node)
   "Gets the name of a symbol or keyword NODE.
 This does not include the NODE's namespace."
@@ -479,6 +470,28 @@ Includes a dispatch value when applicable (defmethods)."
 By default `treesit-defun-name-function' is used to extract definition names.
 See `clojure-ts--standard-definition-node-name' for the implementation used.")
 
+(defvar clojure-ts--fixed-indent-rules
+  ;; This is in contrast to semantic
+  ;; fixed-indent-rules come from https://tonsky.me/blog/clojurefmt/
+  `((clojure
+     ((parent-is "source") parent-bol 0)
+     ;; ((query "(list_lit . [(sym_lit) (kwd_lit)] _* @node)") parent 2)
+     ;; Using the above `query' rule here doesn't always work because sometimes `node' is nil.
+     ;; `query' requires `node' to be matched.
+     ;; We really only care about the parent node being a function-call like list.
+     ;; with it's first named child being a symbol
+     ((lambda (node parent _)
+        (and (clojure-ts--list-node-p parent)
+             ;; Should we also check for keyword first child, as in (:k map) calls?
+             (let ((first-child (treesit-node-child parent 0 t)))
+               (or (clojure-ts--symbol-node-p first-child)
+                   (clojure-ts--keyword-node-p first-child)))))
+      parent 2)
+     ((parent-is "vec_lit") parent 1)
+     ((parent-is "map_lit") parent 1)
+     ((parent-is "list_lit") parent 1)
+     ((parent-is "set_lit") parent 2))))
+
 (defvar clojure-ts-mode-map
   (let ((map (make-sparse-keymap)))
     ;(set-keymap-parent map clojure-mode-map)

Diff for: indentation.clj

@@ -0,0 +1,56 @@
+; https://tonsky.me/blog/clojurefmt/#ok-what-do-we-do-then
+(when something
+  body)
+
+(defn f [x]
+  body)
+
+(defn f
+  [x]
+  body)
+
+(defn many-args [a b c
+                 d e f]
+  body)
+
+(defn multi-arity
+  ([x]
+   body)
+  ([x y]
+   body))
+
+(let [x 1
+      y 2]
+  body)
+
+[1 2 3
+ 4 5 6]
+
+{:key-1 v1
+ :key-2 v2}
+
+#{a b c
+  d e f}
+
+; second cond is not aligned
+(or (condition-a)
+  (condition-b))
+
+; or/and are the only forms where this looks not ideal
+; other forms don’t win/lose much because of this change
+(filter even?
+  (range 1 10))
+
+; my way is actually better if fn name is looooooooooong
+(clojure.core/filter even?
+  (range 1 10))
+
+; 1 additional space, no big deal
+(filter
+  even?
+  (range 1 10))
+
+(:my/keyword
+  {:my/keyword 1
+   :another-keyword 2}
+  "default value")