Support no space between module name and module path string

NoahTheDuke · Jul 7, 2024 · 8c3f95d · 8c3f95d
1 parent 49d8d86
commit 8c3f95d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/syntax/just.vim b/syntax/just.vim
@@ -297,7 +297,7 @@ syn match justImportStatement '^import' contained
 
 syn match justOldInclude "^!include"
 
-syn match justModule /\v^mod%(%(\s|\\\n)*\?)?%(\s|\\\n)+\h\k*\s*%($|%(\s|\\\n)+%(x?['"])@=|%(\s|\\\n)*#@=)/
+syn match justModule /\v^mod%(%(\s|\\\n)*\?)?%(\s|\\\n)+\h\k*\s*%($|%(\s|\\\n)*%(x?['"]|#)@=)/
    \ transparent contains=justModStatement,justName,justOptionalFile
 syn match justModStatement '^mod' contained
 

diff --git a/tests/cases/mod.html b/tests/cases/mod.html
@@ -19,3 +19,8 @@
 <span class="Keyword">mod</span> <span class="Identifier">foo</span><span class="Comment">#comment</span>
 <span class="Keyword">mod</span> <span class="Identifier">foo</span> <span class="Special">\</span>
   <span class="Comment"># comment</span>
+
+<span class="Keyword">mod</span> <span class="Identifier">foo</span><span class="String">"foo.just"</span>
+
+<span class="Comment"># not a shell-expanded string</span>
+<span class="Keyword">mod</span><span class="Conditional">?</span> <span class="Identifier">x</span><span class="String">"$FOO.just"</span>
diff --git a/tests/cases/mod.just b/tests/cases/mod.just
@@ -19,3 +19,8 @@ mod foo  # comment
 mod foo#comment
 mod foo \
   # comment
+
+mod foo"foo.just"
+
+# not a shell-expanded string
+mod? x"$FOO.just"