Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 26 additions & 8 deletions packages/parser/src/lexer/lexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,17 @@ export class Lexer {
return result;
}

/**
* Returns the type of the last non-whitespace token, or null if none.
*/
private lastNonWhitespaceTokenType(): TokenType | null {
for (let i = this.state.tokens.length - 1; i >= 0; i--) {
const t = this.state.tokens[i]!;
if (t.type !== "WHITESPACE") return t.type;
}
return null;
}

/**
* Add token
*/
Expand Down Expand Up @@ -543,16 +554,23 @@ export class Lexer {
return;
}

// Quoted string
// Quoted string (only after EQUALS for block attribute values)
// In inline context, " is just a text character (typographic quotes)
if (char === '"') {
let quoted = this.advance(); // opening "
while (!this.isAtEnd() && this.current() !== '"' && this.current() !== "\n") {
quoted += this.advance();
}
if (this.current() === '"') {
quoted += this.advance(); // closing "
const lastNonWs = this.lastNonWhitespaceTokenType();
if (lastNonWs === "EQUALS") {
let quoted = this.advance(); // opening "
while (!this.isAtEnd() && this.current() !== '"' && this.current() !== "\n") {
quoted += this.advance();
}
if (this.current() === '"') {
quoted += this.advance(); // closing "
}
this.addToken("QUOTED_STRING", quoted);
return;
}
this.addToken("QUOTED_STRING", quoted);
this.advance();
this.addToken("TEXT", '"');
return;
}

Expand Down
20 changes: 18 additions & 2 deletions tests/fixtures/footnote/basic/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,15 @@
},
{
"element": "text",
"data": "\"fruit\""
"data": "\""
},
{
"element": "text",
"data": "fruit"
},
{
"element": "text",
"data": "\""
},
{
"element": "text",
Expand All @@ -360,7 +368,15 @@
},
{
"element": "text",
"data": "\"vegetable\""
"data": "\""
},
{
"element": "text",
"data": "vegetable"
},
{
"element": "text",
"data": "\""
},
{
"element": "text",
Expand Down
18 changes: 17 additions & 1 deletion tests/fixtures/link/triple/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,23 @@
},
{
"element": "text",
"data": "\"Recent Changes\""
"data": "\""
},
{
"element": "text",
"data": "Recent"
},
{
"element": "text",
"data": " "
},
{
"element": "text",
"data": "Changes"
},
{
"element": "text",
"data": "\""
},
{
"element": "text",
Expand Down
80 changes: 78 additions & 2 deletions tests/fixtures/misc/string/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
},
{
"element": "text",
"data": "\"string\""
"data": "\""
},
{
"element": "text",
"data": "string"
},
{
"element": "text",
"data": "\""
},
{
"element": "text",
Expand All @@ -41,7 +49,75 @@
"elements": [
{
"element": "text",
"data": "\"This one\\x01 has\\t escapes \\n\\b\""
"data": "\""
},
{
"element": "text",
"data": "This"
},
{
"element": "text",
"data": " "
},
{
"element": "text",
"data": "one"
},
{
"element": "text",
"data": "\\"
},
{
"element": "text",
"data": "x01"
},
{
"element": "text",
"data": " "
},
{
"element": "text",
"data": "has"
},
{
"element": "text",
"data": "\\"
},
{
"element": "text",
"data": "t"
},
{
"element": "text",
"data": " "
},
{
"element": "text",
"data": "escapes"
},
{
"element": "text",
"data": " "
},
{
"element": "text",
"data": "\\"
},
{
"element": "text",
"data": "n"
},
{
"element": "text",
"data": "\\"
},
{
"element": "text",
"data": "b"
},
{
"element": "text",
"data": "\""
}
]
}
Expand Down