8000 Correct var names in Reline were different from vi-*-mode-string · ruby/reline@8255fc9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8255fc9

Browse files
aycabtaaycabta
committed
Correct var names in Reline were different from vi-*-mode-string
1 parent 064664c commit 8255fc9

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎lib/reline/config.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class InvalidInputrc < RuntimeError
3434
show-all-if-unmodified
3535
visible-stats
3636
show-mode-in-prompt
37-
vi-cmd-mode-icon
38-
vi-ins-mode-icon
37+
vi-cmd-mode-string
38+
vi-ins-mode-string
3939
emacs-mode-string
4040
enable-bracketed-paste
4141
isearch-terminators
@@ -56,8 +56,8 @@ def initialize
5656
@key_actors[:emacs] = Reline::KeyActor::Emacs.new
5757
@key_actors[:vi_insert] = Reline::KeyActor::ViInsert.new
5858
@key_actors[:vi_command] = Reline::KeyActor::ViCommand.new
59-
@vi_cmd_mode_icon = '(cmd)'
60-
@vi_ins_mode_icon = '(ins)'
59+
@vi_cmd_mode_string = '(cmd)'
60+
@vi_ins_mode_string = '(ins)'
6161
@emacs_mode_string = '@'
6262
# https://tiswww.case.edu/php/chet/readline/readline.html#IDX25
6363
@history_size = -1 # unlimited
@@ -270,9 +270,9 @@ def bind_variable(name, value)
270270
@show_mode_in_prompt = false
271271
end
272272
when 'vi-cmd-mode-string'
273-
@vi_cmd_mode_icon = retrieve_string(value)
273+
@vi_cmd_mode_string = retrieve_string(value)
274274
when 'vi-ins-mode-string'
275-
@vi_ins_mode_icon = retrieve_string(value)
275+
@vi_ins_mode_string = retrieve_string(value)
276276
when 'emacs-mode-string'
277277
@emacs_mode_string = retrieve_string(value)
278278
when *VARIABLE_NAMES then

‎lib/reline/line_editor.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@ def simplified_rendering?
6868
end
6969
end
7070

71-
private def check_mode_icon
72-
mode_icon = nil
71+
private def check_mode_string
72+
mode_string = nil
7373
if @config.show_mode_in_prompt
7474
if @config.editing_mode_is?(:vi_command)
75-
mode_icon = @config.vi_cmd_mode_icon
75+
mode_string = @config.vi_cmd_mode_string
7676
elsif @config.editing_mode_is?(:vi_insert)
77-
mode_icon = @config.vi_ins_mode_icon
77+
mode_string = @config.vi_ins_mode_string
7878
elsif @config.editing_mode_is?(:emacs)
79-
mode_icon = @config.emacs_mode_string
79+
mode_string = @config.emacs_mode_string
8080
else
81-
mode_icon = '?'
81+
mode_string = '?'
8282
end
8383
end
84-
if mode_icon != @prev_mode_icon
84+
if mode_string != @prev_mode_string
8585
@rerender_all = true
8686
end
87-
@prev_mode_icon = mode_icon
88-
mode_icon
87+
@prev_mode_string = mode_string
88+
mode_string
8989
end
9090

9191
private def check_multiline_prompt(buffer, prompt)
@@ -99,8 +99,8 @@ def simplified_rendering?
9999
prompt = @prompt
100100
end
101101
if simplified_rendering?
102-
mode_icon = check_mode_icon
103-
prompt = mode_icon + prompt if mode_icon
102+
mode_string = check_mode_string
103+
prompt = mode_string + prompt if mode_string
104104
return [prompt, calculate_width(prompt, true), [prompt] * buffer.size]
105105
end
106106
if @prompt_proc
@@ -119,15 +119,15 @@ def simplified_rendering?
119119
@prompt_cache_time = Time.now.to_f
120120
end
121121
prompt_list.map!{ prompt } if @vi_arg or @searching_prompt
122-
mode_icon = check_mode_icon
123-
prompt_list = prompt_list.map{ |pr| mode_icon + pr } if mode_icon
122+
mode_string = check_mode_string
123+
prompt_list = prompt_list.map{ |pr| mode_string + pr } if mode_string
124124
prompt = prompt_list[@line_index]
125125
prompt = prompt_list[0] if prompt.nil?
126126
prompt_width = calculate_width(prompt, true)
127127
[prompt, prompt_width, prompt_list]
128128
else
129-
mode_icon = check_mode_icon
130-
prompt = mode_icon + prompt if mode_ico 6D40 n
129+
mode_string = check_mode_string
130+
prompt = mode_string + prompt if mode_string
131131
prompt_width = calculate_width(prompt, true)
132132
[prompt, prompt_width, nil]
133133
end
@@ -218,7 +218,7 @@ def reset_variables(prompt = '', encoding:)
218218
@eof = false
219219
@continuous_insertion_buffer = String.new(encoding: @encoding)
220220
@scroll_partial_screen = nil
221-
@prev_mode_icon = nil
221+
@prev_mode_string = nil
222222
@drop_terminate_spaces = false
223223
reset_line
224224
end

‎test/reline/yamatanooroti/test_rendering.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def test_prompt
152152
EOC
153153
end
154154

155-
def test_mode_icon_emacs
155+
def test_mode_string_emacs
156156
write_inputrc <<~LINES
157157
set show-mode-in-prompt on
158158
LINES
@@ -164,7 +164,7 @@ def test_mode_icon_emacs
164164
EOC
165165
end
166166

167-
def test_mode_icon_vi
167+
def test_mode_string_vi
168168
write_inputrc <<~LINES
169169
set editing-mode vi
170170
set show-mode-in-prompt on
@@ -180,7 +180,7 @@ def test_mode_icon_vi
180180
EOC
181181
end
182182

183-
def test_original_mode_icon_emacs
183+
def test_original_mode_string_emacs
184184
write_inputrc <<~LINES
185185
set show-mode-in-prompt on
186186
set emacs-mode-string [emacs]
@@ -193,7 +193,7 @@ def test_original_mode_icon_emacs
193193
EOC
194194
end
195195

196-
def test_original_mode_icon_with_quote
196+
def test_original_mode_string_with_quote
197197
write_inputrc <<~LINES
198198
set show-mode-in-prompt on
199199
set emacs-mode-string "[emacs]"
@@ -206,7 +206,7 @@ def test_original_mode_icon_with_quote
206206
EOC
207207
end
208208

209-
def test_original_mode_icon_vi
209+
def test_original_mode_string_vi
210210
write_inputrc <<~LINES
211211
set editing-mode vi
212212
set show-mode-in-prompt on
@@ -224,7 +224,7 @@ def test_original_mode_icon_vi
224224
EOC
225225
end
226226

227-
def test_mode_icon_vi_changing
227+
def test_mode_string_vi_changing
228228
write_inputrc <<~LINES
229229
set editing-mode vi
230230
set show-mode-in-prompt on

0 commit comments

Comments
 (0)
0