]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

blib2to3: Never put prefixes on DEDENT leaves
authorŁukasz Langa <lukasz@langa.pl>
Sat, 17 Mar 2018 04:47:15 +0000 (21:47 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Sat, 17 Mar 2018 04:47:52 +0000 (21:47 -0700)
blib2to3/pgen2/driver.py

index cbc58e759d5374e3980f1402ab708d0888cda59c..eabc72b779571f2aa2b46b25ce81f2d495660819 100644 (file)
@@ -69,11 +69,16 @@ 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 == token.DEDENT:
+                _prefix = prefix
+                prefix = ""
             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.DEDENT:
+                prefix = _prefix
             lineno, column = end
             if value.endswith("\n"):
                 lineno += 1
             lineno, column = end
             if value.endswith("\n"):
                 lineno += 1