neil/silverbullet
1
0
Fork 0
Code Activity

Change anchor reference syntax

Browse Source
This commit is contained in:
Zef Hemel
2023-11-03 12:01:33 +01:00
parent 28b0e9f9e9
commit e0b6fbed3e
20 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugs/editor/broken_links.ts
+1 -1
View File
@@ -13,7 +13,7 @@ export async function brokenLinksCommand() {
traverseTree(tree, (tree) => {
if (tree.type === "WikiLinkPage") {
// Add the prefix in the link text
const [pageName] = tree.children![0].text!.split("@");
const [pageName] = tree.children![0].text!.split(/[@$]/);
if (pageName.startsWith("!")) {
return true;
}
plugs/editor/complete.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { cacheFileListing } from "../federation/federation.ts";
// Completion
export async function pageComplete(completeEvent: CompleteEvent) {
const match = /\[\[([^\]@:\{}]*)$/.exec(completeEvent.linePrefix);
const match = /\[\[([^\]@$:\{}]*)$/.exec(completeEvent.linePrefix);
if (!match) {
return null;
}
plugs/editor/navigate.ts
+2 -2
View File
@@ -41,8 +41,8 @@ async function actionClickOrActionEnter(
case "WikiLink": {
let pageLink = mdTree.children![1]!.children![0].text!;
let pos;
if (pageLink.includes("@")) {
[pageLink, pos] = pageLink.split("@");
if (pageLink.includes("@") || pageLink.includes("$")) {
[pageLink, pos] = pageLink.split(/[@$]/);
if (pos.match(/^\d+$/)) {
pos = +pos;
}
plugs/index/anchor.ts
+6 -4
View File
@@ -17,7 +17,7 @@ export async function indexAnchors({ name: pageName, tree }: IndexTreeEvent) {
collectNodesOfType(tree, "NamedAnchor").forEach((n) => {
const aName = n.children![0].text!.substring(1);
anchors.push({
ref: `${pageName}@${aName}`,
ref: `${pageName}$${aName}`,
tags: ["anchor"],
name: aName,
page: pageName,
@@ -29,12 +29,14 @@ export async function indexAnchors({ name: pageName, tree }: IndexTreeEvent) {
}
export async function anchorComplete(completeEvent: CompleteEvent) {
const match = /\[\[([^\]@:]*@[\w\.\-\/]*)$/.exec(completeEvent.linePrefix);
const match = /\[\[([^\]@$:]*[@$][\w\.\-\/]*)$/.exec(
completeEvent.linePrefix,
);
if (!match) {
return null;
}
const pageRef = match[1].split("@")[0];
const pageRef = match[1].split(/[@$]/)[0];
let filter: QueryExpression | undefined = ["=", ["attr", "page"], [
"string",
pageRef,
@@ -47,7 +49,7 @@ export async function anchorComplete(completeEvent: CompleteEvent) {
return {
from: completeEvent.pos - match[1].length,
options: allAnchors.map((a) => ({
label: a.page === completeEvent.pageName ? `@${a.name}` : a.ref,
label: a.page === completeEvent.pageName ? `\$${a.name}` : a.ref,
type: "anchor",
})),
};
plugs/index/mentions_ps.ts
+1 -1
View File
@@ -26,7 +26,7 @@ export async function updateMentions() {
// use internal navigation via syscall to prevent reloading the full page.
export async function navigate(ref: string) {
const [page, pos] = ref.split("@");
const [page, pos] = ref.split(/[@$]/);
await editor.navigate(page, +pos);
}
plugs/index/page_links.ts
+1 -3
View File
@@ -103,9 +103,7 @@ export async function indexLinks({ name, tree }: IndexTreeEvent) {
const wikiLinkAlias = findNodeOfType(n, "WikiLinkAlias");
let toPage = resolvePath(name, wikiLinkPage.children![0].text!);
const pos = wikiLinkPage.from!;
if (toPage.includes("@")) {
toPage = toPage.split("@")[0];
}
toPage = toPage.split(/[@$]/)[0];
const link: LinkObject = {
ref: `${name}@${pos}`,
tags: ["link"],
plugs/markdown/assets/markdown_widget.css
+1 -1
View File
@@ -81,7 +81,7 @@ body:active #button-bar {
}
#edit-button,
#source-button {
#reload-button {
margin-left: -10px;
}
plugs/markdown/markdown_content_widget.ts
+2 -2
View File
@@ -13,7 +13,7 @@ export async function markdownContentWidget(
const html = renderMarkdownToHtml(mdTree, { smartHardBreak: true });
return {
html: await wrapHTML(html),
script: await prepareJS(markdownText, pageName),
script: await prepareJS(pageName, markdownText),
// And add back the markdown text so we can render it in a different way if desired
markdown: markdownText,
};
@@ -41,8 +41,8 @@ export async function wrapHTML(html: string): Promise<string> {
<div id="sb-main"><div id="sb-editor"><div class="cm-editor">
<!-- And add an edit button -->
<div id="button-bar">
<button id="reload-button" title="Reload"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"></polyline><polyline points="1 20 1 14 7 14"></polyline><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg></button>
<button id="source-button" title="Show Markdown source"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-code"><polyline points="16 18 22 12 16 6"></polyline><polyline points="8 6 2 12 8 18"></polyline></svg></button>
<button id="reload-button" title="Reload"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"></polyline><polyline points="1 20 1 14 7 14"></polyline><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg></button>
<button id="edit-button" title="Edit"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg></button>
</div>
<div id="body-content">
plugs/markdown/markdown_render.ts
+1 -1
View File
@@ -273,7 +273,7 @@ function render(
let externalTaskRef = "";
collectNodesOfType(t, "WikiLinkPage").forEach((wikilink) => {
const ref = wikilink.children![0].text!;
if (!externalTaskRef && ref.includes("@")) {
if (!externalTaskRef && (ref.includes("@") || ref.includes("$"))) {
externalTaskRef = ref;
}
});
plugs/query/query.ts
+1
View File
@@ -62,6 +62,7 @@ export async function widget(
return system.invokeFunction(
"markdown.markdownContentWidget",
resultMarkdown,
pageName,
);
} catch (e: any) {
return system.invokeFunction(
plugs/query/template.ts
+2
View File
@@ -55,11 +55,13 @@ export async function widget(
return system.invokeFunction(
"markdown.markdownContentWidget",
rendered,
pageName,
);
} catch (e: any) {
return system.invokeFunction(
"markdown.markdownContentWidget",
`**Error:** ${e.message}`,
pageName,
);
}
}