From 4a8f6df9e54e0821c99a3bdc179fb700979a4cb6 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 25 Jun 2023 10:06:45 +0800 Subject: [PATCH] :bug: Importing markdown files that include `` freezes Fix https://github.com/siyuan-note/siyuan/issues/8611 --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/import.go | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 40bcca44b..e27de0488 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -6,7 +6,7 @@ require ( github.com/88250/clipboard v0.1.5 github.com/88250/css v0.1.2 github.com/88250/gulu v1.2.3-0.20230615033005-b519d6875346 - github.com/88250/lute v1.7.6-0.20230617074457-ffab89d50887 + github.com/88250/lute v1.7.6-0.20230625020150-9c7e1f55e484 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 github.com/ClarkThan/ahocorasick v0.0.0-20230220142845-f237b6348b3e diff --git a/kernel/go.sum b/kernel/go.sum index 5e74bd9ff..26dbd2cf2 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -8,8 +8,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20230615033005-b519d6875346 h1:U0wZN6zuf+vUhzdHC6DbZE/bY5FUt3FuCwn/KgObV44= github.com/88250/gulu v1.2.3-0.20230615033005-b519d6875346/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k= -github.com/88250/lute v1.7.6-0.20230617074457-ffab89d50887 h1:jIOA18lMo4DOdF3K66lu4DCOhgrfeHTNY710cXuPkL0= -github.com/88250/lute v1.7.6-0.20230617074457-ffab89d50887/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= +github.com/88250/lute v1.7.6-0.20230625020150-9c7e1f55e484 h1:O+nvECGCmFj81wI5N2SK8USwFh8xBftkS7gfkNASR9I= +github.com/88250/lute v1.7.6-0.20230625020150-9c7e1f55e484/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY= diff --git a/kernel/model/import.go b/kernel/model/import.go index 2bd891ab8..78b6a2886 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -1046,7 +1046,10 @@ func convertTags(text string) (ret string) { // buildBlockRefInText 将文本节点进行结构化处理。 func buildBlockRefInText() { lute := NewLute() + lute.SetHTMLTag2TextMark(true) for _, tree := range importTrees { + tree.MergeText() + var unlinkTextNodes []*ast.Node ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus { if !entering || ast.NodeText != n.Type { @@ -1089,8 +1092,3 @@ func searchLinkID(link string) (id string) { } return } - -func cleanImport() { - importTrees = []*parse.Tree{} - searchLinks = map[string]string{} -}