]> 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:

Fix merging implicit multiline strings that have inline comments (#3956)
authorHenri Holopainen <henri.i.holopainen@gmail.com>
Fri, 20 Oct 2023 03:09:33 +0000 (06:09 +0300)
committerGitHub <noreply@github.com>
Fri, 20 Oct 2023 03:09:33 +0000 (20:09 -0700)
commit882d8795c6ff65c02f2657e596391748d1b6b7f5
tree005958b0dcaa236cc9efc3fbb693d22d4544e657
parent9edba85f71d50d12996ef7bda576426362016171
Fix merging implicit multiline strings that have inline comments (#3956)

* Fix test behaviour

* Add new test cases

* Skip merging strings that have inline comments

* Don't merge lines with multiline strings with inline comments

* Changelog entry

* Document implicit multiline string merging rules

* Fix PR number
CHANGES.md
docs/the_black_code_style/future_style.md
src/black/linegen.py
src/black/lines.py
src/black/trans.py
tests/data/cases/preview_long_strings__regression.py
tests/data/cases/preview_multiline_strings.py