]>
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:
summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (parent:
7e1c5b2 )
*args and **kwargs
- backport of GH-6143 that restores the ability to reformat legacy usage of
`async`
*args and **kwargs
- backport of GH-6143 that restores the ability to reformat legacy usage of
`async`
-- better ability to debug (better reprs for starters)
+- better ability to debug (better reprs)
+- INDENT and DEDENT don't hold whitespace and comment prefixes
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 :
+ if type in {token.INDENT, token.DEDENT} :
_prefix = prefix
prefix = ""
if p.addtoken(type, value, (prefix, start)):
_prefix = prefix
prefix = ""
if p.addtoken(type, value, (prefix, start)):
self.logger.debug("Stop.")
break
prefix = ""
self.logger.debug("Stop.")
break
prefix = ""
- if type == token.DEDENT :
+ if type in {token.INDENT, token.DEDENT} :
prefix = _prefix
lineno, column = end
if value.endswith("\n"):
prefix = _prefix
lineno, column = end
if value.endswith("\n"):
yield stashed
stashed = None
yield stashed
stashed = None
+ if column > indents[-1]: # count indents
+ indents.append(column)
+ yield (INDENT, line[:pos], (lnum, 0), (lnum, pos), line)
+
if line[pos] in '#\r\n': # skip comments or blank lines
if line[pos] == '#':
comment_token = line[pos:].rstrip('\r\n')
if line[pos] in '#\r\n': # skip comments or blank lines
if line[pos] == '#':
comment_token = line[pos:].rstrip('\r\n')
(lnum, pos), (lnum, len(line)), line)
continue
(lnum, pos), (lnum, len(line)), line)
continue
- if column > indents[-1]: # count indents or dedents
- indents.append(column)
- yield (INDENT, line[:pos], (lnum, 0), (lnum, pos), line)
- while column < indents[-1]:
+ while column < indents[-1]: # count dedents
if column not in indents:
raise IndentationError(
"unindent does not match any outer indentation level",
if column not in indents:
raise IndentationError(
"unindent does not match any outer indentation level",
- " # We don't have to handle prefixes for `Node` objects since\n # that delegates to the first child anyway.\n "
+ "# We don't have to handle prefixes for `Node` objects since\n # that delegates to the first child anyway.\n "
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type in OPENING_BRACKETS:
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type in OPENING_BRACKETS:
return NO
if prevp.type == token.EQUAL:
return NO
if prevp.type == token.EQUAL: