Commit 51e6a43

committed

Fix false positive multi-line string detection

Sometimes it seems that when `=`ing over a block, Vim will sometimes not re-highlight strings correctly until we have already ran `searchpairpos`. In this case, we implement a hacky workaround which detects the false-positive and recovers from it.

1 parent d177b3b commit 51e6a43Copy full SHA for 51e6a43

File tree

1 file changed

+16

-2

lines changed

indent
- clojure.vim

1 file changed

+16

-2

lines changed

`‎indent/clojure.vim`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,18 +90,32 @@ function! s:GetClojureIndent()`
`90`	`90`	`" Move cursor to the first column of the line we want to indent.`
`91`	`91`	`call cursor(v:lnum, 1)`
`92`	`92`
`93`		`- " Improve accuracy of string detection when a newline is entered.`
`94`	`93`	`if empty(getline(v:lnum))`
	`94`	`+ " Improves the accuracy of string detection when a newline is`
	`95`	`+ " entered while in insert mode.`
`95`	`96`	`let strline = v:lnum - 1`
`96`		`- let synname = s:GetSynIdName(strline, len(getline(strline)))`
	`97`	`+ let synname = s:GetSynIdName(strline, strlen(getline(strline)))`
`97`	`98`	`else`
`98`	`99`	`let synname = s:GetSynIdName(v:lnum, 1)`
`99`	`100`	`endif`
`100`	`101`
`101`	`102`	`let s:best_match = ['top', [0, 0]]`
`102`	`103`
`103`	`104`	`if synname =~? 'string'`
	`105`	`+ " Sometimes, string highlighting does not kick in correctly,`
	`106`	`+ " until after this first "s:CheckPair" call, so we have to`
	`107`	`+ " detect and attempt an automatic correction.`
`104`	`108`	`call s:CheckPair('str', '"', '"', function('<SID>NotStringDelimiter'))`
	`109`	`+ let new_synname = s:GetSynIdName(v:lnum, 1)`
	`110`	`+ if new_synname !=# synname`
	`111`	`+ echoerr 'Misdetected string! Retrying...'`
	`112`	`+ let s:best_match = ['top', [0, 0]]`
	`113`	`+ let synname = new_synname`
	`114`	`+ endif`
	`115`	`+ endif`
	`116`	`+`
	`117`	`+ if synname =~? 'string'`
	`118`	`+ " We already checked this above, so pass through this block.`
`105`	`119`	`elseif synname =~? 'regex'`
`106`	`120`	`call s:CheckPair('reg', '#\zs"', '"', function('<SID>NotRegexpDelimiter'))`
`107`	`121`	`else`

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 51e6a43

File tree

1 file changed

1 file changed

`‎indent/clojure.vim`

0 commit comments