Implement auto dedentation.

Trundle · Trundle · commit aa0f45085f28 · 2009-12-17T21:54:12.000+01:00
You can set the number of empty lines after which auto dedentation will happen with the new config option `dedent_after` (set to 0 to disable auto dedentation). Also fix a stupid typo. This will close issue bpython#72.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -64,7 +64,7 @@
 
 from bpython import __version__
 from bpython.pager import page
-from bpython.repl import Interpreter, Repl, next_indentantion
+from bpython.repl import Interpreter, Repl, next_indentation
 
 
 def log(x):
@@ -538,13 +538,12 @@ def get_line(self):
         which returns None if Enter is pressed (that means "Return",
         idiot)."""
 
-        indentation = next_indentantion(self.s)
         self.s = ''
         self.rl_history.reset()
         self.iy, self.ix = self.scr.getyx()
 
         if not self.paste_mode:
-            for _ in xrange(indentation):
+            for _ in xrange(self.next_indentation()):
                 self.p_key('\t')
 
         self.cpos = 0
diff --git a/bpython/config.py b/bpython/config.py
@@ -37,6 +37,7 @@ def loadini(struct, configfile):
             'arg_spec': True,
             'auto_display_list': True,
             'color_scheme': 'default',
+            'dedent_after': 1,
             'flush_output': True,
             'highlight_show_source': True,
             'hist_file': '~/.pythonhist',
@@ -63,6 +64,7 @@ def loadini(struct, configfile):
             'yank_from_buffer': 'C-y'}})
     config.read(config_path)
 
+    struct.dedent_after = config.getint('general', 'dedent_after')
     struct.tab_length = config.getint('general', 'tab_length')
     struct.auto_display_list = config.getboolean('general',
                                                  'auto_display_list')
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -377,7 +377,7 @@ def do_key_press_event(self, event):
                 if self.reset_indent:
                     self.reset_indent = False
                 else:
-                    indentation = repl.next_indentantion(line)
+                    indentation = self.next_indentation()
                     if indentation:
                         with self.editing:
                             self.text_buffer.insert(self.get_cursor_iter(),
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -568,6 +568,20 @@ def format_docstring(self, docstring, width, height):
         out[-1] = out[-1].rstrip()
         return out
 
+    def next_indentation(self):
+        """Return the indentation of the next line based on the current
+        input buffer."""
+        if self.buffer:
+            indentation = next_indentation(self.buffer[-1])
+            if indentation and OPTS.dedent_after > 0:
+                line_is_empty = lambda line: not line.strip()
+                empty_lines = takewhile(line_is_empty, reversed(self.buffer))
+                if sum(1 for _ in empty_lines) >= OPTS.dedent_after:
+                    indentation -= 1
+        else:
+            indentation = 0
+        return indentation
+
     def getstdout(self):
         """This method returns the 'spoofed' stdout buffer, for writing to a
         file or sending to a pastebin or whatever."""
@@ -695,7 +709,7 @@ def reevaluate(self):
             self.iy, self.ix = self.scr.getyx()
 
         self.cpos = 0
-        indent = next_indentantion(self.s)
+        indent = next_indentation(self.s)
         self.s = ''
         self.scr.refresh()
 
@@ -837,7 +851,7 @@ def clear_current_line(self):
         It prevents autoindentation from occuring after a traceback."""
 
 
-def next_indentantion(line):
+def next_indentation(line):
     """Given a code line, return the indentation of the next line."""
     line = line.expandtabs(OPTS.tab_length)
     indentation = (len(line) - len(line.lstrip(' '))) // OPTS.tab_length
