diff --git a/syntax/just.vim b/syntax/just.vim index 99cc093..c072d36 100644 --- 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 new file mode 100644 index 0000000..18abd44 --- /dev/null +++ b/tests/cases/deprecated_obsolete.html @@ -0,0 +1,5 @@ +!include subdir/some.just + +set windows-powershell +set windows-powershell:=false +set windows-powershell := true diff --git a/tests/cases/deprecated_obsolete.just b/tests/cases/deprecated_obsolete.just new file mode 100644 index 0000000..f167cf7 --- /dev/null +++ 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 deleted file mode 100644 index 33b0ef7..0000000 --- a/tests/cases/include.html +++ /dev/null @@ -1,8 +0,0 @@ -!include other.just - -!include justfile -!include /absolute/path/to/justfile.just - -!include subdir/some.just - -!include path/to/a/justfile diff --git a/tests/cases/include.just b/tests/cases/include.just deleted file mode 100644 index 8e00754..0000000 --- a/tests/cases/include.just +++ /dev/null @@ -1,8 +0,0 @@ -!include other.just - -!include justfile -!include /absolute/path/to/justfile.just - -!include subdir/some.just - -!include path/to/a/justfile diff --git a/tests/cases/set.html b/tests/cases/set.html index 0668553..bb82293 100644 --- a/tests/cases/set.html +++ b/tests/cases/set.html @@ -25,10 +25,6 @@ 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 diff --git a/tests/cases/set.just b/tests/cases/set.just index 0c7e2f4..8e423fb 100644 --- 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