fix: raw shell-expanded strings default values don't do line continua…

…tions
NoahTheDuke · Jun 22, 2024 · c771fb5 · c771fb5
1 parent 613049a
commit c771fb5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/syntax/just.vim b/syntax/just.vim
@@ -201,7 +201,9 @@ syn region justConditionalBraces start="\v\{\{@!" end="\v\}@=" transparent conta
 syn region justConditionalBracesInInterp start="\v\{\{@!" end="\v\}@=" transparent contained contains=@justExprInInterp
 
 syn match justLineLeadingSymbol "\v^%(\\\n)@3<!\s+\zs%(\@-|-\@|\@|-)"
-syn match justLineContinuation "\\$" containedin=ALLBUT,justComment,justCommentInBody,justShebang,@justRawStrings,justPreBodyCommentError,justRecipeAttrArgError
+
+syn match justLineContinuation "\\$"
+   \ containedin=ALLBUT,justComment,justCommentInBody,justShebang,@justRawStrings,justPreBodyCommentError,justRecipeAttrArgError,justShellExpandRawDefaultValue
 
 syn region justBody
    \ start=/\v^\z( +|\t+)%(#!)@!\S/

diff --git a/tests/cases/expressions.html b/tests/cases/expressions.html
@@ -30,6 +30,11 @@
 <span class="Character">     baz</span><span class="PreProc">}</span>
 <span class="String">'''</span>
 shell_expanded6 <span class="Operator">:=</span> <span class="String">x'</span><span class="Special">$$$$</span><span class="String">not_an_env_var </span><span class="Special">$$$$</span><span class="String">{also_not_an_env_var}'</span>
+shell_expanded7 <span class="Operator">:=</span> <span class="String">x'''</span>
+<span class="String">  </span><span class="PreProc">${FOOOOOOOOOOOOOOOOO</span><span class="Operator">:-</span><span class="Character">bar \</span>
+<span class="Character">  baz</span>
+<span class="Character">  </span><span class="PreProc">}</span>
+<span class="String">'''</span>
 
 _true <span class="Operator">:=</span> <span class="Exception">assert</span>(<span class="String">'1'</span> <span class="Operator">!=</span> <span class="String">'0'</span>, <span class="String">'1 is not 0'</span>)
 

diff --git a/tests/cases/expressions.just b/tests/cases/expressions.just
@@ -30,6 +30,11 @@ shell_expanded5 := x'''
      baz}
 '''
 shell_expanded6 := x'$$$$not_an_env_var $$$${also_not_an_env_var}'
+shell_expanded7 := x'''
+  ${FOOOOOOOOOOOOOOOOO:-bar \
+  baz
+  }
+'''
 
 _true := assert('1' != '0', '1 is not 0')