-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Let string splitters respect East_Asian_Width property
#3445
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cd27157
Let string splitters respect East Asian Width
dahlia 0800aee
Fast path to measure width of ASCII strings
dahlia ecb5fdf
Generate more precise width table using wcwidth
dahlia 0ab121e
Let width table treat 0-width chars as 1-width
dahlia 3593955
Merge branch 'main' into east-asian-width
JelleZijlstra 82e39e8
Merge branch 'main' into east-asian-width
JelleZijlstra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| """Generates a width table for Unicode characters. | ||
|
|
||
| This script generates a width table for Unicode characters that are not | ||
| narrow (width 1). The table is written to src/black/_width_table.py (note | ||
| that although this file is generated, it is checked into Git) and is used | ||
| by the char_width() function in src/black/strings.py. | ||
|
|
||
| You should run this script when you upgrade wcwidth, which is expected to | ||
| happen when a new Unicode version is released. The generated table contains | ||
| the version of wcwidth and Unicode that it was generated for. | ||
|
|
||
| In order to run this script, you need to install the latest version of wcwidth. | ||
| You can do this by running: | ||
|
|
||
| pip install -U wcwidth | ||
|
|
||
| """ | ||
| import sys | ||
| from os.path import basename, dirname, join | ||
| from typing import Iterable, Tuple | ||
|
|
||
| import wcwidth | ||
|
|
||
|
|
||
| def make_width_table() -> Iterable[Tuple[int, int, int]]: | ||
| start_codepoint = -1 | ||
| end_codepoint = -1 | ||
| range_width = -2 | ||
| for codepoint in range(0, sys.maxunicode + 1): | ||
| width = wcwidth.wcwidth(chr(codepoint)) | ||
| if width <= 1: | ||
| # Ignore narrow characters along with zero-width characters so that | ||
| # they are treated as single-width. Note that treating zero-width | ||
| # characters as single-width is consistent with the heuristics built | ||
| # on top of str.isascii() in the str_width() function in strings.py. | ||
| continue | ||
| if start_codepoint < 0: | ||
| start_codepoint = codepoint | ||
| range_width = width | ||
| elif width != range_width or codepoint != end_codepoint + 1: | ||
| yield (start_codepoint, end_codepoint, range_width) | ||
| start_codepoint = codepoint | ||
| range_width = width | ||
| end_codepoint = codepoint | ||
| if start_codepoint >= 0: | ||
| yield (start_codepoint, end_codepoint, range_width) | ||
|
|
||
|
|
||
| def main() -> None: | ||
| table_path = join(dirname(__file__), "..", "src", "black", "_width_table.py") | ||
| with open(table_path, "w") as f: | ||
| f.write( | ||
| f"""# Generated by {basename(__file__)} | ||
| # wcwidth {wcwidth.__version__} | ||
| # Unicode {wcwidth.list_versions()[-1]} | ||
| import sys | ||
|
JelleZijlstra marked this conversation as resolved.
|
||
| from typing import List, Tuple | ||
|
|
||
| if sys.version_info < (3, 8): | ||
| from typing_extensions import Final | ||
| else: | ||
| from typing import Final | ||
|
|
||
| WIDTH_TABLE: Final[List[Tuple[int, int, int]]] = [ | ||
| """ | ||
| ) | ||
| for triple in make_width_table(): | ||
| f.write(f" {triple!r},\n") | ||
| f.write("]\n") | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.