summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-02-24 15:35:16 +0100
committerhut <hut@lavabit.com>2010-02-24 23:54:17 +0100
commitc5450bd180efd57f9cbd9d3315391b8cc8238be3 (patch)
tree76df12e4f869edbdce46de903ad7b66f3179e30a
parentd49cace95fb717d90e9d1e3b0088b0634071c0e3 (diff)
downloadranger-c5450bd180efd57f9cbd9d3315391b8cc8238be3.tar.gz
console: fixed tabcompletion in openconsole starting with !xyz!
-rw-r--r--TODO1
-rw-r--r--ranger/gui/widgets/console.py17
2 files changed, 14 insertions, 4 deletions
diff --git a/TODO b/TODO
index 466ab8f4..d475f099 100644
--- a/TODO
+++ b/TODO
@@ -57,6 +57,7 @@ Bugs
    (X) #26  10/01/06  :delete on symlinks of directories fails
    (X) #31  10/01/06  ^C breaks cd-after-exit by stopping sourced shell script
    ( ) #40  10/01/17  freeze with unavailable sshfs
+          Looks like I need threads for that...
    (X) #41  10/01/17  capital file extensions are not recognized
    (X) #46  10/01/19  old username displayed after using su
    (X) #49  10/01/19  fix unit tests :'(
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py
index a496f6a9..5439b2a8 100644
--- a/ranger/gui/widgets/console.py
+++ b/ranger/gui/widgets/console.py
@@ -396,11 +396,20 @@ class OpenConsole(ConsoleWithTab):
 
 	def _get_tab(self):
 		try:
-			position_of_last_space = self.line.rindex(" ")
+			i = self.line.index('!')+1
 		except ValueError:
-			return (program + ' ' for program in self.fm.executables \
-					if program.startswith(self.line))
-		if position_of_last_space == len(self.line) - 1:
+			line = self.line
+			start = ''
+		else:
+			line = self.line[i:]
+			start = self.line[:i]
+
+		try:
+			position_of_last_space = line.rindex(" ")
+		except ValueError:
+			return (start + program + ' ' for program in self.fm.executables \
+					if program.startswith(line))
+		if position_of_last_space == len(line) - 1:
 			return self.line + '%s '
 		else:
 			before_word, start_of_word = self.line.rsplit(' ', 1)
5d7f14a518f0e'>ec926027 ^
31401373 ^
ec926027 ^



ca01193d ^
363be37f ^
69e14325 ^
5eb49929 ^
e2240eb4 ^

363be37f ^
c442a5ad ^


31401373 ^
d72f3799 ^
0b0cfb6f ^
7284d503 ^


aae198a9 ^

6424e199 ^













f89378d5 ^
aae198a9 ^












































cd111388 ^







2142ccfc ^

f3760b0f ^
2b250717 ^
2142ccfc ^

f1a6f323 ^
9cf71627 ^
59874868 ^

c442a5ad ^


f1c8df7d ^


59874868 ^


f1c8df7d ^
513bfed8 ^
af085cf6 ^


3eeea0a2 ^

9cf71627 ^
4a943d4e ^






















2cb36cd0 ^
7284d503 ^
64cf0a59 ^
d41955c1 ^

69e14325 ^
df8bb4c3 ^
f6d47435 ^
d41955c1 ^

31401373 ^
795f5244 ^
5eb49929 ^

317c0a34 ^
ec926027 ^

ac0e9db5 ^
2e8c5d39 ^
c442a5ad ^


31401373 ^
d8c6265d ^
9fdda88b ^
5f98a10c ^
8eff7919 ^
f6d47435 ^
f64f1ca5 ^










2a81a547 ^
f64f1ca5 ^

2a81a547 ^




1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246