Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix lexer and tokenizer to retain line breaks properly #2341

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 6 commits into from
Jan 6, 2022
Merged

Fix lexer and tokenizer to retain line breaks properly #2341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7183372
Fix lexer and tokenizer to retain line breaks properly
phillipb Dec 31, 2021
8e1c316
Add test for bug
phillipb Dec 31, 2021
1317eb0
Check for line breaks not just spaces
phillipb Dec 31, 2021
d28368e
Fix lint
phillipb Dec 31, 2021
4b2185a
Fix spacing in test
phillipb Jan 4, 2022
bd3e980
clean up code
UziTech Jan 4, 2022
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
Prev Previous commit
clean up code
  • Loading branch information
@UziTech
UziTech committed Jan 4, 2022
commit bd3e9806193e134a032ea50f3238a03e80676959
11 changes: 5 additions & 6 deletions src/Lexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,11 @@ export class Lexer {
// newline
if (token = this.tokenizer.space(src)) {
src = src.substring(token.raw.length);
if (token.raw.length === 1 && tokens[tokens.length - 1]) {
// if there's a single \n as a spacer, it's terminating the last line, so move it there so that we don't get unecessary paragraph tags
tokens[tokens.length - 1].raw = `${tokens[tokens.length - 1].raw}\n`;
continue;
}
if (token.type) {
if (token.raw.length === 1 && tokens.length > 0) {
// if there's a single \n as a spacer, it's terminating the last line,
// so move it there so that we don't get unecessary paragraph tags
tokens[tokens.length - 1].raw += '\n';
} else {
tokens.push(token);
}
continue;
Expand Down
13 changes: 5 additions & 8 deletions src/Tokenizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,11 @@ export class Tokenizer {

space(src) {
const cap = this.rules.block.newline.exec(src);
if (cap) {
if (cap[0].length) {
return {
type: 'space',
raw: cap[0]
};
}
return { raw: '\n' };
if (cap && cap[0].length > 0) {
return {
type: 'space',
raw: cap[0]
};
}
}

Expand Down