From deec2858c9ac1e64b6d324332cf717994764344b Mon Sep 17 00:00:00 2001
From: "Andy K. Massimino" <f8a663@normed.space>
Date: Mon, 4 Oct 2021 09:30:44 -0400
Subject: [PATCH] Fix popup alignment with signcolumn

---
 autoload/matchup/matchparen.vim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/autoload/matchup/matchparen.vim b/autoload/matchup/matchparen.vim
index c6d2a8a..715eec9 100644
--- a/autoload/matchup/matchparen.vim
+++ b/autoload/matchup/matchparen.vim
@@ -674,7 +674,7 @@ endfunction
 function! s:set_popup_text_2(lnum, adjust, offscreen) abort
   let [l:sl, l:lnum] = matchup#matchparen#status_str(
         \ a:offscreen, {'noshowdir': 1})
-  let l:sl = substitute(l:sl, '%<', '', 'g')
+  let l:sl = '%#Normal#' . substitute(l:sl, '%<', '', 'g')
 
   let l:props = []
   let l:col = 1
@@ -682,6 +682,13 @@ function! s:set_popup_text_2(lnum, adjust, offscreen) abort
   for l:item in split(l:sl, '%\@1<!%#')
     let [l:hl; l:rest] = split(l:item, '#')
 
+    let l:rest = join(l:rest, '')
+    let l:len = len(l:rest)
+
+    if !l:len
+      continue
+    endif
+
     if l:hl =~# '^\s*$'
       continue
     endif
@@ -697,13 +704,12 @@ function! s:set_popup_text_2(lnum, adjust, offscreen) abort
       let s:prop_cache[l:key] = 1
     endif
 
-    let l:rest = join(l:rest, '')
-    let l:len = len(l:rest)
     call add(l:props, {
           \ 'length': l:len,
           \ 'col': l:col,
           \ 'type': l:key
           \})
+
     let l:text .= l:rest
     let l:col += l:len
   endfor