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

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:

projects / etc / vim.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb1ac69) | patch
Fix unstable formatting with some `# type: ignore`s (#1113)
authorMichael J. Sullivan <sully@msully.net>
Mon, 25 Nov 2019 22:16:00 +0000 (14:16 -0800)
committerJelle Zijlstra <jelle.zijlstra@gmail.com>
Mon, 25 Nov 2019 22:16:00 +0000 (14:16 -0800)
commit4b449e7471c31ae2d3a890510322c40594cacc8f
tree048295ce5ace21b2cdf0f92c1f25fe37a39a4ba7tree | snapshot
parentfb1ac6981257c91a1d3bf753d10e1091f05b001acommit | diff
Fix unstable formatting with some `# type: ignore`s (#1113)

`type: ignore` shouldn't block collapsing a line, since it will still
apply fine to the merged line. This prevents an issue where a reformat
causes it to shift lines and then be merged on a subsequent pass.

There is a downside to this, which is that it can cause a `type:
ignore` to apply to more code than was originally intended. There
might be a way to apply this in a more limited situation, but I'm not
sure what it is.

Fixes #1061.
black.py diff | blob | history
tests/data/comments2.py diff | blob | history
tests/data/comments7.py diff | blob | history
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.