Fix incorrect highlighting of variable references in `replace_regex()…

…` calls outside of interpolations
NoahTheDuke · Apr 7, 2024 · a9ee95f · a9ee95f
1 parent a40cc97
commit a9ee95f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/syntax/just.vim b/syntax/just.vim
@@ -217,7 +217,7 @@ syn keyword justBuiltInFunction
 syn match justUserDefinedError "\verror%(%(\s|\\\n)*\()@="
 
 syn match justReplaceRegex '\vreplace_regex%(\s|\\\n)*\(@=' transparent contains=justBuiltInFunction nextgroup=justReplaceRegexCall
-syn match justReplaceRegexInInterp '\vreplace_regex%(\s|\\\n)*\(@=' transparent contains=justBuiltInFunction nextgroup=justReplaceRegexCallInInterp
+syn match justReplaceRegexInInterp '\vreplace_regex%(\s|\\\n)*\(@=' transparent contained contains=justBuiltInFunction nextgroup=justReplaceRegexCallInInterp
 
 syn region justReplaceRegexCall
    \ matchgroup=justReplaceRegexCall

diff --git a/tests/cases/recipes-with-extras.html b/tests/cases/recipes-with-extras.html
@@ -3,6 +3,7 @@
 
 p1 <span class="Operator">:=</span> <span class="String">'test'</span>
 p2 <span class="Operator">:=</span> <span class="Function">canonicalize</span>(<span class="String">'..'</span>)
+pdirname <span class="Operator">:=</span> <span class="Function">replace_regex</span>(p2, <span class="String">'/([^/]*)$'</span>, <span class="String">'</span><span class="Constant">$1</span><span class="String">'</span>)
 param <span class="Operator">:=</span> <span class="Function">semver_matches</span>(<span class="String">'0.1.1'</span>, <span class="String">'&gt;=0.1.0'</span>)
 
 <span class="Special">@</span><span class="Function">foo1</span> <span class="Identifier">param1</span> <span class="Identifier">param2</span><span class="Operator">=</span><span class="String">"default test"</span> <span class="Statement">+</span><span class="Identifier">varparam</span><span class="Operator">=</span><span class="String">'default'</span><span class="Operator">:</span> <span class="Function">dependency1</span> <span class="Delimiter">(</span><span class="Function">dependency2</span> p1 p2<span class="Delimiter">)</span> <span class="Delimiter">(</span><span class="Function">dependency3</span> param<span class="Delimiter">)</span>

diff --git a/tests/cases/recipes-with-extras.just b/tests/cases/recipes-with-extras.just
@@ -3,6 +3,7 @@ foo: # comment
 
 p1 := 'test'
 p2 := canonicalize('..')
+pdirname := replace_regex(p2, '/([^/]*)$', '$1')
 param := semver_matches('0.1.1', '>=0.1.0')
 
 @foo1 param1 param2="default test" +varparam='default': dependency1 (dependency2 p1 p2) (dependency3 param)