Markdown parser: strip leading and trailing whitespaces in heading

diff --git a/autoload/lsp/markdown.vim b/autoload/lsp/markdown.vim
index 3f89a94d8400e2acc7d4d2a0be5e191f6fbbc4af..af470a5cb7de27aa680b00ce8766f59f011f880a 100644 (file)
--- a/autoload/lsp/markdown.vim
+++ b/autoload/lsp/markdown.vim
@@ -24,7 +24,7 @@ var code_fence = '^ \{,3\}\(`\{3,\}\|\~\{3,\}\)\s*\(\S*\)'
 var code_indent = '^ \{4\}\zs\s*\S.*'
 var paragraph = '^\s*\zs\S.\{-}\s*\ze$'
 
-var atx_heading = '^ \{,3}\zs\(#\{1,6}\) \(.\{-}\)\ze\%( #\{1,}\s*\)\=$'
+var atx_heading = '^ \{,3}\zs\(#\{1,6}\) \s*\(.\{-}\)\s*\ze\%( #\{1,}\s*\)\=$'
 var setext_heading = '^ \{,3}\zs\%(=\{1,}\|-\{1,}\)\ze *$'
 var setext_heading_level = {"=": 1, "-": 2}
 

diff --git a/test/markdown_tests.vim b/test/markdown_tests.vim
index 22f34c4a1eab28a8861d97e4d05fdfc70baa7fbf..749e612a0709a3d445fbb8b7247905420ad32fca 100644 (file)
--- a/test/markdown_tests.vim
+++ b/test/markdown_tests.vim
@@ -13,7 +13,8 @@ def g:Test_Markdown()
       [
        '# First level heading',
        '## Second level heading',
-       '### Third level heading'
+       '### Third level heading',
+       '#        Heading with leading and trailing whitespaces            '
       ],
       # Expected text
       [
@@ -21,7 +22,9 @@ def g:Test_Markdown()
        '',
        'Second level heading',
        '',
-       'Third level heading'
+       'Third level heading',
+       '',
+       'Heading with leading and trailing whitespaces'
       ],
       # Expected text properties
       [
@@ -29,7 +32,9 @@ def g:Test_Markdown()
        [],
        [{'col': 1, 'type': 'LspMarkdownHeading', 'length': 20}],
        [],
-       [{'col': 1, 'type': 'LspMarkdownHeading', 'length': 19}]
+       [{'col': 1, 'type': 'LspMarkdownHeading', 'length': 19}],
+       [],
+       [{'col': 1, 'type': 'LspMarkdownHeading', 'length': 45}]
       ]
     ],
     [