Abstract completion mechanism outside of wx-specific code.

IPython/frontend/linefrontendbase.py

@@ -59,6 +59,9 b' class LineFrontEndBase(FrontEndBase):'
     # The input buffer being edited
     input_buffer = ''
 
+    # Set to true for debug output
+    debug = False
+
     #--------------------------------------------------------------------------
     # FrontEndBase interface
     #--------------------------------------------------------------------------
@@ -143,17 +146,6 b' class LineFrontEndBase(FrontEndBase):'
         print >>sys.__stderr__, string
 
 
-    def new_prompt(self, prompt):
-        """ Prints a prompt and starts a new editing buffer. 
-
-            Subclasses should use this method to make sure that the
-            terminal is put in a state favorable for a new line
-            input.
-        """
-        self.input_buffer = ''
-        self.write(prompt)
-
-
     def execute(self, python_string, raw_string=None):
         """ Stores the raw_string in the history, and sends the
         python string to the interpreter.
@@ -185,6 +177,7 b' class LineFrontEndBase(FrontEndBase):'
         string = '\n'.join(l.rstrip()  for l in string.split('\n'))
         return string
 
+
     def after_execute(self):
         """ All the operations required after an execution to put the
             terminal back in a shape where it is usable.
@@ -197,6 +190,59 b' class LineFrontEndBase(FrontEndBase):'
         self.history_cursor = len(self.history.input_cache) - 1
 
 
+    def complete_current_input(self):
+        """ Do code completion on current line. 
+        """
+        if self.debug:
+            print >>sys.__stdout__, "complete_current_input", 
+        line = self.input_buffer
+        new_line, completions = self.complete(line)
+        if len(completions)>1:
+            self.write_completion(completions)
+        self.input_buffer = new_line
+        if self.debug:
+            print >>sys.__stdout__, completions 
+
+
+    def write_completion(self, possibilities):
+        """ Write the list of possible completions.
+        """
+        current_buffer = self.input_buffer
+        
+        self.write('\n')
+        max_len = len(max(possibilities, key=len)) + 1
+        
+        #now we check how much symbol we can put on a line...
+        chars_per_line =self.get_line_width()
+        symbols_per_line = max(1, chars_per_line/max_len)
+
+        pos = 1
+        buf = []
+        for symbol in possibilities:
+            if pos < symbols_per_line:
+                buf.append(symbol.ljust(max_len))
+                pos += 1
+            else:
+                buf.append(symbol.rstrip() + '\n')
+                pos = 1
+        self.write(''.join(buf))
+        self.new_prompt(self.input_prompt_template.substitute(
+                            number=self.last_result['number'] + 1))
+        self.input_buffer = current_buffer
+
+
+
+    def new_prompt(self, prompt):
+        """ Prints a prompt and starts a new editing buffer. 
+
+            Subclasses should use this method to make sure that the
+            terminal is put in a state favorable for a new line
+            input.
+        """
+        self.input_buffer = ''
+        self.write(prompt)
+
+
     #--------------------------------------------------------------------------
     # Private API
     #--------------------------------------------------------------------------

IPython/frontend/wx/console_widget.py

@@ -201,33 +201,11 b' class ConsoleWidget(editwindow.EditWindow):'
         self.AutoCompShow(offset, " ".join(possibilities))
 
 
-    def write_completion(self, possibilities):
-        # FIXME: This is non Wx specific and needs to be moved into
-        # the base class.
-        current_buffer = self.input_buffer
-        
-        self.write('\n')
-        max_len = len(max(possibilities, key=len)) + 1
-        
-        #now we check how much symbol we can put on a line...
-        chars_per_line = self.GetSize()[0]/self.GetCharWidth()
-        symbols_per_line = max(1, chars_per_line/max_len)
-
-        pos = 1
-        buf = []
-        for symbol in possibilities:
-            if pos < symbols_per_line:
-                buf.append(symbol.ljust(max_len))
-                pos += 1
-            else:
-                buf.append(symbol.rstrip() + '\n')
-                pos = 1
-        self.write(''.join(buf))
-        # FIXME: I have some mixing of interfaces between console_widget
-        # and wx_frontend, here.
-        self.new_prompt(self.input_prompt_template.substitute(
-                            number=self.last_result['number'] + 1))
-        self.input_buffer = current_buffer
+    def get_line_width(self):
+        """ Return the width of the line in characters.
+        """
+        return self.GetSize()[0]/self.GetCharWidth()
+
 
     #--------------------------------------------------------------------------
     # Private API

IPython/frontend/wx/wx_frontend.py

@@ -183,20 +183,6 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
         self._buffer_flush(event=None)
 
 
-    def do_completion(self):
-        """ Do code completion on current line. 
-        """
-        if self.debug:
-            print >>sys.__stdout__, "do_completion", 
-        line = self.input_buffer
-        new_line, completions = self.complete(line)
-        if len(completions)>1:
-            self.write_completion(completions)
-        self.input_buffer = new_line
-        if self.debug:
-            print >>sys.__stdout__, completions 
-
-
     def do_calltip(self):
         """ Analyse current and displays useful calltip for it.
         """
@@ -394,7 +380,7 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
             elif event.KeyCode == ord('\t'):
                 last_line = self.input_buffer.split('\n')[-1]
                 if not re.match(r'^\s*$', last_line):
-                    self.do_completion()
+                    self.complete_current_input()
                 else:
                     event.Skip()
             else: