Commit e573da7

committed

EDN files are unlikely to contain many lists, so check them last

1 parent 51e6a43 commit e573da7Copy full SHA for e573da7

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,17 @@ function! s:GetClojureIndent()`
`120`	`120`	`call s:CheckPair('reg', '#\zs"', '"', function('<SID>NotRegexpDelimiter'))`
`121`	`121`	`else`
`122`	`122`	`let IgnoredRegionFn = function('<SID>IgnoredRegion')`
`123`		`- call s:CheckPair('lst', '(', ')', IgnoredRegionFn)`
`124`		`- call s:CheckPair('map', '{', '}', IgnoredRegionFn)`
`125`		`- call s:CheckPair('vec', '\[', '\]', IgnoredRegionFn)`
	`123`	`+ if bufname() ==? '\.edn$'`
	`124`	`+ " If EDN file, check list pair last.`
	`125`	`+ call s:CheckPair('map', '{', '}', IgnoredRegionFn)`
	`126`	`+ call s:CheckPair('vec', '\[', '\]', IgnoredRegionFn)`
	`127`	`+ call s:CheckPair('lst', '(', ')', IgnoredRegionFn)`
	`128`	`+ else`
	`129`	`+ " If CLJ file, check list pair first.`
	`130`	`+ call s:CheckPair('lst', '(', ')', IgnoredRegionFn)`
	`131`	`+ call s:CheckPair('map', '{', '}', IgnoredRegionFn)`
	`132`	`+ call s:CheckPair('vec', '\[', '\]', IgnoredRegionFn)`
	`133`	`+ endif`
`126`	`134`	`endif`
`127`	`135`
`128`	`136`	`" Find closest matching higher form.`
`@@ -145,10 +153,10 @@ function! s:GetClojureIndent()`
`145`	`153`	`elseif formtype ==# 'reg'`
`146`	`154`	`" Inside a regular expression.`
`147`	`155`	`return s:GetStringIndent(coord, 1)`
	`156`	`+ else`
	`157`	`+ " Keep existing indent.`
	`158`	`+ return -1`
`148`	`159`	`endif`
`149`		`-`
`150`		`- " Keep existing indent.`
`151`		`- return -1`
`152`	`160`	`endfunction`
`153`	`161`
`154`	`162`	`if exists("*searchpairpos")`

Comments

(0)