neil/silverbullet
1
0
Fork 0
Code

Fixes #433

Browse Source
This commit is contained in:
Zef Hemel 2023-07-28 13:54:31 +02:00
parent 9dd7a5310b
commit f24fbbb472
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugs/directive/command.ts
View File

@ -19,6 +19,8 @@ export async function updateDirectivesOnPageCommand() {
return; return;
} }
await editor.save();
// Collect all directives and their body replacements // Collect all directives and their body replacements
const replacements: { fullMatch: string; textPromise: Promise<string> }[] = const replacements: { fullMatch: string; textPromise: Promise<string> }[] =
[]; [];

49
plugs/tasks/task.ts
View File

@ -14,8 +14,6 @@ import {
import { import {
addParentPointers, addParentPointers,
collectNodesMatching, collectNodesMatching,
collectNodesMatchingAsync,
collectNodesOfType,
findNodeOfType, findNodeOfType,
nodeAtPos, nodeAtPos,
ParseTree, ParseTree,
@ -109,9 +107,8 @@ export async function previewTaskToggle(eventString: string) {
} }
async function toggleTaskMarker( async function toggleTaskMarker(
_pageName: string, pageName: string,
node: ParseTree, node: ParseTree,
moveToPos: number,
) { ) {
let changeTo = "[x]"; let changeTo = "[x]";
if (node.children![0].text === "[x]" || node.children![0].text === "[X]") { if (node.children![0].text === "[x]" || node.children![0].text === "[X]") {
@ -132,23 +129,35 @@ async function toggleTaskMarker(
for (const wikiLink of parentWikiLinks) { for (const wikiLink of parentWikiLinks) {
const ref = wikiLink.children![0].text!; const ref = wikiLink.children![0].text!;
if (ref.includes("@")) { if (ref.includes("@")) {
const [page, pos] = ref.split("@"); const [page, posS] = ref.split("@");
let text = await space.readPage(page); const pos = +posS;
if (page === pageName) {
// In current page, just update the task marker with dispatch
await editor.dispatch({
changes: {
from: pos,
to: pos + changeTo.length,
insert: changeTo,
},
});
} else {
let text = await space.readPage(page);
const referenceMdTree = await markdown.parseMarkdown(text); const referenceMdTree = await markdown.parseMarkdown(text);
// Adding +1 to immediately hit the task marker // Adding +1 to immediately hit the task marker
const taskMarkerNode = nodeAtPos(referenceMdTree, +pos + 1); const taskMarkerNode = nodeAtPos(referenceMdTree, pos + 1);
if (!taskMarkerNode || taskMarkerNode.type !== "TaskMarker") { if (!taskMarkerNode || taskMarkerNode.type !== "TaskMarker") {
console.error( console.error(
"Reference not a task marker, out of date?", "Reference not a task marker, out of date?",
taskMarkerNode, taskMarkerNode,
); );
return; return;
}
taskMarkerNode.children![0].text = changeTo;
text = renderToText(referenceMdTree);
await space.writePage(page, text);
} }
taskMarkerNode.children![0].text = changeTo;
text = renderToText(referenceMdTree);
await space.writePage(page, text);
} }
} }
} }
@ -160,7 +169,7 @@ export async function taskToggleAtPos(pageName: string, pos: number) {
const node = nodeAtPos(mdTree, pos); const node = nodeAtPos(mdTree, pos);
if (node && node.type === "TaskMarker") { if (node && node.type === "TaskMarker") {
await toggleTaskMarker(pageName, node, pos); await toggleTaskMarker(pageName, node);
} }
} }
@ -173,7 +182,7 @@ export async function taskToggleCommand() {
const node = nodeAtPos(tree, pos); const node = nodeAtPos(tree, pos);
// We kwow node.type === Task (due to the task context) // We kwow node.type === Task (due to the task context)
const taskMarker = findNodeOfType(node!, "TaskMarker"); const taskMarker = findNodeOfType(node!, "TaskMarker");
await toggleTaskMarker(await editor.getCurrentPage(), taskMarker!, pos); await toggleTaskMarker(await editor.getCurrentPage(), taskMarker!);
} }
export async function postponeCommand() { export async function postponeCommand() {