Skip to content

Commit 216bec0

Browse files
committed
🎨 Protyle Improve soft line break paste parsing siyuan-note/siyuan#14481
1 parent e4fc6c0 commit 216bec0

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

javascript/lute.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

javascript/lute.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

parse/text.go

+5
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ func (t *Tree) parseNewline(block *ast.Node, ctx *InlineContext) (ret *ast.Node)
121121
}
122122

123123
ret = &ast.Node{Type: ast.NodeSoftBreak, Tokens: []byte{ctx.tokens[pos]}}
124+
if t.Context.ParseOption.ProtyleWYSIWYG {
125+
// Protyle 中的换行符都是软换行 Improve soft line break paste parsing https://github.com/siyuan-note/siyuan/issues/14481
126+
return
127+
}
128+
124129
if isHardBreak {
125130
ret.Type = ast.NodeHardBreak
126131
}

test/m2p_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
var md2BlockDOMTests = []parseTest{
2121

22+
{"100", "foo \nbar", "<div data-node-id=\"20060102150405-1a2b3c4\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20060102150405\"><div contenteditable=\"true\" spellcheck=\"false\">foo\nbar</div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
2223
{"99", "$$ P(Y|X) = \\frac{P(X,Y)}{P(X)} $$ \nbar", "<div data-node-id=\"20060102150405-1a2b3c4\" data-node-index=\"1\" data-type=\"NodeMathBlock\" class=\"render-node\" updated=\"20060102150405\" data-content=\"P(Y|X) = \\frac{P(X,Y)}{P(X)}\" data-subtype=\"math\"><div spin=\"1\"></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div><div data-node-id=\"20060102150405-1a2b3c4\" data-node-index=\"2\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20060102150405\"><div contenteditable=\"true\" spellcheck=\"false\">bar</div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
2324
{"98", "<strong>foo </strong>bar", "<div data-node-id=\"20060102150405-1a2b3c4\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20060102150405\"><div contenteditable=\"true\" spellcheck=\"false\"><span data-type=\"strong\">foo</span> bar</div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
2425
{"97", "((20250305201451-jjziqik '​'))", "<div data-node-id=\"20060102150405-1a2b3c4\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20060102150405\"><div contenteditable=\"true\" spellcheck=\"false\"><span data-type=\"block-ref\" data-subtype=\"d\" data-id=\"20250305201451-jjziqik\">20250305201451-jjziqik</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},

0 commit comments

Comments
 (0)