Skip to content

Fix JS extractor line numbers being off on CRLF files #1288

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

Merged
akx merged 2 commits into from
Oct 30, 2026
Merged

Fix JS extractor line numbers being off on CRLF files #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e49025
Fix JS extractor line numbers being off on CRLF files
apoorva-01 Jul 1, 2026
ada27e4
Simplify tests
akx Oct 30, 2026
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
4 changes: 2 additions & 2 deletions babel/messages/jslexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class Token(NamedTuple):

_rules: list[tuple[str | None, re.Pattern[str]]] = [
(None, re.compile(r'\s+', re.UNICODE)),
(None, re.compile(r'<!--.*')),
('linecomment', re.compile(r'//.*')),
(None, re.compile(r'<!--[^\r\n]*')),
('linecomment', re.compile(r'//[^\r\n]*')),
('multilinecomment', re.compile(r'/\*.*?\*/', re.UNICODE | re.DOTALL)),
('dotted_name', dotted_name_re),
('name', name_re),
Expand Down
16 changes: 9 additions & 7 deletions tests/messages/test_js_extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@ def test_various_calls():
]


def test_message_with_line_comment():
buf = BytesIO("""\
// NOTE: hello
msg = _('Bonjour à tous')
""".encode('utf-8'))
@pytest.mark.parametrize('newline', ['\n', '\r\n'])
def test_message_with_line_comment(newline):
buf = BytesIO(newline.join([
"<!-- ignored",
"// NOTE: hello",
"msg = _('Bonjour à tous')",
"",
]).encode('utf-8'))
messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
assert messages[0][2] == 'Bonjour à tous'
assert messages[0][3] == ['NOTE: hello']
assert messages == [(3, '_', 'Bonjour à tous', ['NOTE: hello'])]


def test_message_with_multiline_comment():
Expand Down
Loading