LSP.MarkupContent: Partial compact

dezza · Oct 6, 2022 · b5f801d · b5f801d
1 parent 5b35da1
commit b5f801d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/autoload/vital/__vital__/VS/LSP/MarkupContent.vim b/autoload/vital/__vital__/VS/LSP/MarkupContent.vim
@@ -31,19 +31,21 @@ function! s:normalize(markup_content, ...) abort
     endif
   endif
   let l:normalized = s:Text.normalize_eol(l:normalized)
-  if l:option.compact
-    let l:normalized = s:_compact(l:normalized)
-  endif
+  let l:normalized = s:_format(l:normalized, l:option.compact)
   return l:normalized
 endfunction
 
 "
-" _compact
+" _format
 "
-function! s:_compact(string) abort
+function! s:_format(string, compact) abort
   let l:string = a:string
-  let l:string = substitute(l:string, "\\%(\\s\\|\n\\)*```\\s*\\(\\w\\+\\)\\%(\\s\\|\n\\)\\+", "\n\n```\\1 ", 'g')
-  let l:string = substitute(l:string, "\\%(\\s\\|\n\\)\\+```\\%(\\s*\\%(\\%$\\|\n\\)\\)\\+", " ```\n\n", 'g')
+  if a:compact
+    let l:string = substitute(l:string, "\\%(\\s\\|\n\\)*```\\s*\\(\\w\\+\\)\\%(\\s\\|\n\\)\\+", "\n\n```\\1 ", 'g')
+    let l:string = substitute(l:string, "\\%(\\s\\|\n\\)\\+```\\%(\\s*\\%(\\%$\\|\n\\)\\)\\+", " ```\n\n", 'g')
+  else
+    let l:string = substitute(l:string, "```\n\\zs\\%(\\s\\|\n\\)\\+", "", 'g')
+  endif
   let l:string = substitute(l:string, "\\%^\\%(\\s\\|\n\\)*", '', 'g')
   let l:string = substitute(l:string, "\\%(\\s\\|\n\\)*\\%$", '', 'g')
   return l:string

diff --git a/autoload/vital/__vital__/VS/LSP/MarkupContent.vimspec b/autoload/vital/__vital__/VS/LSP/MarkupContent.vimspec
@@ -40,7 +40,6 @@ Describe vital#__vital__#VS#LSP#MarkupContent
       \   '```typescript',
       \   'console.log(variable)',
       \   '```',
-      \   '',
       \   '```typescript',
       \   'console.log(variable)',
       \   '```',