Mercurial > vim
view runtime/syntax/poefilter.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 | a9b5ffbc0428 |
| children |
line wrap: on
line source
" Vim syntax file " Language: PoE item filter " Maintainer: ObserverOfTime <chronobserver@disroot.org> " Filenames: *.filter " Last Change: 2023 Feb 10 if exists('b:current_syntax') finish endif let s:cpo_save = &cpoptions set cpoptions&vim " Comment syn keyword poefilterTodo TODO NOTE XXX contained syn match poefilterCommentTag /\[[0-9A-Z\[\]]\+\]/ contained syn match poefilterComment /#.*$/ contains=poefilterTodo,poefilterCommentTag,@Spell " Blocks syn keyword poefilterBlock Show Hide Minimal " Conditions syn keyword poefilterCondition \ AlternateQuality \ AnyEnchantment \ BlightedMap \ Corrupted \ ElderItem \ ElderMap \ FracturedItem \ Identified \ Mirrored \ Replica \ Scourged \ ShapedMap \ ShaperItem \ SynthesisedItem \ UberBlightedMap \ skipwhite nextgroup=poefilterBoolean syn keyword poefilterCondition \ ArchnemesisMod \ BaseType \ Class \ EnchantmentPassiveNode \ HasEnchantment \ HasExplicitMod \ ItemLevel \ SocketGroup \ Sockets \ skipwhite nextgroup=poefilterOperator,poefilterString syn keyword poefilterCondition \ AreaLevel \ BaseArmour \ BaseDefencePercentile \ BaseEnergyShield \ BaseEvasion \ BaseWard \ CorruptedMods \ DropLevel \ EnchantmentPassiveNum \ GemLevel \ HasEaterOfWorldsImplicit \ HasSearingExarchImplicit \ Height \ LinkedSockets \ MapTier \ Quality \ StackSize \ Width \ skipwhite nextgroup=poefilterOperator,poefilterNumber syn keyword poefilterCondition \ GemQualityType \ skipwhite nextgroup=poefilterString,poefilterQuality syn keyword poefilterCondition \ HasInfluence \ skipwhite nextgroup=poefilterString,poefilterInfluence syn keyword poefilterCondition \ Rarity \ skipwhite nextgroup=poefilterString,poefilterRarity " Actions syn keyword poefilterAction \ PlayAlertSound \ PlayAlertSoundPositional \ skipwhite nextgroup=poefilterNumber,poefilterDisable syn keyword poefilterAction \ CustomAlertSound \ CustomAlertSoundOptional \ skipwhite nextgroup=poefilterString syn keyword poefilterAction \ DisableDropSound \ EnableDropSound \ DisableDropSoundIfAlertSound \ EnableDropSoundIfAlertSound \ skipwhite nextgroup=poefilterBoolean syn keyword poefilterAction \ MinimapIcon \ SetBackgroundColor \ SetBorderColor \ SetFontSize \ SetTextColor \ skipwhite nextgroup=poefilterNumber syn keyword poefilterAction \ PlayEffect \ skipwhite nextgroup=poefilterColour " Operators syn match poefilterOperator /!\|[<>=]=\?/ contained \ skipwhite nextgroup=poefilterString,poefilterNumber, \ poefilterQuality,poefilterRarity,poefilterInfluence " Arguments syn match poefilterString /[-a-zA-Z0-9:,']/ contained contains=@Spell \ skipwhite nextgroup=poefilterString,poefilterNumber, \ poefilterQuality,poefilterRarity,poefilterInfluence syn region poefilterString matchgroup=poefilterQuote keepend \ start=/"/ end=/"/ concealends contained contains=@Spell \ skipwhite nextgroup=poefilterString,poefilterNumber, \ poefilterQuality,poefilterRarity,poefilterInfluence syn match poefilterNumber /-1\|0\|[1-9][0-9]*/ contained \ skipwhite nextgroup=poefilterString,poefilterNumber, \ poefilterQuality,poefilterRarity,poefilterInfluence,poefilterColour syn keyword poefilterBoolean True False contained " Special arguments (conditions) syn keyword poefilterQuality Superior Divergent Anomalous Phantasmal \ contained skipwhite nextgroup=poefilterString,poefilterQuality syn keyword poefilterRarity Normal Magic Rare Unique \ contained skipwhite nextgroup=poefilterString,poefilterRarity syn keyword poefilterInfluence Shaper Elder \ Crusader Hunter Redeemer Warlord None \ contained skipwhite nextgroup=poefilterString,poefilterInfluence " Special arguments (actions) syn keyword poefilterColour Red Green Blue Brown \ White Yellow Cyan Grey Orange Pink Purple \ contained skipwhite nextgroup=poefilterShape,poefilterTemp syn keyword poefilterShape Circle Diamond Hecagon Square Star Triangle \ Cross Moon Raindrop Kite Pentagon UpsideDownHouse contained syn keyword poefilterDisable None contained syn keyword poefilterTemp Temp contained " Colours hi def link poefilterAction Statement hi def link poefilterBlock Structure hi def link poefilterBoolean Boolean hi def link poefilterColour Special hi def link poefilterComment Comment hi def link poefilterCommentTag SpecialComment hi def link poefilterCondition Conditional hi def link poefilterDisable Constant hi def link poefilterInfluence Special hi def link poefilterNumber Number hi def link poefilterOperator Operator hi def link poefilterQuality Special hi def link poefilterQuote Delimiter hi def link poefilterRarity Special hi def link poefilterShape Special hi def link poefilterString String hi def link poefilterTemp StorageClass hi def link poefilterTodo Todo let b:current_syntax = 'poefilter' let &cpoptions = s:cpo_save unlet s:cpo_save