Add indent special case for dispatch macro, #

Author: ethewalt

clj/dev-resources/test-dispatch-macro-indent.in

@@ -0,0 +1,31 @@
+(#(foo)
+bar)
+
+(#(foo
+bar))
+
+(#(foo bar
+a))
+
+(#(foo bar)
+a)
+
+(#{foo}
+bar)
+
+(#{foo
+bar})
+
+(#{foo bar}
+a)
+
+(#_(foo)
+bar)
+
+(#_(foo
+bar))
+
+(#_(foo bar)
+a)
+
+;; vim:ft=clojure:

clj/dev-resources/test-dispatch-macro-indent.out

@@ -0,0 +1,31 @@
+(#(foo)
+  bar)
+
+(#(foo
+    bar))
+
+(#(foo bar
+       a))
+
+(#(foo bar)
+  a)
+
+(#{foo}
+  bar)
+
+(#{foo
+   bar})
+
+(#{foo bar}
+  a)
+
+(#_(foo)
+ bar)
+
+(#_(foo
+     bar))
+
+(#_(foo bar)
+ a)
+
+;; vim:ft=clojure:

clj/test/vim_clojure_static/indent_test.clj

@@ -28,3 +28,8 @@
   (test-indent "reader conditionals are indented like maps"
                :in "test-reader-conditional-indent.in"
                :out "test-reader-conditional-indent.out"))
+
+(deftest test-dispatch-macro-indent
+  (test-indent "dispatch macro indentation is handled correctly"
+               :in "test-dispatch-macro-indent.in"
+               :out "test-dispatch-macro-indent.out"))

indent/clojure.vim

@@ -196,6 +196,27 @@ if exists("*searchpairpos")
 
 		return 0
 	endfunction
+	
+	" Check if keyword is an anonymous function, prefixed by #(, or a set,
+	" prefixed by #{
+	function! s:is_anonymous_function_or_set(word)
+		if a:word[0:1] == "#("
+			return 1
+		elseif a:word[0:1] == "#{"
+			return 1
+		endif
+
+		return 0
+	endfunction
+
+	" Check if keyword is ignored, that is, prefixed by #_
+	function! s:is_ignored(word)
+		if a:word[0:1] == "#_"
+			return 1
+		endif
+
+		return 0
+	endfunction
 
 	" Returns 1 for opening brackets, -1 for _anything else_.
 	function! s:bracket_type(char)
@@ -292,6 +313,18 @@ if exists("*searchpairpos")
 			return paren
 		endif
 
+		" If the keyword begins with #, check if it is an anonymous
+		" function or set, in which case we indent by the shiftwidth
+		" (minus one if g:clojure_align_subforms = 1), or if it is
+		" ignored, in which case we use the ( position for indent.
+		if w[0] == "#"
+			if s:is_anonymous_function_or_set(w)
+				return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)]
+			elseif s:is_ignored(w)
+				return paren
+			endif
+		endif
+
 		" Test words without namespace qualifiers and leading reader macro
 		" metacharacters.
 		"