Mercurial > vim
view runtime/syntax/json5.vim @ 33674:021e5bb88513 v9.0.2074
patch 9.0.2074: Completion menu may be wrong
Commit: https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Oct 27 19:16:26 2023 +0200
patch 9.0.2074: Completion menu may be wrong
Problem: Completion menu may be wrong
Solution: Check for the original direction of the completion menu,
add more tests, make it work with 'noselect'
completion: move in right direction when filling completion_info()
When moving through the insert completion menu and switching directions,
we need to make sure we start at the correct position in the list and
move correctly forward/backwards through it, so that we do not skip
entries and the selected item points to the correct entry in the list
of completion entries generated by the completion_info() function.
The general case is this:
1) CTRL-X CTRL-N, we will traverse the list starting from
compl_first_match and then go forwards (using the cp->next pointer)
through the list (skipping the very first entry, which has the
CP_ORIGINAL_TEXT flag set (since that is the empty/non-selected entry
2) CTRL-X CTRL-P, we will traverse the list starting from
compl_first_match (which now points to the last entry). The previous
entry will have the CP_ORIGINAL_TEXT flag set, so we need to start
traversing the list from the second prev pointer.
There are in fact 2 special cases after starting the completion menu
with CTRL-X:
3) CTRL-N and then going backwards by pressing CTRL-P again.
compl_first_match will point to the same entry as in step 1 above,
but since compl_dir_foward() has been switched by pressing CTRL-P
to backwards we need to pretend to be in still in case 1 and still
traverse the list in forward direction using the cp_next pointer
4) CTRL-P and then going forwards by pressing CTRL-N again.
compl_first_match will point to the same entry as in step 2 above,
but since compl_dir_foward() has been switched by pressing CTRL-N
to forwards we need to pretend to be in still in case 2 and still
traverse the list in backward direction using the cp_prev pointer
For the 'noselect' case however, this is slightly different again. When
going backwards, we only need to go one cp_prev pointer back. And
resting of the direction works again slightly different. So we need to
take the noselect option into account when deciding in which direction
to iterate through the list of matches.
related: #13402
related: #12971
closes: #13408
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 27 Oct 2023 19:30:05 +0200 |
parents | 0234f91bc590 |
children | b1f32ec709ae |
line wrap: on
line source
" Vim syntax file " Language: JSON5 " Maintainer: Mazunki Hoksaas rolferen@gmail.com " Previous Maintainer: Guten Ye <ywzhaifei@gmail.com> " Last Change: 2019 Apr 1 " Version: vim9.0-1 " URL: https://github.com/json5/json5 " Syntax setup if exists('b:current_syntax') && b:current_syntax == 'json5' finish endif " Numbers syn match json5Number "[-+]\=\%(0\|[1-9]\d*\)\%(\.\d*\)\=\%([eE][-+]\=\d\+\)\=" syn match json5Number "[-+]\=\%(\.\d\+\)\%([eE][-+]\=\d\+\)\=" syn match json5Number "[-+]\=0[xX]\x*" syn match json5Number "[-+]\=Infinity\|NaN" " An integer part of 0 followed by other digits is not allowed syn match json5NumError "[-+]\=0\d\(\d\|\.\)*" " A hexadecimal number cannot have a fractional part syn match json5NumError "[-+]\=0x\x*\.\x*" " Strings syn region json5String start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=json5Escape,@Spell syn region json5String start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=json5Escape,@Spell " Escape sequences syn match json5Escape "\\['\"\\bfnrtv]" contained syn match json5Escape "\\u\x\{4}" contained " Boolean syn keyword json5Boolean true false " Null syn keyword json5Null null " Delimiters and Operators syn match json5Delimiter "," syn match json5Operator ":" " Braces syn match json5Braces "[{}\[\]]" " Keys syn match json5Key /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/ contains=@Spell syn match json5Key /"\([^"]\|\\"\)\{-}"\ze\s*:/ contains=json5Escape,@Spell " Comment syn region json5LineComment start=+\/\/+ end=+$+ keepend contains=@Spell syn region json5LineComment start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold contains=@Spell syn region json5Comment start="/\*" end="\*/" fold contains=@Spell " Define the default highlighting hi def link json5String String hi def link json5Key Identifier hi def link json5Escape Special hi def link json5Number Number hi def link json5Delimiter Delimiter hi def link json5Operator Operator hi def link json5Braces Delimiter hi def link json5Null Keyword hi def link json5Boolean Boolean hi def link json5LineComment Comment hi def link json5Comment Comment hi def link json5NumError Error if !exists('b:current_syntax') let b:current_syntax = 'json5' endif