From dd07bac0405ff978794bfd49f4c69962019121cf Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 18 May 2023 09:38:26 +0800 Subject: [PATCH] :bug: Parse exceptions when copying and pasting hyperlink whose address contains `"` Fix https://github.com/siyuan-note/siyuan/issues/8290 --- kernel/go.mod | 2 +- kernel/go.sum | 8 ++------ kernel/treenode/node.go | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index df51b4d26..9e9e49279 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.20230501031728-4d62370997cd - github.com/88250/lute v1.7.6-0.20230517134223-ed6fca094739 + github.com/88250/lute v1.7.6-0.20230518012955-a364fc745f14 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 532c0411f..5ba0c49dc 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -8,10 +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.20230501031728-4d62370997cd h1:PgbmnoTqfVbYyhUljovnAz6l/oWPlbM1d5yrkVDHO1w= github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k= -github.com/88250/lute v1.7.6-0.20230514021025-e7cf9adb9658 h1:Eg1wbQtCHZNjuMd5Z1SwMuV3QPUmOFu3Qp3vLp1Z/Pg= -github.com/88250/lute v1.7.6-0.20230514021025-e7cf9adb9658/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= -github.com/88250/lute v1.7.6-0.20230517134223-ed6fca094739 h1:tz5dSdqWg1plGwiIpTYFXeYnSwMIW2XCfO9pJMU4Sck= -github.com/88250/lute v1.7.6-0.20230517134223-ed6fca094739/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= +github.com/88250/lute v1.7.6-0.20230518012955-a364fc745f14 h1:5gtz0dUJ0M9gJ+sfJEApINQhCRStBBkVBXTcihy7V9I= +github.com/88250/lute v1.7.6-0.20230518012955-a364fc745f14/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= @@ -65,8 +63,6 @@ github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkz github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dlclark/regexp2 v1.9.0 h1:pTK/l/3qYIKaRXuHnEnIf7Y5NxfRPfpb7dis6/gdlVI= -github.com/dlclark/regexp2 v1.9.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0= github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index 766e4eef3..02b8da8ff 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -228,11 +228,11 @@ func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATi if n.IsTextMarkType("a") && includeTextMarkATitleURL { // 搜索不到超链接元素的 URL 和标题 https://github.com/siyuan-note/siyuan/issues/7352 if "" != n.TextMarkATitle { - buf.WriteString(" " + n.TextMarkATitle) + buf.WriteString(" " + html.UnescapeHTMLStr(n.TextMarkATitle)) } if !strings.HasPrefix(n.TextMarkAHref, "assets/") || includeAssetPath { - buf.WriteString(" " + n.TextMarkAHref) + buf.WriteString(" " + html.UnescapeHTMLStr(n.TextMarkAHref)) } } case ast.NodeBackslash: