Skip to content

Commit f30eb4a

Browse files
dkearnschrisbra
dkearns
authored and
chrisbra
committed
runtime(qf): Update syntax file, match second delimiter
Match both | separators and link to the Delimiter highlight group. fixes #16584 closes: #16590 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 3cfac59 commit f30eb4a

5 files changed

Lines changed: 30 additions & 23 deletions

File tree

‎runtime/syntax/qf.vim‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
" Vim syntax file
2-
" Language: Quickfix window
3-
" Maintainer: The Vim Project <https://github.com/vim/vim>
4-
" Last Change: 2023 Aug 10
2+
" Language: Quickfix window
3+
" Maintainer: The Vim Project <https://github.com/vim/vim>
4+
" Last Change: 2025 Feb 07
55
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
66

77
" Quit when a syntax file was already loaded
88
if exists("b:current_syntax")
99
finish
1010
endif
1111

12-
" A bunch of useful C keywords
13-
syn match qfFileName "^[^|]*" nextgroup=qfSeparator
14-
syn match qfSeparator "|" nextgroup=qfLineNr contained
15-
syn match qfLineNr "[^|]*" contained contains=qfError
16-
syn match qfError "error" contained
12+
syn match qfFileName "^[^|]*" nextgroup=qfSeparator1
13+
syn match qfSeparator1 "|" contained nextgroup=qfLineNr
14+
syn match qfLineNr "[^|]*" contained nextgroup=qfSeparator2 contains=@qfType
15+
syn match qfSeparator2 "|" contained nextgroup=qfText
16+
syn match qfText ".*" contained
17+
18+
syn match qfError "error" contained
19+
syn cluster qfType contains=qfError
1720

1821
" The default highlighting.
19-
hi def link qfFileName Directory
20-
hi def link qfLineNr LineNr
21-
hi def link qfError Error
22+
hi def link qfFileName Directory
23+
hi def link qfLineNr LineNr
24+
hi def link qfSeparator1 Delimiter
25+
hi def link qfSeparator2 Delimiter
26+
hi def link qfText Normal
27+
28+
hi def link qfError Error
2229

2330
let b:current_syntax = "qf"
2431

‎src/testdir/dumps/Test_quickfix_cwindow_1.dump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
|m|a|t|c|h|e|s| @67
55
|~+0#4040ff13&| @73
66
|X+1#0000000&|C|w|i|n|d|o|w| @48|1|,|4| @11|A|l@1
7-
>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
8-
|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
9-
|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
7+
>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
8+
|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
9+
|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
1010
|~+0#4040ff13&| @73
1111
|[+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
1212
| +0&&@74

‎src/testdir/dumps/Test_quickfix_cwindow_2.dump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
|m|a|t|c|h|e|s| @67
55
|~+0#4040ff13&| @73
66
|X+3#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1
7-
|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
8-
|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
9-
|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
7+
|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
8+
|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
9+
|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
1010
|~+0#4040ff13&| @73
1111
|[+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
1212
|:+0&&|c|n|e|x|t| @68

‎src/testdir/dumps/Test_quickfix_cwindow_3.dump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
|m|a|t|c|h|e|s| @67
55
|~+0#4040ff13&| @73
66
|X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1
7-
|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
8-
>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
9-
|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
7+
|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
8+
>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
9+
|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
1010
|~+0#4040ff13&| @73
1111
|[+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
1212
|:+0&&| @73

‎src/testdir/dumps/Test_quickfix_cwindow_4.dump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
|m|a|t|c|h|e|s| @67
55
|~+0#4040ff13&| @73
66
|X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1
7-
|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
8-
|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
9-
>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
7+
|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
8+
|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
9+
>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
1010
|~+0#4040ff13&| @73
1111
|[+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
1212
|:+0&&| @73

0 commit comments

Comments
 (0)