Highlight !include same as deprecated

ref: casey/just#1735 (comment)
NoahTheDuke · Dec 20, 2023 · a426a59 · a426a59
1 parent 9ffcd1b
commit a426a59
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 26 deletions.
diff --git a/syntax/just.vim b/syntax/just.vim
@@ -241,7 +241,8 @@ syn match justOperator "\v\=[=~]|!\=|[+/]"
 syn cluster justExprBase contains=@justAllStrings,justConditional,justOperator
 syn cluster justExpr contains=@justExprBase,@justBuiltInFunctions,justBuiltInFunctionArgs,justReplaceRegex
 
-syn match justInclude "^!include\s\+.*$"
+syn match justOldInclude "^!include\s.*$" contains=justOldIncludeDirective
+syn match justOldIncludeDirective "^!include" contained
 
 hi def link justAlias                 Statement
 hi def link justAssignmentOperator    Operator
@@ -256,13 +257,14 @@ hi def link justConditional           Conditional
 hi def link justCurlyBraces           Special
 hi def link justExport                Statement
 hi def link justFunction              Function
-hi def link justInclude               Include
 hi def link justIndentError           Error
 hi def link justInterpolation         Normal
 hi def link justInterpolationDelim    Delimiter
 hi def link justLineContinuation      Special
 hi def link justLineLeadingSymbol     Special
 hi def link justName                  Identifier
+hi def link justOldInclude            PreProc
+hi def link justOldIncludeDirective   Underlined
 hi def link justOperator              Operator
 hi def link justParameterError        Error
 hi def link justParameterOperator     Operator

diff --git a/tests/cases/deprecated_obsolete.html b/tests/cases/deprecated_obsolete.html
@@ -0,0 +1,5 @@
+<span class="Underlined">!include</span><span class="PreProc"> subdir/some.just</span>
+
+<span class="Statement">set</span> <span class="Underlined">windows-powershell</span>
+<span class="Statement">set</span> <span class="Underlined">windows-powershell</span><span class="Operator">:=</span><span class="Boolean">false</span>
+<span class="Statement">set</span> <span class="Underlined">windows-powershell</span> <span class="Operator">:=</span> <span class="Boolean">true</span>
diff --git a/tests/cases/deprecated_obsolete.just b/tests/cases/deprecated_obsolete.just
@@ -0,0 +1,5 @@
+!include subdir/some.just
+
+set windows-powershell
+set windows-powershell:=false
+set windows-powershell := true
diff --git a/tests/cases/include.html b/tests/cases/include.html
diff --git a/tests/cases/include.just b/tests/cases/include.just
diff --git a/tests/cases/set.html b/tests/cases/set.html
@@ -25,10 +25,6 @@
 
 <span class="Statement">set</span> <span class="Keyword">windows-shell</span><span class="Operator">:=</span>[<span class="String">"powershell.exe"</span>, <span class="String">"-NoLogo"</span>, <span class="String">"-Command"</span>]
 
-<span class="Statement">set</span> <span class="Underlined">windows-powershell</span>
-<span class="Statement">set</span> <span class="Underlined">windows-powershell</span><span class="Operator">:=</span><span class="Boolean">false</span>
-<span class="Statement">set</span> <span class="Underlined">windows-powershell</span> <span class="Operator">:=</span> <span class="Boolean">true</span>
-
 <span class="Statement">set</span> <span class="Keyword">fallback</span>
 <span class="Statement">set</span> <span class="Keyword">fallback</span> <span class="Operator">:=</span> <span class="Boolean">true</span>
 <span class="Statement">set</span> <span class="Keyword">fallback</span> <span class="Operator">:=</span> <span class="Boolean">false</span>

diff --git a/tests/cases/set.just b/tests/cases/set.just
@@ -25,10 +25,6 @@ set shell:=['bash',"-c"]
 
 set windows-shell:=["powershell.exe", "-NoLogo", "-Command"]
 
-set windows-powershell
-set windows-powershell:=false
-set windows-powershell := true
-
 set fallback
 set fallback := true
 set fallback := false