Prevent wrapping file locations containing white space #1120
Conversation
|
Interesting, calling super() inside a list comprehension does not work on python 3.9.. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1120 +/- ##
==========================================
+ Coverage 91.26% 91.28% +0.02%
==========================================
Files 27 27
Lines 4602 4613 +11
==========================================
+ Hits 4200 4211 +11
Misses 402 402
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
tomasr8
changed the title
| chunks = [[c] if c.startswith(enclosed_filename_start) else super_._split(c) for c in chunks] | ||
| chunks = [c for c in chain.from_iterable(chunks) if c] | ||
| return chunks | ||
|
|
||
|
|
||
| def wraptext(text: str, width: int = 70, initial_indent: str = '', subsequent_indent: str = '') -> list[str]: |
There was a problem hiding this comment.
The documentation of wraptext() should be updated to reflect the new behaviour (it says "This version does not wrap lines on hyphens in words.")
There was a problem hiding this comment.
Also, a little perf thing – maybe for this PR, maybe for a subsequent one: wraptext() is called repeatedly in pofile.py – it would be more efficient to construct two different TextWrappers in advance and call wrap() on them.
I think babel.util.wraptext() should probably be deprecated then.
I can whip up a PR to do that... #1140
There was a problem hiding this comment.
The documentation of wraptext() should be updated to reflect the new behaviour (it says "This version does not wrap lines on hyphens in words.")
This version doesn't wrap lines on hyphens either, unless I misunderstood your comment? Did you mean that we should add a comment about filenames containing spaces?
There was a problem hiding this comment.
Yeah, I meant adding a comment about the new filenames-with-spaces behavior.
Closes #1078
Depends on #1105 (To see only the changes in this PR, look at the last two commits)Since #1105 wraps file names containing white space in special unicode markers, we look out for them when
wrapping comments.
The fix overrides the
_splitmethod ofTextWrapperwhere we manually generate the indivisible chunks, taking intoaccount enclosed file names.
I test the the wrapping behavior with gettext 0.22.5 (which includes the enclosing logic) to make sure it's consistent