Don't use fn arg alignment indent when a keyword is in function position

Fixes indentation of reader conditional macros.  May choose to remove
this if function argument indentation is generally preferred by
programmers when a keyword is in function position.

Author: axvr

clj/resources/indent-test-cases/reader_conditionals/in.clj

@@ -1,11 +1,11 @@
 (def DateTime #?(:clj org.joda.time.DateTime,
                       :cljs goog.date.UtcDateTime))
 
-#?(:cljs
-    (extend-protocol ToDateTime
-      goog.date.Date
-      (-to-date-time [x]
-        (goog.date.UtcDateTime. (.getYear x) (.getMonth x) (.getDate x)))))
+#?(:clj
+    (defn regexp?
+              "Returns true if x is a Java regular expression pattern."
+[x]
+           (instance? java.util.regex.Pattern x)))
 
 #?@(:clj  [5 6 7 8]
-      :cljs [1 2 3 4])))
+      :cljs [1 2 3 4])

clj/resources/indent-test-cases/reader_conditionals/out.clj

@@ -1,11 +1,11 @@
 (def DateTime #?(:clj org.joda.time.DateTime,
                  :cljs goog.date.UtcDateTime))
 
-#?(:cljs
-   (extend-protocol ToDateTime
-     goog.date.Date
-     (-to-date-time [x]
-       (goog.date.UtcDateTime. (.getYear x) (.getMonth x) (.getDate x)))))
+#?(:clj
+   (defn regexp?
+     "Returns true if x is a Java regular expression pattern."
+     [x]
+     (instance? java.util.regex.Pattern x)))
 
 #?@(:clj  [5 6 7 8]
     :cljs [1 2 3 4])

indent/clojure.vim

@@ -252,6 +252,7 @@ function! s:ListIndent(delim_pos)
 
 	let base_indent = s:PosToCharCol(a:delim_pos)
 	let ln = getline(a:delim_pos[0])
+	let ln_content = ln[a:delim_pos[1]:]
 
 	let sym_match = -1
 
@@ -268,7 +269,7 @@ function! s:ListIndent(delim_pos)
 	" other indentation options.
 
 	" TODO: simplify this.
-	let syms = split(ln[a:delim_pos[1]:], '[[:space:],;()\[\]{}@\\"^~`]', 1)
+	let syms = split(ln_content, '[[:space:],;()\[\]{}@\\"^~`]', 1)
 
 	if !empty(syms)
 		let sym = syms[0]
@@ -292,12 +293,12 @@ function! s:ListIndent(delim_pos)
 	endif
 
 	" 2. Function indentation
-	"    if first operand is on the same line?
+	"    if first operand is on the same line? (and not a keyword)
 	"      - Indent subsequent lines to align with first operand.
 	"    else
 	"      - Indent 1 or 2 spaces.
 	let indent_style = s:Conf('clojure_indent_style', 'always-align')
-	if indent_style !=# 'always-indent'
+	if indent_style !=# 'always-indent' && ln_content[0] !=# ':'
 		let pos = s:FirstFnArgPos(a:delim_pos)
 		if pos != [0, 0] | return s:PosToCharCol(pos) - 1 | endif
 	endif