Skip to content

Fix rename offsets in Python 3.14 t-strings #915

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.

Sign up for GitHub

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

Open
sean0407 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix rename offsets in Python 3.14 t-strings #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rope/base/codeanalyze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ def get_formatted_string_pattern():


def get_any_string_pattern():
prefix = r"[bBfFrRuU]{,4}"
prefix = r"[bBfFrRuUtT]{,4}"
return get_string_pattern_with_prefix(
prefix,
prefix_group_name="prefix",
Expand Down
5 changes: 4 additions & 1 deletion rope/base/simplify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ def real_code(source):
for start, end, matchgroups in ignored_regions(source):
if source[start] == "#":
replacement = " " * (end - start)
elif "f" in matchgroups.get("prefix", "").lower():
elif any(
prefix in matchgroups.get("prefix", "").lower()
for prefix in ("f", "t")
):
replacement = None
else:
replacement = '"%s"' % (" " * (end - start - 2))
Expand Down
6 changes: 6 additions & 0 deletions ropetest/refactor/renametest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,12 @@ def test_renaming_occurrence_in_f_string(self):
refactored = self._local_rename(code, 2, "new_var")
self.assertEqual(expected, refactored)

def test_renaming_occurrence_in_t_string(self):
code = 'a = 20\na_string = f(t"{a}(", ")")\n'
expected = 'new_var = 20\na_string = f(t"{new_var}(", ")")\n'
refactored = self._local_rename(code, 0, "new_var")
self.assertEqual(expected, refactored)

def test_renaming_occurrence_in_nested_f_string(self):
code = dedent("""\
a_var = 20
Expand Down
Loading