Skip to content

Fix incorrect tokenization when the string close quote is on a newline #23

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
rsmenon merged 2 commits into from
Mar 11, 2025
Merged

Fix incorrect tokenization when the string close quote is on a newline #23

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
eeb5b9f
Fix incorrect tokenization when the string close quote is on a newline
rsmenon Mar 2, 2025
cfc6071
Bump version to 0.4.1
rsmenon Mar 11, 2025
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
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ The most up-to-date lexer and highlighter for [_Mathematica_](http://wolfram.com
source code using the [pygments](http://pygments.org) engine.

![](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)
![](https://img.shields.io/badge/version-0.4.0-yellow.svg?style=flat-square)
![](https://img.shields.io/travis/rsmenon/pygments-mathematica/master.svg?style=flat-square)
![](https://img.shields.io/badge/version-0.4.1-yellow.svg?style=flat-square)
![](https://img.shields.io/badge/python-3.9%2B-lightgrey.svg?style=flat-square)
![](https://img.shields.io/pypi/v/pygments-mathematica.svg?style=flat-square)
## Features
Expand Down
6 changes: 1 addition & 5 deletions mathematica/lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ class MathematicaLexer(RegexLexer):
(Regex.INTEGER, MToken.NUMBER),
],
'strings': [
(r'[^"\\]+', MToken.STRING),
(r'^[\\"]', MToken.STRING),
(r'(\\n|\\r)', MToken.STRING),
(r'\\"', MToken.STRING),
(r'\\', MToken.STRING),
(r'([^"\\]|\\.)+', MToken.STRING),
(r'"', MToken.STRING, '#pop'),
],
}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

setup(
name='pygments-mathematica',
version='0.4.0',
version='0.4.1',
description='Mathematica/Wolfram Language Lexer for Pygments',
long_description=__doc__,
author='rsmenon',
Expand Down
21 changes: 13 additions & 8 deletions tests/test_lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,17 @@ def test_strings(self):
],
[
(MToken.STRING, '"'),
(MToken.STRING, 'a string '),
(MToken.STRING, '\\"'),
(MToken.STRING, ' with a quote'),
(MToken.STRING, 'a string \\" with a quote'),
(MToken.STRING, '"'),
],
[
(MToken.STRING, '"'),
(MToken.STRING, 'a string with a newline'),
(MToken.STRING, '\\n'),
(MToken.STRING, 'a string with a newline\\n'),
(MToken.STRING, '"'),
],
[
(MToken.STRING, '"'),
(MToken.STRING, 'a string with '),
(MToken.STRING, '\\'),
(MToken.STRING, ' two backslashes'),
(MToken.STRING, 'a string with \\ two backslashes'),
(MToken.STRING, '"'),
]
]
Expand Down Expand Up @@ -393,3 +388,13 @@ def test_lexical_scope_nasty(self):
(MToken.GROUP, ']'),
]
self.verify(code, expected)

def test_string_closing_quote_on_newline(self):
code = '"test string\n"abc'
expected = [
(MToken.STRING, '"'),
(MToken.STRING, 'test string\n'),
(MToken.STRING, '"'),
(MToken.SYMBOL, 'abc'),
]
self.verify(code, expected)