diff --git a/runtime/syntax/qf.vim b/runtime/syntax/qf.vim index 6f2ea6a92..ce6af4989 100644 --- a/runtime/syntax/qf.vim +++ b/runtime/syntax/qf.vim @@ -1,7 +1,7 @@ " Vim syntax file -" Language: Quickfix window -" Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Language: Quickfix window +" Maintainer: The Vim Project +" Last Change: 2025 Feb 07 " Former Maintainer: Bram Moolenaar " Quit when a syntax file was already loaded @@ -9,16 +9,23 @@ if exists("b:current_syntax") finish endif -" A bunch of useful C keywords -syn match qfFileName "^[^|]*" nextgroup=qfSeparator -syn match qfSeparator "|" nextgroup=qfLineNr contained -syn match qfLineNr "[^|]*" contained contains=qfError -syn match qfError "error" contained +syn match qfFileName "^[^|]*" nextgroup=qfSeparator1 +syn match qfSeparator1 "|" contained nextgroup=qfLineNr +syn match qfLineNr "[^|]*" contained nextgroup=qfSeparator2 contains=@qfType +syn match qfSeparator2 "|" contained nextgroup=qfText +syn match qfText ".*" contained + +syn match qfError "error" contained +syn cluster qfType contains=qfError " The default highlighting. -hi def link qfFileName Directory -hi def link qfLineNr LineNr -hi def link qfError Error +hi def link qfFileName Directory +hi def link qfLineNr LineNr +hi def link qfSeparator1 Delimiter +hi def link qfSeparator2 Delimiter +hi def link qfText Normal + +hi def link qfError Error let b:current_syntax = "qf" diff --git a/src/testdir/dumps/Test_quickfix_cwindow_1.dump b/src/testdir/dumps/Test_quickfix_cwindow_1.dump index c2b487232..e5bf0a85f 100644 --- a/src/testdir/dumps/Test_quickfix_cwindow_1.dump +++ b/src/testdir/dumps/Test_quickfix_cwindow_1.dump @@ -4,9 +4,9 @@ |m|a|t|c|h|e|s| @67 |~+0#4040ff13&| @73 |X+1#0000000&|C|w|i|n|d|o|w| @48|1|,|4| @11|A|l@1 ->X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50 -|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @50 -|X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47 +>X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#e000e06&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#e000e06&| +0#0000000&|s|o|m|e| @50 +|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#e000e06&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#e000e06&| +0#0000000&|t|e|x|t| @50 +|X+0#0000e05&|C|w|i|n|d|o|w||+0#e000e06&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#e000e06&| +0#0000000&|m|a|t|c|h|e|s| @47 |~+0#4040ff13&| @73 |[+3#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|1|,|1| @12|A|l@1 | +0&&@74 diff --git a/src/testdir/dumps/Test_quickfix_cwindow_2.dump b/src/testdir/dumps/Test_quickfix_cwindow_2.dump index 0e7fa3c9e..55019bf89 100644 --- a/src/testdir/dumps/Test_quickfix_cwindow_2.dump +++ b/src/testdir/dumps/Test_quickfix_cwindow_2.dump @@ -4,9 +4,9 @@ |m|a|t|c|h|e|s| @67 |~+0#4040ff13&| @73 |X+3#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 -|X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50 -|X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @50 -|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47 +|X+0#0000e05&|C|w|i|n|d|o|w||+0#e000e06&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#e000e06&| +0#0000000&|s|o|m|e| @50 +|X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#e000e06&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#e000e06&| +0#0000000&|t|e|x|t| @50 +|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#e000e06&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#e000e06&| +0#0000000&|m|a|t|c|h|e|s| @47 |~+0#4040ff13&| @73 |[+1#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|2|,|1| @12|A|l@1 |:+0&&|c|n|e|x|t| @68 diff --git a/src/testdir/dumps/Test_quickfix_cwindow_3.dump b/src/testdir/dumps/Test_quickfix_cwindow_3.dump index d4a2e1692..cf5cd9dbd 100644 --- a/src/testdir/dumps/Test_quickfix_cwindow_3.dump +++ b/src/testdir/dumps/Test_quickfix_cwindow_3.dump @@ -4,9 +4,9 @@ |m|a|t|c|h|e|s| @67 |~+0#4040ff13&| @73 |X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 -|X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50 ->X+8#0000e05#ffff4012|C|w|i|n|d|o|w||+8#0000000&|2+8#af5f00255&| |c|o|l| |2|-|3||+8#0000000&| |t|e|x|t| @50 -|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47 +|X+0#0000e05&|C|w|i|n|d|o|w||+0#e000e06&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#e000e06&| +0#0000000&|s|o|m|e| @50 +>X+8#0000e05#ffff4012|C|w|i|n|d|o|w||+8#e000e06&|2+8#af5f00255&| |c|o|l| |2|-|3||+8#e000e06&| +8#0000000&|t|e|x|t| @50 +|X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#e000e06&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#e000e06&| +0#0000000&|m|a|t|c|h|e|s| @47 |~+0#4040ff13&| @73 |[+3#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|2|,|1| @12|A|l@1 |:+0&&| @73 diff --git a/src/testdir/dumps/Test_quickfix_cwindow_4.dump b/src/testdir/dumps/Test_quickfix_cwindow_4.dump index bb92ffc0d..69da0c233 100644 --- a/src/testdir/dumps/Test_quickfix_cwindow_4.dump +++ b/src/testdir/dumps/Test_quickfix_cwindow_4.dump @@ -4,9 +4,9 @@ |m|a|t|c|h|e|s| @67 |~+0#4040ff13&| @73 |X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 -|X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50 -|X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @50 ->X+8#0000e05#ffffff0|C|w|i|n|d|o|w||+8#0000000&|4+8#af5f00255&| |c|o|l| |6|-|7||+8#0000000&| |m|a|t|c|h|e|s| @47 +|X+0#0000e05&|C|w|i|n|d|o|w||+0#e000e06&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#e000e06&| +0#0000000&|s|o|m|e| @50 +|X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#e000e06&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#e000e06&| +0#0000000&|t|e|x|t| @50 +>X+8#0000e05#ffffff0|C|w|i|n|d|o|w||+8#e000e06&|4+8#af5f00255&| |c|o|l| |6|-|7||+8#e000e06&| +8#0000000&|m|a|t|c|h|e|s| @47 |~+0#4040ff13&| @73 |[+3#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|3|,|1| @12|A|l@1 |:+0&&| @73