Fix indentexpr cursor restoration and add a test case

guns · guns · commit d978de518c1f · 2014-05-08T02:20:01.000-05:00
diff --git a/clj/dev-resources/test-side-effects-in-indentexpr.in b/clj/dev-resources/test-side-effects-in-indentexpr.in
@@ -0,0 +1,3 @@
+(doseq [x (range 10) y (range 10)]
+  (println α)
+  (println β))
diff --git a/clj/dev-resources/test-side-effects-in-indentexpr.out b/clj/dev-resources/test-side-effects-in-indentexpr.out
@@ -0,0 +1,3 @@
+(doseq [x (range 10) y (range 10)]
+  (println x)
+  (println y))
diff --git a/clj/test/vim_clojure_static/indent_test.clj b/clj/test/vim_clojure_static/indent_test.clj
@@ -17,3 +17,9 @@
                :in "test-inherit-indent.in"
                :out "test-inherit-indent.out"
                :keys "/α\\<CR>s\\<C-O>Oa\\<Esc>/β\\<CR>s\\<CR>\\<CR>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>b\\<CR>c\\<CR>\\<CR>d\\<Esc>"))
+
+(deftest test-side-effects-in-indentexpr
+  (test-indent "GetClojureIndent does not move cursor"
+               :in "test-side-effects-in-indentexpr.in"
+               :out "test-side-effects-in-indentexpr.out"
+               :keys "/α\\<CR>:call GetClojureIndent()\\<CR>rxj:call GetClojureIndent()\\<CR>ry"))
diff --git a/indent/clojure.vim b/indent/clojure.vim
@@ -306,7 +306,8 @@ if exists("*searchpairpos")
 
 	function! GetClojureIndent()
 		let lnum = line('.')
-		let cnum = col('.')
+		let orig_lnum = lnum
+		let orig_col = col('.')
 		let [opening_lnum, indent] = s:clojure_indent_pos()
 
 		" Account for multibyte characters
@@ -316,7 +317,7 @@ if exists("*searchpairpos")
 
 		" Return if there are no previous lines to inherit from
 		if opening_lnum < 1 || opening_lnum >= lnum - 1
-			call cursor(lnum, cnum)
+			call cursor(orig_lnum, orig_col)
 			return indent
 		endif
 
@@ -351,13 +352,13 @@ if exists("*searchpairpos")
 				" Check if this is part of a multiline string
 				call cursor(lnum, 1)
 				if s:syn_id_name() !~? '\vstring|regex'
-					call cursor(lnum, cnum)
+					call cursor(orig_lnum, orig_col)
 					return indent(lnum)
 				endif
 			endif
 		endwhile
 
-		call cursor(lnum, cnum)
+		call cursor(orig_lnum, orig_col)
 		return indent
 	endfunction
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+(doseq [x (range 10) y (range 10)]`
	`2`	`+ (println α)`
	`3`	`+ (println β))`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+(doseq [x (range 10) y (range 10)]`
	`2`	`+ (println x)`
	`3`	`+ (println y))`