Slight code refactor and added more comments

Author: axvr

indent/clojure.vim

@@ -81,14 +81,26 @@ function! s:IsEscaped(line_str, i_char)
 	return (strlen(ln) - strlen(trim(ln, '\', 2))) % 2
 endfunction
 
-" TODO: better comment and function name.
-" Used to check if in the current form for list function indentation.
-let s:in_form_current_form = [0, 0]
-function! s:InForm()
+" Used during list function indentation.  Returns the position of the first
+" operand in the list on the first line of the form at "pos".
+function! s:FirstFnArgPos(pos)
+	" TODO: ignore comments.
+	" TODO: handle escaped characters!
+	let lnr = a:pos[0]
+	let s:in_form_current_form = a:pos
+	call cursor(lnr, a:pos[1] + 1)
+	return searchpos('[ ,]\+\zs', 'z', lnr, 0, function('<SID>IsSubForm'))
+endfunction
+
+" Used by "s:FirstFnArgPos" function to skip over subforms as the first value
+" in a list form.
+function! s:IsSubForm()
 	let pos = searchpairpos('[([{"]', '', '[)\]}"]', 'b')
 	return pos != [0, 0] && pos != s:in_form_current_form
 endfunction
 
+" Converts a cursor position into a characterwise cursor position (to handle
+" multibyte characters).
 function! s:PosToCharPos(pos)
 	call cursor(a:pos)
 	return getcursorcharpos()[1:2]
@@ -235,7 +247,6 @@ function! s:ListIndent(delim_pos)
 
 	let base_indent = s:PosToCharPos(a:delim_pos)[1]
 	let ln = getline(a:delim_pos[0])
-	let delim_col = a:delim_pos[1]
 
 	" 1. Macro/rule indentation
 	"    if starts with a symbol, extract it.
@@ -250,7 +261,7 @@ function! s:ListIndent(delim_pos)
 	" other indentation options.
 
 	" TODO: simplify this.
-	let syms = split(ln[delim_col:], '[[:space:],;()\[\]{}@\\"^~`]', 1)
+	let syms = split(ln[a:delim_pos[1]:], '[[:space:],;()\[\]{}@\\"^~`]', 1)
 
 	if !empty(syms)
 		let sym = syms[0]
@@ -264,9 +275,7 @@ function! s:ListIndent(delim_pos)
 
 			" TODO: replace `clojure_fuzzy_indent_patterns` with `clojure_indent_patterns`
 			for pat in s:Conf('clojure_fuzzy_indent_patterns', [])
-				if sym =~# pat
-					return base_indent + 1
-				endif
+				if sym =~# pat | return base_indent + 1 | endif
 			endfor
 
 			let rules = s:Conf('clojure_indent_rules', {})
@@ -277,22 +286,14 @@ function! s:ListIndent(delim_pos)
 	endif
 
 	" 2. Function indentation
-	"    if first operand is on the same line?  (Treat metadata as args.)
+	"    if first operand is on the same line?
 	"      - 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'
-		let lnr = a:delim_pos[0]
-		call cursor(lnr, delim_col + 1)
-
-		" TODO: ignore comments.
-		" TODO: handle escaped characters!
-		let s:in_form_current_form = a:delim_pos
-		let ln_s = searchpos('[ ,]\+\zs', 'z', lnr, 0, function('<SID>InForm'))
-
-		if ln_s != [0, 0] | return s:PosToCharPos(ln_s)[1] - 1 | endif
+		let pos = s:FirstFnArgPos(a:delim_pos)
+		if pos != [0, 0] | return s:PosToCharPos(pos)[1] - 1 | endif
 	endif
 
 	" Fallback indentation for operands.  When "clojure_indent_style" is