summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-01-20 01:01:29 +0100
committerhut <hut@lavabit.com>2010-01-20 01:44:04 +0100
commitba3c477b4144943ceb1bd07cf316828e9e742a4d (patch)
treef7980e1d8467e4464c6551ebebf26f03594c0ad5 /ranger
parent7bbb18168d9ad8d5783621bdf1bb8516d14627e4 (diff)
downloadranger-ba3c477b4144943ceb1bd07cf316828e9e742a4d.tar.gz
console: slightly improved tab completion for CommandConsole
Diffstat (limited to 'ranger')
-rw-r--r--ranger/gui/widgets/console.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py
index 5c888da5..6562276f 100644
--- a/ranger/gui/widgets/console.py
+++ b/ranger/gui/widgets/console.py
@@ -386,7 +386,10 @@ class OpenConsole(ConsoleWithTab):
 
 	def _get_tab(self):
 		# for now, just add " %s"
-		return self.line + ' %s'
+		result = self.line
+		if result and result[-1] != ' ':
+			result += ' '
+		return result + '%s '
 
 	def _substitute_metachars(self, command):
 		dct = {}
mp;id=fdfe34ded306526bd87568e50ac9a6e03c9c0594'>^
a654e4ec ^
9e751bb8 ^

a654e4ec ^
e5c11a51 ^
4690ce81 ^
4a39d12d ^
a654e4ec ^
e5c11a51 ^
9e751bb8 ^
c5ffb6e1 ^

a654e4ec ^



e5c11a51 ^






















a654e4ec ^

c5ffb6e1 ^
e5c11a51 ^
a654e4ec ^
204dae92 ^







97eb971b ^
204dae92 ^


9e751bb8 ^
204dae92 ^
97eb971b ^
204dae92 ^

97eb971b ^
204dae92 ^





97eb971b ^
204dae92 ^

97eb971b ^
204dae92 ^


97eb971b ^

204dae92 ^



c5ffb6e1 ^


a654e4ec ^
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



                                                                                          
                             

                                                
                                   
                                                                                                               
                                           

                       


                                                                                                 
                                       
                                      

                             
                              
                            
                            
                                                        
                             
                           
                              

        



                               






















                                                                                 

         
       
                             
                         







                                                                                                                                               
                                                                                                                                                                         


                                                                                        
                                                                                                                                                                                        
                                                                          
                                                                                                                               

                                         
                                                                                                                                                              





                                                                                                                                
                                                                                                                                                                   

                                                                                                                              
                                                                                                                                      


                                                                                                         

                                                                                                                                                            



                                                                                                                                        


       
                                     
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Mu - tangle.mu</title>
<meta name="Generator" content="Vim/7.4">
<meta name="plugin-version" content="vim7.4_v2">
<meta name="syntax" content="none">
<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
<meta name="colorscheme" content="minimal">
<style type="text/css">
<!--
pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
a { color:#eeeeee; text-decoration: none; }
a:hover { text-decoration: underline; }
* { font-size: 12pt; font-size: 1em; }
.muRecipe { color: #ff8700; }
.Conceal { color: #4e4e4e; }
.Delimiter { color: #800080; }
.Special { color: #c00000; }
.Comment { color: #9090ff; }
.Comment a { color:#0000ee; text-decoration:underline; }
.Constant { color: #00a0a0; }
.LineNr { color: #444444; }
.muControl { color: #c0a020; }
-->
</style>

<script type='text/javascript'>
<!--

/* function to open any folds containing a jumped-to line before jumping to it */
function JumpToLine()
{
  var lineNum;
  lineNum = window.location.hash;
  lineNum = lineNum.substr(1); /* strip off '#' */

  if (lineNum.indexOf('L') == -1) {
    lineNum = 'L'+lineNum;
  }
  lineElem = document.getElementById(lineNum);
  /* Always jump to new location even if the line was hidden inside a fold, or
   * we corrected the raw number to a line ID.
   */
  if (lineElem) {
    lineElem.scrollIntoView(true);
  }
  return true;
}
if ('onhashchange' in window) {
  window.onhashchange = JumpToLine;
}

-->
</script>
</head>
<body onload='JumpToLine();'>
<pre id='vimCodeElement'>
<span id="L1" class="LineNr"> 1 </span><span class="Comment"># example program: constructing functions out of order</span>
<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
<span id="L3" class="LineNr"> 3 </span><span class="Comment"># We construct a factorial function with separate base and recursive cases.</span>
<span id="L4" class="LineNr"> 4 </span><span class="Comment"># Compare factorial.mu.</span>
<span id="L5" class="LineNr"> 5 </span><span class="Comment">#</span>
<span id="L6" class="LineNr"> 6 </span><span class="Comment"># This isn't a very tasteful example, just a simple demonstration of</span>
<span id="L7" class="LineNr"> 7 </span><span class="Comment"># possibilities.</span>
<span id="L8" class="LineNr"> 8 </span>
<span id="L9" class="LineNr"> 9 </span><span class="muRecipe">def</span> <a href='tangle.mu.html#L9'>factorial</a> n:num<span class="muRecipe"> -&gt; </span>result:num [
<span id="L10" class="LineNr">10 </span>  <span class="Constant">local-scope</span>
<span id="L11" class="LineNr">11 </span>  <span class="Constant">load-ingredients</span>
<span id="L12" class="LineNr">12 </span>  <span class="Delimiter">{</span>
<span id="L13" class="LineNr">13 </span><span class="Constant">  </span><span class="Conceal">¦</span><span class="Constant"> <a href='tangle.mu.html#L13'>&lt;base-case&gt;</a></span>
<span id="L14" class="LineNr">14 </span>  <span class="Delimiter">}</span>
<span id="L15" class="LineNr">15 </span><span class="Constant">  <a href='tangle.mu.html#L15'>&lt;recursive-case&gt;</a></span>
<span id="L16" class="LineNr">16 </span>]
<span id="L17" class="LineNr">17 </span>
<span id="L18" class="LineNr">18 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L13'>&lt;base-case&gt;</a></span> [
<span id="L19" class="LineNr">19 </span>  <span class="Comment"># if n=0 return 1</span>
<span id="L20" class="LineNr">20 </span>  zero?:bool <span class="Special">&lt;-</span> equal n,<span class="Constant"> 0</span>
<span id="L21" class="LineNr">21 </span>  <span class="muControl">break-unless</span> zero?
<span id="L22" class="LineNr">22 </span>  <span class="muControl">return</span><span class="Constant"> 1</span>
<span id="L23" class="LineNr">23 </span>]
<span id="L24" class="LineNr">24 </span>
<span id="L25" class="LineNr">25 </span><span class="muRecipe">after</span> <span class="Constant"><a href='tangle.mu.html#L15'>&lt;recursive-case&gt;</a></span> [
<span id="L26" class="LineNr">26 </span>  <span class="Comment"># return n * factorial(n - 1)</span>
<span id="L27" class="LineNr">27 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
<span id="L28" class="LineNr">28 </span>  subresult:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a> x
<span id="L29" class="LineNr">29 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
<span id="L30" class="LineNr">30 </span>]
<span id="L31" class="LineNr">31 </span>
<span id="L32" class="LineNr">32 </span><span class="muRecipe">def</span> <a href='tangle.mu.html#L32'>main</a> [
<span id="L33" class="LineNr">33 </span>  1:num <span class="Special">&lt;-</span> <a href='tangle.mu.html#L9'>factorial</a><span class="Constant"> 5</span>
<span id="L34" class="LineNr">34 </span>  <span class="Comment"># trailing space in next line is to help with syntax highlighting</span>
<span id="L35" class="LineNr">35 </span>  $print <span class="Constant">[result: ]</span>, 1:num, <span class="Constant">[ </span>
<span id="L36" class="LineNr">36 </span><span class="Constant">]</span>
<span id="L37" class="LineNr">37 </span>]
</pre>
</body>
</html>
<!-- vim: set foldmethod=manual : -->