Skip to content

Commit

Permalink
🗜️ build [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkedJS bot committed May 3, 2020
1 parent 0a57e47 commit 623858c
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 33 deletions.
61 changes: 44 additions & 17 deletions lib/marked.esm.js
View file
Expand Up @@ -380,21 +380,21 @@ var Tokenizer_1 = class Tokenizer {
const lastToken = tokens[tokens.length - 1];
// An indented code block cannot interrupt a paragraph.
if (lastToken && lastToken.type === 'paragraph') {
tokens.pop();
lastToken.text += '\n' + cap[0].trimRight();
lastToken.raw += '\n' + cap[0];
return lastToken;
} else {
const text = cap[0].replace(/^ {4}/gm, '');
return {
type: 'code',
raw: cap[0],
codeBlockStyle: 'indented',
text: !this.options.pedantic
? rtrim$1(text, '\n')
: text
text: cap[0].trimRight()
};
}

const text = cap[0].replace(/^ {4}/gm, '');
return {
type: 'code',
raw: cap[0],
codeBlockStyle: 'indented',
text: !this.options.pedantic
? rtrim$1(text, '\n')
: text
};
}
}

Expand Down Expand Up @@ -670,9 +670,17 @@ var Tokenizer_1 = class Tokenizer {
}
}

text(src) {
text(src, tokens) {
const cap = this.rules.block.text.exec(src);
if (cap) {
const lastToken = tokens[tokens.length - 1];
if (lastToken && lastToken.type === 'text') {
return {
raw: cap[0],
text: cap[0]
};
}

return {
type: 'text',
raw: cap[0],
Expand Down Expand Up @@ -800,10 +808,17 @@ var Tokenizer_1 = class Tokenizer {
codespan(src) {
const cap = this.rules.inline.code.exec(src);
if (cap) {
let text = cap[2].replace(/\n/g, ' ');
const hasNonSpaceChars = /[^ ]/.test(text);
const hasSpaceCharsOnBothEnds = text.startsWith(' ') && text.endsWith(' ');
if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
text = text.substring(1, text.length - 1);
}
text = escape$1(text, true);
return {
type: 'codespan',
raw: cap[0],
text: escape$1(cap[2].trim(), true)
text
};
}
}
Expand Down Expand Up @@ -1292,7 +1307,7 @@ var Lexer_1 = class Lexer {
*/
blockTokens(src, tokens = [], top = true) {
src = src.replace(/^ +$/gm, '');
let token, i, l;
let token, i, l, lastToken;

while (src) {
// newline
Expand All @@ -1307,7 +1322,13 @@ var Lexer_1 = class Lexer {
// code
if (token = this.tokenizer.code(src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);
if (token.type) {
tokens.push(token);
} else {
lastToken = tokens[tokens.length - 1];
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
}
continue;
}

Expand Down Expand Up @@ -1399,9 +1420,15 @@ var Lexer_1 = class Lexer {
}

// text
if (token = this.tokenizer.text(src)) {
if (token = this.tokenizer.text(src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);
if (token.type) {
tokens.push(token);
} else {
lastToken = tokens[tokens.length - 1];
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
}
continue;
}

Expand Down
64 changes: 49 additions & 15 deletions lib/marked.js
View file
Expand Up @@ -432,19 +432,19 @@
var lastToken = tokens[tokens.length - 1]; // An indented code block cannot interrupt a paragraph.

if (lastToken && lastToken.type === 'paragraph') {
tokens.pop();
lastToken.text += '\n' + cap[0].trimRight();
lastToken.raw += '\n' + cap[0];
return lastToken;
} else {
var text = cap[0].replace(/^ {4}/gm, '');
return {
type: 'code',
raw: cap[0],
codeBlockStyle: 'indented',
text: !this.options.pedantic ? rtrim$1(text, '\n') : text
text: cap[0].trimRight()
};
}

var text = cap[0].replace(/^ {4}/gm, '');
return {
type: 'code',
raw: cap[0],
codeBlockStyle: 'indented',
text: !this.options.pedantic ? rtrim$1(text, '\n') : text
};
}
};

Expand Down Expand Up @@ -720,10 +720,19 @@
}
};

_proto.text = function text(src) {
_proto.text = function text(src, tokens) {
var cap = this.rules.block.text.exec(src);

if (cap) {
var lastToken = tokens[tokens.length - 1];

if (lastToken && lastToken.type === 'text') {
return {
raw: cap[0],
text: cap[0]
};
}

return {
type: 'text',
raw: cap[0],
Expand Down Expand Up @@ -858,10 +867,19 @@
var cap = this.rules.inline.code.exec(src);

if (cap) {
var text = cap[2].replace(/\n/g, ' ');
var hasNonSpaceChars = /[^ ]/.test(text);
var hasSpaceCharsOnBothEnds = text.startsWith(' ') && text.endsWith(' ');

if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
text = text.substring(1, text.length - 1);
}

text = _escape(text, true);
return {
type: 'codespan',
raw: cap[0],
text: _escape(cap[2].trim(), true)
text: text
};
}
};
Expand Down Expand Up @@ -1261,7 +1279,7 @@
}

src = src.replace(/^ +$/gm, '');
var token, i, l;
var token, i, l, lastToken;

while (src) {
// newline
Expand All @@ -1278,7 +1296,15 @@

if (token = this.tokenizer.code(src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);

if (token.type) {
tokens.push(token);
} else {
lastToken = tokens[tokens.length - 1];
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
}

continue;
} // fences

Expand Down Expand Up @@ -1374,9 +1400,17 @@
} // text


if (token = this.tokenizer.text(src)) {
if (token = this.tokenizer.text(src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);

if (token.type) {
tokens.push(token);
} else {
lastToken = tokens[tokens.length - 1];
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
}

continue;
}

Expand Down

1 comment on commit 623858c

@vercel
Copy link

@vercel vercel bot commented on 623858c May 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to following URLs:

Please sign in to comment.