Commit 84d5e0c

committed

Merge branch 'no-cursor-move-during-indentexpr'

While an indentexpr is allowed to move the cursor while calculating a line's indent, doing so makes GetClojureIndent() unusable as a library function. Paredit.vim, for instance, makes use of this function. Closes #49 * no-cursor-move-during-indentexpr: Eliminate cursor side-effect in GetClojureIndent(). Fix GetClojureIndent() undesireable cursor move.

2 parents f52c5d0 + fe60b97 commit 84d5e0cCopy full SHA for 84d5e0c

File tree

1 file changed

-0

lines changed

indent
- clojure.vim

1 file changed

-0

lines changed

`‎indent/clojure.vim‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,7 @@ if exists("*searchpairpos")`
`306`	`306`
`307`	`307`	`function! GetClojureIndent()`
`308`	`308`	`let lnum = line('.')`
	`309`	`+ let cnum = col('.')`
`309`	`310`	`let [opening_lnum, indent] = s:clojure_indent_pos()`
`310`	`311`
`311`	`312`	`" Account for multibyte characters`
`@@ -315,6 +316,7 @@ if exists("*searchpairpos")`
`315`	`316`
`316`	`317`	`" Return if there are no previous lines to inherit from`
`317`	`318`	`if opening_lnum < 1 \|\| opening_lnum >= lnum - 1`
	`319`	`+ call cursor(lnum, cnum)`
`318`	`320`	`return indent`
`319`	`321`	`endif`
`320`	`322`
`@@ -349,11 +351,13 @@ if exists("*searchpairpos")`
`349`	`351`	`" Check if this is part of a multiline string`
`350`	`352`	`call cursor(lnum, 1)`
`351`	`353`	`if s:syn_id_name() !~? '\vstring\|regex'`
	`354`	`+ call cursor(lnum, cnum)`
`352`	`355`	`return indent(lnum)`
`353`	`356`	`endif`
`354`	`357`	`endif`
`355`	`358`	`endwhile`
`356`	`359`
	`360`	`+ call cursor(lnum, cnum)`
`357`	`361`	`return indent`
`358`	`362`	`endfunction`
`359`	`363`

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 84d5e0c

File tree

1 file changed

1 file changed

`‎indent/clojure.vim‎`

0 commit comments