Suggest BufWritePre instead of BufWritePost for vi (#376)

[etc/vim.git] / blib2to3 / pgen2 / driver.py

diff --git a/blib2to3/pgen2/driver.py b/blib2to3/pgen2/driver.py
index af7ca1799ca8dc733871755115c5d4ad89c5692a..72d9f4785c12f07f0c0f86c597dad54e1848df78 100644 (file)
--- a/blib2to3/pgen2/driver.py
+++ b/blib2to3/pgen2/driver.py
@@ -70,24 +70,19 @@ class Driver(object):
             if debug:
                 self.logger.debug("%s %r (prefix=%r)",
                                   token.tok_name[type], value, prefix)
             if debug:
                 self.logger.debug("%s %r (prefix=%r)",
                                   token.tok_name[type], value, prefix)

-            if type in {token.INDENT, token.DEDENT}:
-                _prefix = prefix
+            if type == token.INDENT:
+                indent_columns.append(len(value))
+                _prefix = prefix + value

                 prefix = ""
                 prefix = ""

-            if type == token.DEDENT:
+                value = ""
+            elif type == token.DEDENT:

                 _indent_col = indent_columns.pop()
                 _indent_col = indent_columns.pop()

-                prefix, _prefix = self._partially_consume_prefix(_prefix, _indent_col)
+                prefix, _prefix = self._partially_consume_prefix(prefix, _indent_col)

             if p.addtoken(type, value, (prefix, start)):
                 if debug:
                     self.logger.debug("Stop.")
                 break
             prefix = ""
             if p.addtoken(type, value, (prefix, start)):
                 if debug:
                     self.logger.debug("Stop.")
                 break
             prefix = ""

-            if type == token.INDENT:
-                indent_columns.append(len(value))
-                if _prefix.startswith(value):
-                    # Don't double-indent.  Since we're delaying the prefix that
-                    # would normally belong to INDENT, we need to put the value
-                    # at the end versus at the beginning.
-                    _prefix = _prefix[len(value):] + value

             if type in {token.INDENT, token.DEDENT}:
                 prefix = _prefix
             lineno, column = end
             if type in {token.INDENT, token.DEDENT}:
                 prefix = _prefix
             lineno, column = end


@@ -141,7 +136,7 @@ class Driver(object):
             elif char == '\t':
                 current_column += 4
             elif char == '\n':
             elif char == '\t':
                 current_column += 4
             elif char == '\n':

-                # enexpected empty line
+                # unexpected empty line

                 current_column = 0
             else:
                 # indent is finished
                 current_column = 0
             else:
                 # indent is finished