mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: properly match blockId and pass it to ast

This commit is contained in:
linonetwo 2023-09-16 04:09:21 +08:00
parent d5e9d2a71b
commit b956e72536
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/parsers/wikiparser/rules/prettylink.js
View File

@ -23,8 +23,8 @@ exports.types = {inline: true};
exports.init = function(parser) {
this.parser = parser;
// Regexp to match `[[Title^blockId|Alias]]`, the `^blockId` and `|Alias` are optional.
this.matchRegExp = /\[\[(.*?)(?:\^([^|\s^]+))?(?:\|(.*?))?\]\]/mg;
// Regexp to match `[[Alias|Title^blockId]]`, the `Alias|` and `^blockId` are optional.
this.matchRegExp = /\[\[(.*?)(?:\|(.*?)?)?(?:\^([^|\s^]+)?)?\]\]/mg;
};
exports.parse = function() {
@ -32,8 +32,8 @@ exports.parse = function() {
this.parser.pos = this.matchRegExp.lastIndex;
// Process the link
var text = this.match[1],
blockId = this.match[2] || "",
link = this.match[3] || text;
link = this.match[2] || text,
blockId = this.match[3] || "";
if($tw.utils.isLinkExternal(link)) {
// add back the part after `^` to the ext link, if it happen to has one.
if(blockId) {
@ -57,7 +57,7 @@ exports.parse = function() {
type: "link",
attributes: {
to: {type: "string", value: link},
id: {type: "string", value: blockId},
toBlockId: {type: "string", value: blockId},
},
children: [{
type: "text", text: text