Mercurial > vim
view runtime/syntax/gitattributes.vim @ 34416:0a458b49e1e6 v9.1.0131
patch 9.1.0131: buffer-completion may not always find all matches
Commit: https://github.com/vim/vim/commit/0dc0bff000fd804c6b0778ccc4554a4e4c82c8c9
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Feb 24 14:12:13 2024 +0100
patch 9.1.0131: buffer-completion may not always find all matches
Problem: buffer-completion code too complicated and does not always
find all matches (irisjae)
Solution: do not try to anchor pattern to beginning of line or
directory-separator, always return all matches
Note: we are considering the non-fuzzy buffer-matching here.
Currently, the buffer-completion code makes 2 attempts to match a
pattern against the list of available patterns. First try is to match
the pattern and anchor it to either the beginning of the file name or
at a directory-separator (// or \\).
When a match is found, Vim returns the matching buffers and does not try
to find a match anywhere within a buffer name. So if you have opened two
buffers like /tmp/Foobar.c and /tmp/MyFoobar.c using `:b Foo` will only
complete to the first filename, but not the second (the same happens
with `getcompletion('Foo', 'buffer')`).
It may make sense, that completion priorities buffer names at directory
boundaries, but it inconsistent, may cause confusion why a certain
buffer name is not completed when typing `:b Foo<C-D>` which returns
only a single file name and then pressing Enter (to switch to that
buffer), Vim will error with 'E93: More than one match for Foo').
Similar things may happen when wiping the /tmp/Foobar.c pattern and
afterwards the completion starts completing other buffers.
So let's simplify the code and always match the pattern anywhere in the
buffer name, do not try to favor matches at directory boundaries. This
is also simplifies the code a bit, we do not need to run over the list
of buffers several times, but only twice.
fixes #13894
closes: #14082
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Feb 2024 14:30:03 +0100 |
| parents | fee9eccee266 |
| children |
line wrap: on
line source
" Vim syntax file " Language: git attributes " Maintainer: ObserverOfTime <chronobserver@disroot.org> " Filenames: .gitattributes, *.git/info/attributes " Last Change: 2022 Sep 09 if exists('b:current_syntax') finish endif let s:cpo_save = &cpoptions set cpoptions&vim " Comment syn keyword gitattributesTodo contained TODO FIXME XXX syn match gitattributesComment /^\s*#.*/ contains=gitattributesTodo " Pattern syn match gitattributesPattern /^\s*#\@!\(".\+"\|\S\+\)/ skipwhite \ nextgroup=gitattributesAttrPrefixed,gitattributesAttrAssigned skipwhite \ contains=gitattributesGlob,gitattributesRange,gitattributesSeparator syn match gitattributesGlob /\\\@1<![?*]/ contained syn match gitattributesRange /\\\@1<!\[.\{-}\]/ contained syn match gitattributesSeparator '/' contained " Attribute syn match gitattributesAttrPrefixed /[!-]\?[A-Za-z0-9_.][-A-Za-z0-9_.]*/ \ transparent contained skipwhite \ nextgroup=gitattributesAttrPrefixed,gitattributesAttrAssigned \ contains=gitattributesPrefix,gitattributesName syn match gitattributesAttrAssigned /[A-Za-z0-9_.][-A-Za-z0-9_.]*=\S\+/ \ transparent contained skipwhite \ nextgroup=gitattributesAttrPrefixed,gitattributesAttrAssigned \ contains=gitattributesName,gitattributesAssign,gitattributesBoolean,gitattributesString syn match gitattributesName /[A-Za-z0-9_.][-A-Za-z0-9_.]*/ \ contained nextgroup=gitattributesAssign syn match gitattributesPrefix /[!-]/ contained \ nextgroup=gitAttributesName syn match gitattributesAssign '=' contained \ nextgroup=gitattributesBoolean,gitattributesString syn match gitattributesString /=\@1<=\S\+/ contained syn keyword gitattributesBoolean true false contained " Macro syn match gitattributesMacro /^\s*\[attr\]\s*\S\+/ \ nextgroup=gitattributesAttribute skipwhite hi def link gitattributesAssign Operator hi def link gitattributesBoolean Boolean hi def link gitattributesComment Comment hi def link gitattributesGlob Special hi def link gitattributesMacro Define hi def link gitattributesName Identifier hi def link gitattributesPrefix SpecialChar hi def link gitattributesRange Special hi def link gitattributesSeparator Delimiter hi def link gitattributesString String hi def link gitattributesTodo Todo let b:current_syntax = 'gitattributes' let &cpoptions = s:cpo_save unlet s:cpo_save