Add indentation tests covering keywords in function position

Author: axvr

README.md

@@ -95,6 +95,8 @@ let b:clojure_indent_style = 'traditional'  " ...or override it per-buffer.
 > [!NOTE]
 > These options are ignored if an indentation style of "uniform" is selected.
 
+<!-- TODO: write this section. -->
+
 `clojure_indent_rules` & `clojure_fuzzy_indent_patterns`
 
 

clj/resources/indent-test-cases/s-expr_standard/in.clj

@@ -83,3 +83,15 @@ bar
 ('foo
 bar
        biz)
+
+  (ns my-namespace
+  (:require [foo :as f]
+  [bar :refer [x]])
+  (:import
+  (java.io File
+                            IOException)
+      [clojure.lang PersistentQueue]))
+
+    (import '(java.io File
+                IOException)
+                '(clojure.lang PersistentQueue))

clj/resources/indent-test-cases/s-expr_standard/out.clj

@@ -83,3 +83,15 @@
 ('foo
  bar
  biz)
+
+(ns my-namespace
+  (:require [foo :as f]
+            [bar :refer [x]])
+  (:import
+   (java.io File
+            IOException)
+   [clojure.lang PersistentQueue]))
+
+(import '(java.io File
+                  IOException)
+        '(clojure.lang PersistentQueue))

clj/resources/indent-test-cases/s-expr_traditional/in.clj

@@ -83,3 +83,15 @@ bar
 ('foo
 bar
        biz)
+
+  (ns my-namespace
+  (:require [foo :as f]
+  [bar :refer [x]])
+  (:import
+  (java.io File
+                            IOException)
+      [clojure.lang PersistentQueue]))
+
+    (import '(java.io File
+                IOException)
+                '(clojure.lang PersistentQueue))

clj/resources/indent-test-cases/s-expr_traditional/out.clj

@@ -83,3 +83,15 @@
 ('foo
   bar
   biz)
+
+(ns my-namespace
+  (:require [foo :as f]
+            [bar :refer [x]])
+  (:import
+    (java.io File
+             IOException)
+    [clojure.lang PersistentQueue]))
+
+(import '(java.io File
+                  IOException)
+        '(clojure.lang PersistentQueue))

clj/resources/indent-test-cases/s-expr_uniform/in.clj

@@ -83,3 +83,15 @@ bar
 ('foo
 bar
        biz)
+
+  (ns my-namespace
+  (:require [foo :as f]
+  [bar :refer [x]])
+  (:import
+  (java.io File
+                            IOException)
+      [clojure.lang PersistentQueue]))
+
+    (import '(java.io File
+                IOException)
+                '(clojure.lang PersistentQueue))

clj/resources/indent-test-cases/s-expr_uniform/out.clj

@@ -83,3 +83,15 @@
 ('foo
   bar
   biz)
+
+(ns my-namespace
+  (:require [foo :as f]
+    [bar :refer [x]])
+  (:import
+    (java.io File
+      IOException)
+    [clojure.lang PersistentQueue]))
+
+(import '(java.io File
+           IOException)
+  '(clojure.lang PersistentQueue))

indent/clojure.vim

@@ -22,9 +22,6 @@ setlocal noautoindent nosmartindent nolisp
 setlocal softtabstop=2 shiftwidth=2 expandtab
 setlocal indentkeys=!,o,O
 
-" FIXME: fix reader conditional tests.  Include (:require [...]) test cases.
-"   Is it possible to fix reader conditional indentation?
-
 " Set a new configuration option with a default value.  Assigns a script-local
 " version too, to be used as a default fallback if the global was "unlet".
 function! s:SConf(name, default) abort
@@ -46,6 +43,8 @@ call s:SConf('clojure_fuzzy_indent_patterns', [
 \   '^let'
 \ ])
 
+" FIXME: reader conditional indentation?
+
 " TODO: explain the different numbers.  The "indent_style" option can override "0"
 " - -1  Not in dictionary, follow defaults.
 " - 0:  Align to first argument, else 2 space indentation.