Handle mode condition in inputrc #687
Merged
Conversation
This file contains hidden or 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
ima1zumi force-pushed the treat-mode-condition branch from 3096fcd to 2c45901 Compare 
tompng reviewed Apr 25, 2024
lib/reline/config.rb Outdated
Comment on lines 242 to 243
| condition = true | ||
| @editing_mode_section = $1.downcase == 'emacs' ? 'emacs' : 'vi' |
Member
There was a problem hiding this comment.
condition should be true only when editing_mode_label matches arg.
"\e\C-j": vi-editing-mode "\C-e": emacs-editing-mode set editing-mode vi set keymap emacs $if mode=emacs # skipped because editing-mode(==vi) is not emacs "x": "A" $else # executed. set emacs-keymap "x" to "B" (insert "B") "x": "B" $endif # type ESC C-e to switch to emacs mode, type x, then B is inserted "\e\C-j": vi-editing-mode "\C-e": emacs-editing-mode set editing-mode emacs set keymap vi $if mode=vi # skipped because editing-mode(==emacs) is not vi "x": "A" $else # executed. set vi-keymap "x" to "iB" (switch to insert mode and insert "B") "x": "iB" $endif # type ESC C-j to switch to vi-insert, type ESC to switch to vi-command, type x, then B is inserted And looks like key is registered to keymap (== @keymap_label), so I think we don't need to introduce @editing_mode_section.
Member Author
There was a problem hiding this comment.
Indeed, you're right. I've fixed it!
ima1zumi force-pushed the treat-mode-condition branch from 2c45901 to 2164313 Compare tompng reviewed Apr 25, 2024
test/reline/test_config.rb Outdated
| | ||
| assert_equal({[5] => :history_search_backward}, @config.instance_variable_get(:@additional_key_bindings)[:vi_insert]) | ||
| assert_equal({}, @config.instance_variable_get(:@additional_key_bindings)[:vi_command]) | ||
| assert_equal({}, @config.instance_variable_get(:@additional_key_bindings)[:emacs]) |
Member
There was a problem hiding this comment.
I think this test case is wrong.
With this inputrc file saved to ./inputrc
$if mode=vi "x": "X" $else "y": "Y" $endif Only "y"→"Y", the $else part is reflected.
$ echo x | INPUTRC=./inputrc ruby -rreadline -e "p Readline::VERSION; Readline.readline'>'" "8.2" >x $ echo y | INPUTRC=./inputrc ruby -rreadline -e "p Readline::VERSION; Readline.readline'>'" "8.2" >Y Member Author
There was a problem hiding this comment.
Thanks for letting me know! I've fixed it and added tests.
ima1zumi force-pushed the treat-mode-condition branch 2 times, most recently from 59e22dd to 2d6c5a6 Compare tompng reviewed Apr 27, 2024
lib/reline/config.rb Outdated
| mode = $1.downcase | ||
| if @editing_mode_label == mode.to_sym | ||
| condition = true | ||
| @keymap_label = mode == 'emacs' ? :emacs : :vi_insert |
Member
There was a problem hiding this comment.
I think if mode=xxx does not modify keymap_label.
I tried this inputrc
set editing-mode vi set keymap emacs $if mode=vi "x": "FOOBAR" $endifWith this command. Typing x in vi mode just inserts x. After switching to emacs mode with \e\C-e, typing x inserts FOOBAR.
$ ruby -e 'puts "vi:x, \e\C-e\C-eemacs:x"' | ruby -rreadline -e "puts Readline::VERSION;Readline.readline('>')" 8.2 >vi:x, emacs:FOOBAR I think Readline reads inputrc like this
# Sets mode_label and keymap_label to vi set editing-mode vi # Change keymap_label to emacs. mode_label is still vi. set keymap emacs # condition=true because current mode_label is vi $if mode=vi # sets keybinding to current keymap_label=emacs "x": "FOOBAR" $endif Member Author
There was a problem hiding this comment.
Thanks for letting me know. I fixed. If you see anything else wrong, please let me know 🙏
ima1zumi force-pushed the treat-mode-condition branch from 2d6c5a6 to f9a8a6b Compare 
ima1zumi force-pushed the treat-mode-condition branch from f9a8a6b to d280958 Compare 
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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.
Close: #624
I've implemented
.inputrcto properly handle themode, which can be set to eitheremacsorvi. Forvi, set tovi_insertmode.Upon checking Readline's behavior, it appears that
elseis entered when themodecheck fails.For instance, if
$if mode=viis written,elsewill not be executed.ref: https://tiswww.case.edu/php/chet/readline/readline.html#Conditional-Init-Constructs