Commit c4b1bd3

Deraenguns

authored and

committed

Add indent special case for Reader Conditionals

1 parent f10f8c5 commit c4b1bd3Copy full SHA for c4b1bd3

File tree

+39

-0

lines changed

+39

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+(def DateTime #?(:clj org.joda.time.DateTime,`
	`2`	`+ :cljs goog.date.UtcDateTime))`
	`3`	`+`
	`4`	`+#?(:cljs`
	`5`	`+ (extend-protocol ToDateTime`
	`6`	`+ goog.date.Date`
	`7`	`+ (-to-date-time [x]`
	`8`	`+ (goog.date.UtcDateTime. (.getYear x) (.getMonth x) (.getDate x)))))`
	`9`	`+`
	`10`	`+;; vim:ft=clojure:`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+(def DateTime #?(:clj org.joda.time.DateTime,`
	`2`	`+ :cljs goog.date.UtcDateTime))`
	`3`	`+`
	`4`	`+#?(:cljs`
	`5`	`+ (extend-protocol ToDateTime`
	`6`	`+ goog.date.Date`
	`7`	`+ (-to-date-time [x]`
	`8`	`+ (goog.date.UtcDateTime. (.getYear x) (.getMonth x) (.getDate x)))))`
	`9`	`+`
	`10`	`+;; vim:ft=clojure:`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,8 @@`
`23`	`23`	`:in "test-side-effects-in-indentexpr.in"`
`24`	`24`	`:out "test-side-effects-in-indentexpr.out"`
`25`	`25`	`:keys "/α\\<CR>:call GetClojureIndent()\\<CR>rxj:call GetClojureIndent()\\<CR>ry"))`
	`26`	`+`
	`27`	`+(deftest test-reader-conditional-indent`
	`28`	`+ (test-indent "is inherited from previous element"`
	`29`	`+ :in "test-reader-conditional-indent.in"`
	`30`	`+ :out "test-reader-conditional-indent.out"))`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,16 @@ if exists("*searchpairpos")`
`187`	`187`	`return val`
`188`	`188`	`endfunction`
`189`	`189`
	`190`	`+ " Check if form is a reader conditional, that is, it is prefixed by #?`
	`191`	`+ " or @#?`
	`192`	`+ function! s:is_reader_conditional_special_case(position)`
	`193`	`+ if getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"`
	`194`	`+ return 1`
	`195`	`+ endif`
	`196`	`+`
	`197`	`+ return 0`
	`198`	`+ endfunction`
	`199`	`+`
`190`	`200`	`" Returns 1 for opening brackets, -1 for _anything else_.`
`191`	`201`	`function! s:bracket_type(char)`
`192`	`202`	`return stridx('([{', a:char) > -1 ? 1 : -1`
`@@ -254,6 +264,10 @@ if exists("*searchpairpos")`
`254`	`264`	`return [paren[0], paren[1] + &shiftwidth - 1]`
`255`	`265`	`endif`
`256`	`266`
	`267`	`+ if s:is_reader_conditional_special_case(paren)`
	`268`	`+ return paren`
	`269`	`+ endif`
	`270`	`+`
`257`	`271`	`" In case we are at the last character, we use the paren position.`
`258`	`272`	`if col("$") - 1 == paren[1]`
`259`	`273`	`return paren`

Comments

(0)