grendervill/Flora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MarkdownView: исправлен делегат и парсинг блоков

Browse Source 
- Repeater delegate: убраны required property, заменены на property string blockType: model.type || "" и т.д. для html/code блоков (иначе QML Cannot create delegate когда у html нет codeId)
- parseBlocks тест в mdparser_test.cpp: проверка 3 блоков (html/code/html) и highlighted
- Убран console.log из MarkdownView::update
This commit is contained in:
grendervill
2026-09-01 21:24:37 +03:00
parent 9a49829611
commit b3fa778d88
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qml/panels/MarkdownView.qml
+14 -17
View File
@@ -17,7 +17,6 @@ Item {
// Триггерим пересборку блоков
blocksModel.clear()
const blocks = mdParser.parseBlocks(markdown, vaultRoot, fileDir)
// console.log("MarkdownView update", markdown.length, blocks.length)
for (let i = 0; i < blocks.length; i++) {
blocksModel.append(blocks[i])
}
@@ -35,30 +34,28 @@ Item {
Column {
id: column
width: parent.width
spacing: 8
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 12
spacing: 8
Repeater {
model: blocksModel
delegate: Item {
required property int index
required property string type
required property string html
required property string code
required property string language
required property string codeId
required property string highlighted
width: parent.width
height: childrenRect.height
property string blockType: model.type || ""
property string blockHtml: model.html || ""
property string blockCode: model.code || ""
property string blockLang: model.language || "text"
property string blockCodeId: model.codeId || ""
property string blockHighlighted: model.highlighted || ""
// HTML block
Text {
visible: type === "html" && html
visible: blockType === "html" && blockHtml
width: parent.width
text: html || ""
text: blockHtml
textFormat: Text.RichText
wrapMode: Text.Wrap
color: Theme.text
@@ -68,12 +65,12 @@ Item {
}
// Code block - separate component
CodeBlock {
visible: type === "code"
visible: blockType === "code"
width: parent.width
code: code || ""
language: language || "text"
codeId: codeId || ""
highlightedText: highlighted || ""
code: blockCode
language: blockLang
codeId: blockCodeId
highlightedText: blockHighlighted
onCopyRequested: (id) => {
const txt = mdParser.getCodeBlock(id)
if (txt.length > 0) {
tests/mdparser_test.cpp
+10
View File
@@ -105,6 +105,16 @@ int main(int argc, char *argv[])
if (!probe(im, "<img") && !probe(im, "изображение"))
return fail("картинка", im);
// CodeBlock отдельный компонент — parseBlocks
auto blocks = p.parseBlocks("# Hello\n\n```cpp\nint x=1;\n```\n\nText", vault, fileDir);
if (blocks.size() != 3) return fail("parseBlocks size", QString::number(blocks.size()));
if (blocks[0].toMap().value("type").toString() != "html") return fail("block 0 type", blocks[0].toMap().value("type").toString());
if (blocks[1].toMap().value("type").toString() != "code") return fail("block 1 type", blocks[1].toMap().value("type").toString());
if (blocks[1].toMap().value("language").toString() != "C++" && blocks[1].toMap().value("language").toString() != "cpp") return fail("block 1 lang", blocks[1].toMap().value("language").toString());
if (!blocks[1].toMap().value("code").toString().contains("int x=1;")) return fail("block 1 code", blocks[1].toMap().value("code").toString());
if (blocks[1].toMap().value("highlighted").toString().isEmpty()) return fail("highlighted empty");
if (blocks[2].toMap().value("type").toString() != "html") return fail("block 2 type");
std::printf("MDPARSER TEST OK\n");
return 0;
}