Skip to content

Fix JavaScript escaped line terminator extraction #1315

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
nightcityblade wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

Fix JavaScript escaped line terminator extraction #1315

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 babel/messages/jslexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def unquote_string(string: str) -> str:
assert string and string[0] == string[-1] and string[0] in '"\'`', (
'string provided is not properly delimited'
)
string = line_join_re.sub('\\1', string[1:-1])
string = line_join_re.sub('', string[1:-1])
result: list[str] = []
add = result.append
pos = 0
Expand Down
6 changes: 6 additions & 0 deletions tests/messages/test_js_extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ def test_simple_extract():
(3, ('s', 'p'), [], None)]


def test_extract_string_with_escaped_line_terminator():
buf = BytesIO(b"_('hey\\\nlol')")
messages = list(extract.extract('javascript', buf, extract.DEFAULT_KEYWORDS, [], {}))
assert messages == [(1, 'heylol', [], None)]


def test_various_calls():
buf = BytesIO(b"""\
msg1 = _(i18n_arg.replace(/"/, '"'))
Expand Down