Skip to content

Commit 5ef6035

Browse files
authored
Merge pull request #335 from hiberabyss/context0
per line as paragraph when have context 0
2 parents 40cdf40 + 90e0ed1 commit 5ef6035

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

autoload/ctrlsf/db.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,10 @@ func! s:ParseOneLine(line) abort
206206
call s:MakeParagraph()
207207
call s:ParseOneLine(a:line)
208208
else
209-
if (s:pre_ln == -1) || (lnum == s:pre_ln + 1)
209+
if ctrlsf#opt#IsContextZero()
210+
call add(s:buffer, [fname, lnum, content])
211+
call s:MakeParagraph()
212+
elseif (s:pre_ln == -1) || (lnum == s:pre_ln + 1)
210213
let s:pre_ln = lnum
211214
call add(s:buffer, [fname, lnum, content])
212215
else

autoload/ctrlsf/opt.vim

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ func! ctrlsf#opt#GetOpt(name) abort
7878
endif
7979
endf
8080

81+
function! ctrlsf#opt#IsContextZero()
82+
let context = ctrlsf#opt#GetContext()
83+
return (has_key(context, 'context') && context.context == 0)
84+
endfunction
85+
8186
" GetContext()
8287
"
8388
" Return a dict contains 'after', 'before' and/or 'context'

autoload/ctrlsf/view.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func! s:NormalViewIncr(base_vlnum) abort
129129
if s:cur_file !=# par.filename
130130
let s:cur_file = par.filename
131131
call extend(view, s:Filename(par))
132-
else
132+
elseif !ctrlsf#opt#IsContextZero()
133133
call extend(view, s:Ellipsis())
134134
endif
135135

@@ -367,6 +367,9 @@ func! ctrlsf#view#Unrender(content) abort
367367
let lnum = base_lnum + len(buffer) + offset
368368
let content = strpart(line, indent)
369369
call add(buffer, [current_file, lnum, content])
370+
if ctrlsf#opt#IsContextZero()
371+
break
372+
endif
370373
endif
371374
endwh
372375

0 commit comments

Comments
 (0)