Skip to content

Recognize CRLF as EOL in inline comments when retokenizing and add a test for that. #137

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
merged 1 commit into from
Mar 5, 2019
Merged

Recognize CRLF as EOL in inline comments when retokenizing and add a test for that. #137

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
4 changes: 2 additions & 2 deletions lib/nodes/inline-comment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ module.exports = {
let last;

while (token) {
if (/\n/.test(token[1])) {
if (/\r?\n/.test(token[1])) {
// If there are quotes, fix tokenizer creating one token from start quote to end quote
if (/['"].*\n/.test(token[1])) {
if (/['"].*\r?\n/.test(token[1])) {
// Add string before newline to inline comment token
bits.push(token[1].substring(0, token[1].indexOf('\n')));

Expand Down
16 changes: 16 additions & 0 deletions test/parser/comments.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ test('inline comment', (t) => {
t.is(nodeToString(root), less);
});

test('two-line inline comment with a single quote and windows EOL', (t) => {
const less = `// it's first comment (this line should end with Windows new line symbols)\r\n// it's second comment`;
const root = parse(less);
const [first, second, ...rest] = root.nodes;

t.truthy(root);
t.true(first instanceof Comment);
t.true(first.inline);
t.is(first.text, `it's first comment (this line should end with Windows new line symbols)`);
t.true(second instanceof Comment);
t.true(second.inline);
t.is(second.text, `it's second comment`);
t.is(nodeToString(root), less);
t.is(rest.length, 0);
});

test('inline comment without leading space', (t) => {
const less = '//batman';
const root = parse(less);
Expand Down