Skip to content
This repository was archived by the owner on Mar 12, 2023. It is now read-only.

Commit 8907c55

Browse files
0x2c70x2c7
committed
Remove ambiguous Ctrl+Shift combinations
1 parent ef55b8e commit 8907c55

File tree

3 files changed

+23
-50
lines changed

3 files changed

+23
-50
lines changed

‎lib/ruby_jard/keys.rb

-27
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,6 @@ class Keys
7474
CTRL_F11 = "\e[23;5~"
7575
CTRL_F12 = "\e[24;5~"
7676

77-
CTRL_SHIFT_A = "\C-A"
78-
CTRL_SHIFT_B = "\C-B"
79-
CTRL_SHIFT_C = "\C-C"
80-
CTRL_SHIFT_D = "\C-D"
81-
CTRL_SHIFT_E = "\C-E"
82-
CTRL_SHIFT_F = "\C-F"
83-
CTRL_SHIFT_G = "\C-G"
84-
CTRL_SHIFT_H = "\C-H"
85-
CTRL_SHIFT_I = "\C-I"
86-
CTRL_SHIFT_J = "\C-J"
87-
CTRL_SHIFT_K = "\C-K"
88-
CTRL_SHIFT_L = "\C-L"
89-
CTRL_SHIFT_M = "\C-M"
90-
CTRL_SHIFT_N = "\C-N"
91-
CTRL_SHIFT_O = "\C-O"
92-
CTRL_SHIFT_P = "\C-P"
93-
CTRL_SHIFT_Q = "\C-Q"
94-
CTRL_SHIFT_R = "\C-R"
95-
CTRL_SHIFT_S = "\C-S"
96-
CTRL_SHIFT_T = "\C-T"
97-
CTRL_SHIFT_U = "\C-U"
98-
CTRL_SHIFT_V = "\C-V"
99-
CTRL_SHIFT_W = "\C-W"
100-
CTRL_SHIFT_X = "\C-X"
101-
CTRL_SHIFT_Y = "\C-Y"
102-
CTRL_SHIFT_Z = "\C-Z"
103-
10477
CTRL_SHIFT_F1 = "\e[1;6P"
10578
CTRL_SHIFT_F2 = "\e[1;6Q"
10679
CTRL_SHIFT_F3 = "\e[1;6R"

‎spec/integration/custom_key_bindings/custom_key_bindings.expected

+22-22
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
│ 17 │
1919
│ 18 include ModuleY │
2020
├──────────────────────────────────────────────────────────────────────────────┤
21-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
21+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
2222
└──────────────────────────────────────────────────────────────────────────────┘
23-
jard >>
23+
jard >>
2424
### END SCREEN ###
2525
### START SEND_KEYS ###
2626
[:"C-M-n"]
@@ -45,9 +45,9 @@ jard >>
4545
│ 18 include ModuleY │
4646
│ 19 prepend ModuleZ │
4747
├──────────────────────────────────────────────────────────────────────────────┤
48-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
48+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
4949
└──────────────────────────────────────────────────────────────────────────────┘
50-
jard >>
50+
jard >>
5151
### END SCREEN ###
5252
### START SEND_KEYS ###
5353
[:"C-M-n"]
@@ -75,9 +75,9 @@ jard >>
7575
│ 16 @class_variable_5 = 5 │
7676
│ 17 end │
7777
├──────────────────────────────────────────────────────────────────────────────┤
78-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
78+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
7979
└──────────────────────────────────────────────────────────────────────────────┘
80-
jard >>
80+
jard >>
8181
### END SCREEN ###
8282
### START SEND_KEYS ###
8383
[:"C-F1"]
@@ -102,9 +102,9 @@ jard >>
102102
│ 19 prepend ModuleZ │
103103
│ 20 │
104104
├──────────────────────────────────────────────────────────────────────────────┤
105-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
105+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
106106
└──────────────────────────────────────────────────────────────────────────────┘
107-
jard >>
107+
jard >>
108108
### END SCREEN ###
109109
### START SEND_KEYS ###
110110
[:"C-S-F1"]
@@ -129,9 +129,9 @@ jard >>
129129
│ 16 @class_variable_5 = 5 │
130130
│ 17 end │
131131
├──────────────────────────────────────────────────────────────────────────────┤
132-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
132+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
133133
└──────────────────────────────────────────────────────────────────────────────┘
134-
jard >>
134+
jard >>
135135
### END SCREEN ###
136136
### START SEND_KEYS ###
137137
[:"M-o"]
@@ -156,9 +156,9 @@ jard >>
156156
│ 16 @class_variable_5 = 5 │
157157
│ 17 end │
158158
├──────────────────────────────────────────────────────────────────────────────┤
159-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
159+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
160160
└──────────────────────────────────────────────────────────────────────────────┘
161-
jard >>
161+
jard >>
162162
### END SCREEN ###
163163
### START SEND_KEYS ###
164164
[:"M-F1"]
@@ -183,9 +183,9 @@ jard >>
183183
│ 43 ModuleX.a_test_method │
184184
│ 44 ModuleX::ClassA.new.test_method │
185185
├──────────────────────────────────────────────────────────────────────────────┤
186-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
186+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
187187
└──────────────────────────────────────────────────────────────────────────────┘
188-
jard >>
188+
jard >>
189189
### END SCREEN ###
190190
### START SEND_KEYS ###
191191
[:"M-S-F1"]
@@ -210,9 +210,9 @@ jard >>
210210
│ │
211211
│ │
212212
├──────────────────────────────────────────────────────────────────────────────┤
213-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
213+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
214214
└──────────────────────────────────────────────────────────────────────────────┘
215-
jard >>
215+
jard >>
216216
### END SCREEN ###
217217
### START SEND_KEYS ###
218218
["hello"]
@@ -237,9 +237,9 @@ jard >>
237237
│ │
238238
│ │
239239
├──────────────────────────────────────────────────────────────────────────────┤
240-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
240+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
241241
└──────────────────────────────────────────────────────────────────────────────┘
242-
jard >> hello
242+
jard >> hello
243243
### END SCREEN ###
244244
### START SEND_KEYS ###
245245
[:"M-l"]
@@ -264,9 +264,9 @@ jard >> hello
264264
│ │
265265
│ │
266266
├──────────────────────────────────────────────────────────────────────────────┤
267-
│Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Nex »│
267+
│Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctr »│
268268
└──────────────────────────────────────────────────────────────────────────────┘
269-
jard >>
269+
jard >>
270270
### END SCREEN ###
271271
### START SEND_KEYS ###
272272
[:"C-n"]
@@ -291,7 +291,7 @@ jard >>
291291
│ │
292292
│ │
293293
├──────────────────────────────────────────────────────────────────────────────┤
294-
│Filter (Ctrl+Shift+N): Gems Step (Meta+D) Step Out (Meta+O) Next (Ctrl »│
294+
│Filter (Ctrl+N): Gems Step (Meta+D) Step Out (Meta+O) Next (Ctrl+Meta+N)│
295295
└──────────────────────────────────────────────────────────────────────────────┘
296-
jard >>
296+
jard >>
297297
### END SCREEN ###

‎spec/ruby_jard/screens/menu_screen_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
menu_screen.build
5252
expect(menu_screen.rows).to match_rows(<<~SPANS)
53-
Filter (Ctrl+Shift+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctrl+Meta+N) Continue (Meta+F1)
53+
Filter (Ctrl+N): Application Step (Meta+D) Step Out (Meta+O) Next (Ctrl+Meta+N) Continue (Meta+F1)
5454
SPANS
5555
end
5656
end

0 commit comments

Comments
 (0)