@@ -103,15 +103,6 @@ macro_rules! key {
103103 };
104104}
105105
106−macro_rules! shift {
107− ($($ch:tt)*) => {
108− KeyEvent {
109− code: KeyCode::Char($($ch)*),
110− modifiers: KeyModifiers::SHIFT,
111− }
112− };
113−}
114−
115106macro_rules! ctrl {
116107 ($($ch:tt)*) => {
117108 KeyEvent {
@@ -139,8 +130,8 @@ pub fn default() -> Keymaps {
139130
140131 key!('t') => commands::find_till_char,
141132 key!('f') => commands::find_next_char,
142− shift!('T') => commands::till_prev_char,
143− shift!('F') => commands::find_prev_char,
133+ key!('T') => commands::till_prev_char,
134+ key!('F') => commands::find_prev_char,
144135 // and matching set for select mode (extend)
145136 //
146137 key!('r') => commands::replace,
@@ -157,11 +148,11 @@ pub fn default() -> Keymaps {
157148 key!(':') => commands::command_mode,
158149
159150 key!('i') => commands::insert_mode,
160− shift!('I') => commands::prepend_to_line,
151+ key!('I') => commands::prepend_to_line,
161152 key!('a') => commands::append_mode,
162− shift!('A') => commands::append_to_line,
153+ key!('A') => commands::append_to_line,
163154 key!('o') => commands::open_below,
164− shift!('O') => commands::open_above,
155+ key!('O') => commands::open_above,
165156 // [<space> ]<space> equivalents too (add blank new line, no edit)
166157
167158
@@ -174,12 +165,12 @@ pub fn default() -> Keymaps {
174165
175166 key!('s') => commands::select_regex,
176167 alt!('s') => commands::split_selection_on_newline,
177− shift!('S') => commands::split_selection,
168+ key!('S') => commands::split_selection,
178169 key!(';') => commands::collapse_selection,
179170 alt!(';') => commands::flip_selections,
180171 key!('%') => commands::select_all,
181172 key!('x') => commands::select_line,
182− shift!('X') => commands::extend_line,
173+ key!('X') => commands::extend_line,
183174 // or select mode X?
184175 // extend_to_whole_line, crop_to_whole_line
185176
@@ -199,25 +190,25 @@ pub fn default() -> Keymaps {
199190 key!('/') => commands::search,
200191 // ? for search_reverse
201192 key!('n') => commands::search_next,
202− shift!('N') => commands::extend_search_next,
193+ key!('N') => commands::extend_search_next,
203194 // N for search_prev
204195 key!('*') => commands::search_selection,
205196
206197 key!('u') => commands::undo,
207− shift!('U') => commands::redo,
198+ key!('U') => commands::redo,
208199
209200 key!('y') => commands::yank,
210201 // yank_all
211202 key!('p') => commands::paste_after,
212203 // paste_all
213− shift!('P') => commands::paste_before,
204+ key!('P') => commands::paste_before,
214205
215206 key!('>') => commands::indent,
216207 key!('<') => commands::unindent,
217208 key!('=') => commands::format_selections,
218− shift!('J') => commands::join_selections,
209+ key!('J') => commands::join_selections,
219210 // TODO: conflicts hover/doc
220− shift!('K') => commands::keep_selections,
211+ key!('K') => commands::keep_selections,
221212 // TODO: and another method for inverse
222213
223214 // TODO: clashes with space mode
@@ -256,7 +247,7 @@ pub fn default() -> Keymaps {
256247
257248 // move under <space>c
258249 ctrl!('c') => commands::toggle_comments,
259− shift!('K') => commands::hover,
250+ key!('K') => commands::hover,
260251
261252 // z family for save/restore/combine from/to sels from register
262253
@@ -284,8 +275,8 @@ pub fn default() -> Keymaps {
284275
285276 key!('t') => commands::extend_till_char,
286277 key!('f') => commands::extend_next_char,
287− shift!('T') => commands::extend_till_prev_char,
288− shift!('F') => commands::extend_prev_char,
278+ key!('T') => commands::extend_till_prev_char,
279+ key!('F') => commands::extend_prev_char,
289280
290281 KeyEvent {
291282 code: KeyCode::Esc,