etc/sfm-js
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/sfm-js synced 2024-11-22 14:05:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fix bug of link label parsing" (ignore test)

Browse source
This commit is contained in:
marihachi 2022-01-09 22:07:49 +09:00
parent e1b9f5ac3a
commit c60ba229b5
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/internal/parser.pegjs
View file

@ -32,17 +32,9 @@
function applyParser(input, startRule) {
let parseFunc = peg$parse;
return parseFunc(input, {
startRule: startRule,
fnNameList: options.fnNameList,
nestLimit: (nestLimit - depth),
});
return parseFunc(input, startRule ? { startRule } : { });
}
// link
let isLinkLabel = false;
// emoji
const emojiRegex = require('twemoji-parser/dist/lib/regex').default;
@ -363,7 +355,7 @@ mathInline
// inline: mention
mention
= &{ return !isLinkLabel; } "@" name:mentionName host:("@" @mentionHost)?
= "@" name:mentionName host:("@" @mentionHost)?
{
return MENTION(name, host, text());
}
@ -405,11 +397,11 @@ hashPairInner
// inline: URL
url
= &{ return !isLinkLabel; } "<" url:$("http" "s"? "://" (!(">" / _) CHAR)+) ">"
= "<" url:$("http" "s"? "://" (!(">" / _) CHAR)+) ">"
{
return N_URL(url, true);
}
/ &{ return !isLinkLabel; } "http" "s"? "://" (&([.,]+ urlContentPart) . / urlContentPart)+
/ "http" "s"? "://" (&([.,]+ urlContentPart) . / urlContentPart)+
{
// NOTE: last char is neither "." nor ",".
return N_URL(text());
@ -426,13 +418,13 @@ urlPairInner
// inline: link
link
= &{ return !isLinkLabel; } silent:"?"? "[" label:linkLabel "](" url:url ")"
= silent:"?"? "[" label:linkLabel "](" url:url ")"
{
return LINK((silent != null), url.props.url, mergeText(label));
}
linkLabel
= &{ isLinkLabel = true; return true; } @(@(!"]" @linkLabelPart)+ &{ isLinkLabel = false; return true; } / &{ isLinkLabel = false; return false; })
= (!"]" @linkLabelPart)+
linkLabelPart
= emojiCode