Merge pull request #94 from cocopon/fix-indent-with-tab

Fix tab indent for popup
andymass · May 8, 2020 · 6836995 · 6836995
2 parents bae99f0 + f52937b
commit 6836995
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/autoload/matchup/matchparen.vim b/autoload/matchup/matchparen.vim
@@ -597,7 +597,14 @@ function! s:do_offscreen_popup(offscreen) " {{{1
   if &number || &relativenumber
     let l:text = printf('%*S ', wincol()-virtcol('.')-1, l:lnum)
   endif
-  let l:text .= getline(l:lnum) . ' '
+
+  " replace tab indent with spaces
+  " (popup window doesn't follow tabstop option of current buffer)
+  let l:linestr = getline(l:lnum)
+  let l:indent = repeat(' ', strdisplaywidth(matchstr(l:linestr, '^\s\+')))
+  let l:linestr = substitute(l:linestr, '^\s\+', l:indent, '')
+
+  let l:text .= l:linestr . ' '
   if l:adjust
     let l:text .= '… ' . a:offscreen.match . ' '
   endif