Commit 8ee73c5

committed

Small refactor to improve code clarity in indentation code

1 parent bdbc281 commit 8ee73c5Copy full SHA for 8ee73c5

File tree

1 file changed

+14

-21

lines changed

indent
- clojure.vim

1 file changed

+14

-21

lines changed

`‎indent/clojure.vim‎`

Lines changed: 14 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,28 +85,23 @@ function! s:InsideForm(lnum)`
`85`	`85`	`" Reduce tokens from line "lnum" into "tokens".`
`86`	`86`	`for tk in s:TokeniseLine(lnum)`
`87`	`87`	`if tk[0] ==# '"'`
`88`		`- " Keep track of the first string delimiter we`
`89`		`- " see, as we'll need it later for multi-line`
`90`		`- " strings/regexps.`
`91`		`- if first_string_pos == []`
`92`		`- let first_string_pos = tk[1]`
`93`		`- endif`
`94`		`-`
`95`		`- if ! empty(tokens) && tokens[-1][0] ==# '"'`
	`88`	`+ if in_string`
`96`	`89`	`let in_string = 0`
`97`	`90`	`call remove(tokens, -1)`
`98`	`91`	`else`
`99`	`92`	`let in_string = 1`
`100`	`93`	`call add(tokens, tk)`
`101`		`- endif`
`102`		`-`
`103`		`- continue`
`104`		`- endif`
`105`		`-`
`106`		`- " When in string ignore other tokens.`
`107`		`- if in_string \| continue \| endif`
`108`	`94`
`109`		`- if ! empty(tokens) && get(s:pairs, tk[0], '') ==# tokens[-1][0]`
	`95`	`+ " Track the first string delimiter we`
	`96`	`+ " see, as we may need it later for`
	`97`	`+ " multi-line strings/regexps.`
	`98`	`+ if first_string_pos == []`
	`99`	`+ let first_string_pos = tk`
	`100`	`+ endif`
	`101`	`+ endif`
	`102`	`+ elseif in_string`
	`103`	`+ " In string: ignore other tokens.`
	`104`	`+ elseif ! empty(tokens) && get(s:pairs, tk[0], '') ==# tokens[-1][0]`
`110`	`105`	`" Matching pair: drop the last item in tokens.`
`111`	`106`	`call remove(tokens, -1)`
`112`	`107`	`else`
`@@ -115,9 +110,8 @@ function! s:InsideForm(lnum)`
`115`	`110`	`endif`
`116`	`111`	`endfor`
`117`	`112`
`118`		`- " echom 'Pass' lnum tokens`
`119`		`-`
`120`	`113`	`if ! empty(tokens) && has_key(s:pairs, tokens[0][0])`
	`114`	`+ " Match found!`
`121`	`115`	`return tokens[0]`
`122`	`116`	`endif`
`123`	`117`
`@@ -127,7 +121,7 @@ function! s:InsideForm(lnum)`
`127`	`121`	`if ! empty(tokens) && tokens[0][0] ==# '"'`
`128`	`122`	`" Must have been in a multi-line string or regular expression`
`129`	`123`	`" as the string was never closed.`
`130`		`- return ['"', first_string_pos]`
	`124`	`+ return first_string_pos`
`131`	`125`	`endif`
`132`	`126`
`133`	`127`	`return ['^', [0, 0]] " Default to top-level.`
`@@ -191,8 +185,7 @@ function! s:ClojureIndent()`
`191`	`185`	`endif`
`192`	`186`	`endfunction`
`193`	`187`
`194`		`-" TODO: set lispoptions if exists.`
`195`		`-" https://github.com/vim/vim/commit/49846fb1a31de99f49d6a7e70efe685197423c84`
	`188`	`+" TODO: setl lisp lispoptions=expr:1 if exists. "has('patch-9.0.0761')"`
`196`	`189`	`setlocal indentexpr=s:ClojureIndent()`
`197`	`190`
`198`	`191`	`let &cpoptions = s:save_cpo`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8ee73c5

File tree

1 file changed

1 file changed

`‎indent/clojure.vim‎`

0 commit comments