mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:f30eb4a: runtime(qf): Update syntax file, match second delimiter

Browse Source 
Match both | separators and link to the Delimiter highlight group.

fixes vim/vim#16584
closes: vim/vim#16590

f30eb4a170

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
This commit is contained in:
Christian Clason
2025-02-09 18:44:26 +01:00
committed by Christian Clason
parent e6b84fab83
commit ad8e0cfc1d
2 changed files with 78 additions and 67 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,11 +9,14 @@ 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
" Hide file name and line number for help outline (TOC). " Hide file name and line number for help outline (TOC).
if has_key(w:, 'qf_toc') || get(w:, 'quickfix_title') =~# '\<TOC$' if has_key(w:, 'qf_toc') || get(w:, 'quickfix_title') =~# '\<TOC$'
@@ -24,6 +27,10 @@ endif
" 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"

116
test/functional/ui/quickfix_spec.lua
View File

@@ -12,18 +12,22 @@ describe('quickfix selection highlight', function()
screen = Screen.new(25, 10) screen = Screen.new(25, 10)
screen:set_default_attr_ids({ screen:set_default_attr_ids({
[1] = { bold = true, foreground = Screen.colors.Blue }, [1] = { foreground = Screen.colors.Blue, bold = true },
[2] = { reverse = true }, [2] = { reverse = true },
[3] = { foreground = Screen.colors.Brown }, [3] = { foreground = Screen.colors.Brown },
[4] = { bold = true, reverse = true }, [4] = { reverse = true, bold = true },
[5] = { background = Screen.colors.Green }, [5] = { background = Screen.colors.WebGreen },
[6] = { foreground = Screen.colors.Brown, background = Screen.colors.Green }, [6] = { background = Screen.colors.WebGreen, foreground = Screen.colors.Brown },
[7] = { background = Screen.colors.Red }, [7] = { background = Screen.colors.Red1 },
[8] = { foreground = Screen.colors.Brown, background = Screen.colors.Red }, [8] = { background = Screen.colors.Red1, foreground = Screen.colors.Brown },
[9] = { background = Screen.colors.Fuchsia }, [9] = { background = Screen.colors.Magenta },
[10] = { foreground = Screen.colors.Red, background = Screen.colors.Fuchsia }, [10] = { background = Screen.colors.Magenta, foreground = Screen.colors.Red1 },
[11] = { foreground = Screen.colors.Red }, [11] = { foreground = Screen.colors.Red1 },
[12] = { foreground = Screen.colors.Brown, background = Screen.colors.Fuchsia }, [12] = { background = Screen.colors.Magenta, foreground = Screen.colors.Brown },
[13] = { background = Screen.colors.WebGreen, foreground = Screen.colors.SlateBlue },
[14] = { foreground = Screen.colors.SlateBlue },
[15] = { foreground = Screen.colors.SlateBlue, background = Screen.colors.Red1 },
[16] = { foreground = Screen.colors.SlateBlue, background = Screen.colors.Fuchsia },
}) })
api.nvim_set_option_value('errorformat', '%m %l', {}) api.nvim_set_option_value('errorformat', '%m %l', {})
@@ -59,12 +63,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
Line 1 | Line 1 |
{2:[No Name] [+] }| {2:[No Name] [+] }|
{5:^|}{6:1}{5:| Line }| {13:^|}{6:1}{13:|}{5: Line }|
|{3:2}| Line | {14:|}{3:2}{14:|} Line |
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -74,12 +78,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
Line 1 | Line 1 |
{2:[No Name] [+] }| {2:[No Name] [+] }|
|{3:1}| Line | {14:|}{3:1}{14:|} Line |
{5:^|}{6:2}{5:| Line }| {13:^|}{6:2}{13:|}{5: Line }|
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -93,12 +97,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
Line 1 | Line 1 |
{2:[No Name] [+] }| {2:[No Name] [+] }|
{7:^|}{8:1}{7:| Line }| {15:^|}{8:1}{15:|}{7: Line }|
|{3:2}| Line | {14:|}{3:2}{14:|} Line |
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -108,12 +112,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
Line 1 | Line 1 |
{2:[No Name] [+] }| {2:[No Name] [+] }|
|{3:1}| Line | {14:|}{3:1}{14:|} Line |
{7:^|}{8:2}{7:| Line }| {15:^|}{8:2}{15:|}{7: Line }|
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -130,11 +134,11 @@ describe('quickfix selection highlight', function()
{9:Line 1 }| {9:Line 1 }|
{2:[No Name] [+] }| {2:[No Name] [+] }|
{10:^|1| Line }| {10:^|1| Line }|
|{3:2}| Line | {14:|}{3:2}{14:|} Line |
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -145,11 +149,11 @@ describe('quickfix selection highlight', function()
{9:Line 1 }| {9:Line 1 }|
{2:[No Name] [+] }| {2:[No Name] [+] }|
{11:|1| Line }| {11:|1| Line }|
{9:^|}{12:2}{9:| Line }| {16:^|}{12:2}{16:|}{9: Line }|
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -165,12 +169,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
{9:Line 1 }| {9:Line 1 }|
{2:[No Name] [+] }| {2:[No Name] [+] }|
{7:^|}{8:1}{7:| Line }| {15:^|}{8:1}{15:|}{7: Line }|
|{3:2}| Line | {14:|}{3:2}{14:|} Line |
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])
@@ -180,12 +184,12 @@ describe('quickfix selection highlight', function()
screen:expect([[ screen:expect([[
{9:Line 1 }| {9:Line 1 }|
{2:[No Name] [+] }| {2:[No Name] [+] }|
{7:|}{8:1}{7:| Line }| {15:|}{8:1}{15:|}{7: Line }|
{9:^|}{12:2}{9:| Line }| {16:^|}{12:2}{16:|}{9: Line }|
|{3:3}| Line | {14:|}{3:3}{14:|} Line |
|{3:4}| Line | {14:|}{3:4}{14:|} Line |
|{3:5}| Line | {14:|}{3:5}{14:|} Line |
|| | {14:||} |
{4:[Quickfix List] }| {4:[Quickfix List] }|
| |
]]) ]])