thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

runtime(qf): Update syntax file, match second delimiter

Browse Source 
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>
This commit is contained in:
Doug Kearns
2025-02-09 18:40:05 +01:00
committed by Christian Brabandt
parent 3cfac59f92
commit f30eb4a170
5 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/syntax/qf.vim
View File

@@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: Quickfix window " Language: Quickfix window
" Maintainer: The Vim Project <https://github.com/vim/vim> " Maintainer: The Vim Project <https://github.com/vim/vim>
" Last Change: 2023 Aug 10 " Last Change: 2025 Feb 07
" Former Maintainer: Bram Moolenaar <Bram@vim.org> " Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Quit when a syntax file was already loaded " Quit when a syntax file was already loaded
@@ -9,15 +9,22 @@ if exists("b:current_syntax")
finish finish
endif endif
" A bunch of useful C keywords syn match qfFileName "^[^|]*" nextgroup=qfSeparator1
syn match qfFileName "^[^|]*" nextgroup=qfSeparator syn match qfSeparator1 "|" contained nextgroup=qfLineNr
syn match qfSeparator "|" nextgroup=qfLineNr contained syn match qfLineNr "[^|]*" contained nextgroup=qfSeparator2 contains=@qfType
syn match qfLineNr "[^|]*" contained contains=qfError syn match qfSeparator2 "|" contained nextgroup=qfText
syn match qfText ".*" contained
syn match qfError "error" contained syn match qfError "error" contained
syn cluster qfType contains=qfError
" The default highlighting. " The default highlighting.
hi def link qfFileName Directory hi def link qfFileName Directory
hi def link qfLineNr LineNr 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 hi def link qfError Error
let b:current_syntax = "qf" let b:current_syntax = "qf"

6
src/testdir/dumps/Test_quickfix_cwindow_1.dump
View File

@@ -4,9 +4,9 @@
|m|a|t|c|h|e|s| @67 |m|a|t|c|h|e|s| @67
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|X+1#0000000&|C|w|i|n|d|o|w| @48|1|,|4| @11|A|l@1 |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#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#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#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#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&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#e000e06&| +0#0000000&|m|a|t|c|h|e|s| @47
|~+0#4040ff13&| @73 |~+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 |[+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 | +0&&@74

6
src/testdir/dumps/Test_quickfix_cwindow_2.dump
View File

@@ -4,9 +4,9 @@
|m|a|t|c|h|e|s| @67 |m|a|t|c|h|e|s| @67
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|X+3#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 |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&|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#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @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#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47 |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 |~+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 |[+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 |:+0&&|c|n|e|x|t| @68

6
src/testdir/dumps/Test_quickfix_cwindow_3.dump
View File

@@ -4,9 +4,9 @@
|m|a|t|c|h|e|s| @67 |m|a|t|c|h|e|s| @67
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 |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&|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#0000000&|2+8#af5f00255&| |c|o|l| |2|-|3||+8#0000000&| |t|e|x|t| @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#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47 |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 |~+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 |[+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 |:+0&&| @73

6
src/testdir/dumps/Test_quickfix_cwindow_4.dump
View File

@@ -4,9 +4,9 @@
|m|a|t|c|h|e|s| @67 |m|a|t|c|h|e|s| @67
|~+0#4040ff13&| @73 |~+0#4040ff13&| @73
|X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1 |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&|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#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @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#0000000&|4+8#af5f00255&| |c|o|l| |6|-|7||+8#0000000&| |m|a|t|c|h|e|s| @47 >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 |~+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 |[+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 |:+0&&| @73