Do not take indent of subsequent lines of a multiline string

guns · guns · commit 484c281f1b62 · 2014-04-04T16:10:48.000-05:00
diff --git a/clj/dev-resources/test-inherit-indent.in b/clj/dev-resources/test-inherit-indent.in
@@ -1,3 +1,7 @@
-(foo bar [✖])
+(foo bar
+     "This string has unpaired brackets
+      ["
+     α
+     [β])
 
 ;; vim:ft=clojure:
diff --git a/clj/dev-resources/test-inherit-indent.out b/clj/dev-resources/test-inherit-indent.out
@@ -1,4 +1,9 @@
-(foo bar [
+(foo bar
+     "This string has unpaired brackets
+      ["
+     a
+     
+     [
   a
   b
   
diff --git a/clj/test/vim_clojure_static/indent_test.clj b/clj/test/vim_clojure_static/indent_test.clj
@@ -6,4 +6,4 @@
   (test-indent "is inherited from previous element"
                :in "test-inherit-indent.in"
                :out "test-inherit-indent.out"
-               :keys "/✖\\<Esc>s\\<CR>\\<C-H>\\<C-H>\\<C-H>\\<C-H>a\\<CR>b\\<CR>\\<CR>c\\<Esc>"))
+               :keys "/α\\<CR>s\\<Esc>Oa\\<Esc>/β\\<CR>s\\<CR>\\<C-H>\\<C-H>a\\<CR>b\\<CR>\\<CR>c\\<Esc>"))
diff --git a/indent/clojure.vim b/indent/clojure.vim
@@ -346,7 +346,11 @@ if exists("*searchpairpos")
 			endwhile
 
 			if bracket_count == 0
-				return indent(lnum)
+				" Check if this is part of a multiline string
+				call cursor(lnum, 0)
+				if s:syn_id_name() !~? '\vstring|regex'
+					return indent(lnum)
+				endif
 			endif
 		endwhile
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,9 @@`
`1`		`-(foo bar [`
	`1`	`+(foo bar`
	`2`	`+ "This string has unpaired brackets`
	`3`	`+ ["`
	`4`	`+ a`
	`5`	`+`
	`6`	`+ [`
`2`	`7`	`a`
`3`	`8`	`b`
`4`	`9`