Refactor map implementation and restore which-key compatibility #1029
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Should also restore compatibility with idea-which-key
E.g. `map foo bar` and `vmap foo baz` would only output one map for `foo` when calling `:map`. Now it will output all maps that match the ex command's modes. This change also improves the marker characters in the first column of map output.
Also supports `mapclear!` and `unmap!` Moves parsing of the bang modifier to the parser so we can tell the difference between `map! foo bar` and `map ! foo bar`
Support for sunmap and smapclear already exists, and vmap would introduce a Select mode map. Fixes VIM-2260
Fixes VIM-2981
Allows iterating the trie entries without having to create a list or create a list for each entry's keystrokes.
AlexPl292
approved these changes
Nov 13, 2024
| @@ -31,7 +31,7 @@ import javax.swing.KeyStroke | |||
| /** | |||
| * @author vlan | |||
| */ | |||
| @ExCommand(command = "map,nm[ap],vm[ap],xm[ap],smap,om[ap],im[ap],lm[ap],cm[ap],no[map],nn[oremap],vn[oremap],xn[oremap],snor[emap],ono[remap],no[remap],ino[remap],ln[oremap],cno[remap]") | |||
| @ExCommand(command = "map,nm[ap],vm[ap],xm[ap],smap,om[ap],im[ap],lm[ap],cm[ap],nn[oremap],vn[oremap],xn[oremap],snor[emap],ono[remap],no[remap],ino[remap],ln[oremap],cno[remap]") | |||
There was a problem hiding this comment.
It's not a Vim command! There's nmap and noremap but no nomap
There was a problem hiding this comment.
Huh! I can't track the change again, but this is funny :D
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR restores compatibility with idea-which-key, which was broken due to changes to
CommandPartNodein #979.The
CommandPartNode<T>classes have been deprecated and reimplemented in terms of a newKeyStrokeTrie<T>class, that efficiently maps sequences ofKeyStroketo dataT. The trie structure is used to store and look up the builtin Vim commands (represented by aTofLazyVimCommand). TheCommandPartNodeAPI is restored to how it was before #979, and should work with the last released version of which-key.It would be appropriate for which-key to migrate to the new API, which can provide more efficient lookup and iteration.
The new trie structure is now also used for user maps, simplifying and optimising storage and lookup of both finished key sequences and prefixes. While refactoring handling of the
mapcommands, several fixes have been made:vmapfor Visual + Select,mapfor Normal, Visual, Select and Op-pending. The maps will now have the proper character indicator(s), especially when a map is made in multiple modes and then removed in one, e.g.map foo barfollowed bysunmap foowill now outputnox foo barmap foowill show all maps beginning withfooinstead of creating a map fromfooto<Nop>) - VIM-2981map!,unmap!andmapclear!to add a map in Insert+Command-line modessmapandsnoremap.sunmapwas already supported, and mapping to Select mode was already possible withvmap- VIM-2260The support for
map!required adding the "bang modifier" to the parser, rather than relying on the first character of the trailing string argument - this is required to tell the difference betweenmap! foo barandmap ! foo bar.The trie is also used in the NERDTree extension