Loading src/black/__init__.py +15 −2 Changes for src/black/__init__.py: 15 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -3590,7 +3590,8 @@ class StringSplitter(CustomSplitMapMixin, BaseStringSplitter): MIN_SUBSTR_SIZE characters. The string will ONLY be split on spaces (i.e. each new substring should start with a space). start with a space). Note that the string will NOT be split on a space which is escaped with a backslash. If the string is an f-string, it will NOT be split in the middle of an f-expression (e.g. in f"FooBar: {foo() if x else bar()}", {foo() if x Loading Loading @@ -3930,11 +3931,23 @@ def passes_all_checks(i: Index) -> bool: section of this classes' docstring would be be met by returning @i. """ is_space = string[i] == " " is_not_escaped = True j = i - 1 while is_valid_index(j) and string[j] == "\\": is_not_escaped = not is_not_escaped j -= 1 is_big_enough = ( len(string[i:]) >= self.MIN_SUBSTR_SIZE and len(string[:i]) >= self.MIN_SUBSTR_SIZE ) return is_space and is_big_enough and not breaks_fstring_expression(i) return ( is_space and is_not_escaped and is_big_enough and not breaks_fstring_expression(i) ) # First, we check all indices BELOW @max_break_idx. break_idx = max_break_idx Loading tests/data/long_strings__regression.py +37 −0 Changes for tests/data/long_strings__regression.py: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -353,6 +353,24 @@ def xxxxxxx_xxxxxx(xxxx): key ] = "test" # set some Thrift field to non-None in the struct aa bb cc dd ee RE_ONE_BACKSLASH = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_TWO_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_THREE_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } # output Loading Loading @@ -793,3 +811,22 @@ def xxxxxxx_xxxxxx(xxxx): value.__dict__[ key ] = "test" # set some Thrift field to non-None in the struct aa bb cc dd ee RE_ONE_BACKSLASH = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_TWO_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\" r" )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_THREE_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } Loading
src/black/__init__.py +15 −2 Changes for src/black/__init__.py: 15 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -3590,7 +3590,8 @@ class StringSplitter(CustomSplitMapMixin, BaseStringSplitter): MIN_SUBSTR_SIZE characters. The string will ONLY be split on spaces (i.e. each new substring should start with a space). start with a space). Note that the string will NOT be split on a space which is escaped with a backslash. If the string is an f-string, it will NOT be split in the middle of an f-expression (e.g. in f"FooBar: {foo() if x else bar()}", {foo() if x Loading Loading @@ -3930,11 +3931,23 @@ def passes_all_checks(i: Index) -> bool: section of this classes' docstring would be be met by returning @i. """ is_space = string[i] == " " is_not_escaped = True j = i - 1 while is_valid_index(j) and string[j] == "\\": is_not_escaped = not is_not_escaped j -= 1 is_big_enough = ( len(string[i:]) >= self.MIN_SUBSTR_SIZE and len(string[:i]) >= self.MIN_SUBSTR_SIZE ) return is_space and is_big_enough and not breaks_fstring_expression(i) return ( is_space and is_not_escaped and is_big_enough and not breaks_fstring_expression(i) ) # First, we check all indices BELOW @max_break_idx. break_idx = max_break_idx Loading
tests/data/long_strings__regression.py +37 −0 Changes for tests/data/long_strings__regression.py: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -353,6 +353,24 @@ def xxxxxxx_xxxxxx(xxxx): key ] = "test" # set some Thrift field to non-None in the struct aa bb cc dd ee RE_ONE_BACKSLASH = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_TWO_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_THREE_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } # output Loading Loading @@ -793,3 +811,22 @@ def xxxxxxx_xxxxxx(xxxx): value.__dict__[ key ] = "test" # set some Thrift field to non-None in the struct aa bb cc dd ee RE_ONE_BACKSLASH = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_TWO_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\" r" )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), } RE_THREE_BACKSLASHES = { "asdf_hjkl_jkl": re.compile( r"(?<!([0-9]\ ))(?<=(^|\ ))([A-Z]+(\ )?|[0-9](\ )|[a-z](\\\ )){4,7}([A-Z]|[0-9]|[a-z])($|\b)(?!(\ ?([0-9]\ )|(\.)))" ), }