Reapplied all the things
parent
a1a10a1d1f
commit
16bf0d866d
|
@ -0,0 +1,8 @@
|
|||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/silverbullet.iml" filepath="$PROJECT_DIR$/.idea/silverbullet.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="WEB_MODULE" version="4">
|
||||
<component name="Go" enabled="true" />
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
|
@ -0,0 +1,16 @@
|
|||
import {SysCallMapping} from "../../plugos/system";
|
||||
import {MarkdownTree, nodeAtPos, parse, render} from "../tree";
|
||||
|
||||
export function markdownSyscalls(): SysCallMapping {
|
||||
return {
|
||||
parse(ctx, text: string): MarkdownTree {
|
||||
return parse(text);
|
||||
},
|
||||
nodeAtPos(ctx, mdTree: MarkdownTree, pos: number): MarkdownTree | null {
|
||||
return nodeAtPos(mdTree, pos);
|
||||
},
|
||||
render(ctx, mdTree: MarkdownTree): string {
|
||||
return render(mdTree);
|
||||
},
|
||||
};
|
||||
}
|
|
@ -0,0 +1,26 @@
|
|||
import {expect, test} from "@jest/globals";
|
||||
import {nodeAtPos, parse, render} from "./tree";
|
||||
|
||||
const mdTest1 = `
|
||||
# Heading
|
||||
## Sub _heading_ cool
|
||||
|
||||
Hello, this is some **bold** text and *italic*. And [a link](http://zef.me).
|
||||
|
||||
- This is a list
|
||||
- With another item
|
||||
- TODOs:
|
||||
- [ ] A task that's not yet done
|
||||
- [x] Hello
|
||||
- And a _third_ one [[Wiki Page]] yo
|
||||
`;
|
||||
|
||||
test("Run a Node sandbox", async () => {
|
||||
let mdTree = parse(mdTest1);
|
||||
console.log(JSON.stringify(mdTree, null, 2));
|
||||
expect(nodeAtPos(mdTree, 4)!.type).toBe("ATXHeading1");
|
||||
expect(nodeAtPos(mdTree, mdTest1.indexOf("Wiki Page"))!.type).toBe(
|
||||
"WikiLink"
|
||||
);
|
||||
expect(render(mdTree)).toBe(mdTest1);
|
||||
});
|
|
@ -0,0 +1,115 @@
|
|||
import {SyntaxNode} from "@lezer/common";
|
||||
import wikiMarkdownLang from "../webapp/parser";
|
||||
|
||||
export type MarkdownTree = {
|
||||
type?: string; // undefined === text node
|
||||
from: number;
|
||||
to: number;
|
||||
text?: string;
|
||||
children?: MarkdownTree[];
|
||||
parent?: MarkdownTree;
|
||||
};
|
||||
|
||||
function treeToAST(text: string, n: SyntaxNode): MarkdownTree {
|
||||
let children: MarkdownTree[] = [];
|
||||
let nodeText: string | undefined;
|
||||
let child = n.firstChild;
|
||||
while (child) {
|
||||
children.push(treeToAST(text, child));
|
||||
child = child.nextSibling;
|
||||
}
|
||||
|
||||
if (children.length === 0) {
|
||||
children = [
|
||||
{
|
||||
from: n.from,
|
||||
to: n.to,
|
||||
text: text.substring(n.from, n.to),
|
||||
},
|
||||
];
|
||||
} else {
|
||||
let newChildren: MarkdownTree[] | string = [];
|
||||
let index = n.from;
|
||||
for (let child of children) {
|
||||
let s = text.substring(index, child.from);
|
||||
if (s) {
|
||||
newChildren.push({
|
||||
from: index,
|
||||
to: child.from,
|
||||
text: s,
|
||||
});
|
||||
}
|
||||
newChildren.push(child);
|
||||
index = child.to;
|
||||
}
|
||||
let s = text.substring(index, n.to);
|
||||
if (s) {
|
||||
newChildren.push({ from: index, to: n.to, text: s });
|
||||
}
|
||||
children = newChildren;
|
||||
}
|
||||
|
||||
let result: MarkdownTree = {
|
||||
type: n.name,
|
||||
from: n.from,
|
||||
to: n.to,
|
||||
};
|
||||
if (children.length > 0) {
|
||||
result.children = children;
|
||||
}
|
||||
if (nodeText) {
|
||||
result.text = nodeText;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Currently unused
|
||||
function addParentPointers(mdTree: MarkdownTree) {
|
||||
if (!mdTree.children) {
|
||||
return;
|
||||
}
|
||||
for (let child of mdTree.children) {
|
||||
child.parent = mdTree;
|
||||
addParentPointers(child);
|
||||
}
|
||||
}
|
||||
|
||||
// Finds non-text node at position
|
||||
export function nodeAtPos(
|
||||
mdTree: MarkdownTree,
|
||||
pos: number
|
||||
): MarkdownTree | null {
|
||||
if (pos < mdTree.from || pos > mdTree.to) {
|
||||
return null;
|
||||
}
|
||||
if (!mdTree.children) {
|
||||
return mdTree;
|
||||
}
|
||||
for (let child of mdTree.children) {
|
||||
let n = nodeAtPos(child, pos);
|
||||
if (n && n.text) {
|
||||
// Got a text node, let's return its parent
|
||||
return mdTree;
|
||||
} else if (n) {
|
||||
// Got it
|
||||
return n;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// Turn MarkdownTree back into regular markdown text
|
||||
export function render(mdTree: MarkdownTree): string {
|
||||
let pieces: string[] = [];
|
||||
if (mdTree.text) {
|
||||
return mdTree.text;
|
||||
}
|
||||
for (let child of mdTree.children!) {
|
||||
pieces.push(render(child));
|
||||
}
|
||||
return pieces.join("");
|
||||
}
|
||||
|
||||
export function parse(text: string): MarkdownTree {
|
||||
return treeToAST(text, wikiMarkdownLang.parser.parse(text).topNode);
|
||||
}
|
|
@ -35,7 +35,7 @@
|
|||
"context": "node"
|
||||
},
|
||||
"test": {
|
||||
"source": [],
|
||||
"source": ["common/tree.test.ts"],
|
||||
"outputFormat": "commonjs",
|
||||
"isLibrary": true,
|
||||
"context": "node"
|
||||
|
@ -54,6 +54,9 @@
|
|||
"@fortawesome/fontawesome-svg-core": "1.3.0",
|
||||
"@fortawesome/free-solid-svg-icons": "6.0.0",
|
||||
"@fortawesome/react-fontawesome": "0.1.17",
|
||||
"@codemirror/highlight": "^0.19.0",
|
||||
"@codemirror/language": "^0.19.0",
|
||||
"@lezer/markdown": "^0.15.0",
|
||||
"@jest/globals": "^27.5.1",
|
||||
"better-sqlite3": "^7.5.0",
|
||||
"body-parser": "^1.19.2",
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
import {syscall} from "./syscall";
|
||||
import type {MarkdownTree} from "../common/tree";
|
||||
|
||||
export async function parse(text: string): Promise<MarkdownTree> {
|
||||
return syscall("markdown.parse", text);
|
||||
}
|
||||
|
||||
export async function nodeAtPos(
|
||||
mdTree: MarkdownTree,
|
||||
pos: number
|
||||
): Promise<any | null> {
|
||||
return syscall("markdown.nodeAtPos", mdTree, pos);
|
||||
}
|
||||
|
||||
export async function render(mdTree: MarkdownTree): Promise<string> {
|
||||
return syscall("markdown.render", mdTree);
|
||||
}
|
|
@ -1,16 +1,11 @@
|
|||
import {
|
||||
flashNotification,
|
||||
getCurrentPage,
|
||||
reloadPage,
|
||||
save,
|
||||
} from "plugos-silverbullet-syscall/editor";
|
||||
import {flashNotification, getCurrentPage, reloadPage, save,} from "plugos-silverbullet-syscall/editor";
|
||||
|
||||
import { readPage, writePage } from "plugos-silverbullet-syscall/space";
|
||||
import { invokeFunctionOnServer } from "plugos-silverbullet-syscall/system";
|
||||
import { scanPrefixGlobal } from "plugos-silverbullet-syscall";
|
||||
import {readPage, writePage} from "plugos-silverbullet-syscall/space";
|
||||
import {invokeFunctionOnServer} from "plugos-silverbullet-syscall/system";
|
||||
import {scanPrefixGlobal} from "plugos-silverbullet-syscall";
|
||||
|
||||
export const queryRegex =
|
||||
/(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
|
||||
/(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*(group by\s+(?<groupBy>\w+))?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
|
||||
|
||||
export function whiteOutQueries(text: string): string {
|
||||
return text.replaceAll(queryRegex, (match) =>
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
import { ClickEvent } from "../../webapp/app_event";
|
||||
import { updateMaterializedQueriesCommand } from "./materialized_queries";
|
||||
import {ClickEvent} from "../../webapp/app_event";
|
||||
import {updateMaterializedQueriesCommand} from "./materialized_queries";
|
||||
import {
|
||||
getSyntaxNodeAtPos,
|
||||
getSyntaxNodeUnderCursor,
|
||||
navigate as navigateTo,
|
||||
openUrl,
|
||||
getSyntaxNodeAtPos,
|
||||
getSyntaxNodeUnderCursor,
|
||||
getText,
|
||||
navigate as navigateTo,
|
||||
openUrl,
|
||||
} from "plugos-silverbullet-syscall/editor";
|
||||
import { taskToggleAtPos } from "../tasks/task";
|
||||
import {taskToggleAtPos} from "../tasks/task";
|
||||
import {nodeAtPos, parse} from "plugos-silverbullet-syscall/markdown";
|
||||
|
||||
const materializedQueryPrefix = /<!--\s*#query\s+/;
|
||||
|
||||
|
@ -52,6 +54,9 @@ export async function linkNavigate() {
|
|||
export async function clickNavigate(event: ClickEvent) {
|
||||
if (event.ctrlKey || event.metaKey) {
|
||||
let syntaxNode = await getSyntaxNodeAtPos(event.pos);
|
||||
let mdTree = await parse(await getText());
|
||||
let newNode = await nodeAtPos(mdTree, event.pos);
|
||||
console.log("New node", newNode);
|
||||
await actionClickOrActionEnter(syntaxNode);
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,19 +1,20 @@
|
|||
import express, { Express } from "express";
|
||||
import { SilverBulletHooks } from "../common/manifest";
|
||||
import { EndpointHook } from "../plugos/hooks/endpoint";
|
||||
import { readFile } from "fs/promises";
|
||||
import { System } from "../plugos/system";
|
||||
import express, {Express} from "express";
|
||||
import {SilverBulletHooks} from "../common/manifest";
|
||||
import {EndpointHook} from "../plugos/hooks/endpoint";
|
||||
import {readFile} from "fs/promises";
|
||||
import {System} from "../plugos/system";
|
||||
import cors from "cors";
|
||||
import { DiskStorage, EventedStorage, Storage } from "./disk_storage";
|
||||
import {DiskStorage, EventedStorage, Storage} from "./disk_storage";
|
||||
import path from "path";
|
||||
import bodyParser from "body-parser";
|
||||
import { EventHook } from "../plugos/hooks/event";
|
||||
import {EventHook} from "../plugos/hooks/event";
|
||||
import spaceSyscalls from "./syscalls/space";
|
||||
import { eventSyscalls } from "../plugos/syscalls/event";
|
||||
import { pageIndexSyscalls } from "./syscalls";
|
||||
import knex, { Knex } from "knex";
|
||||
import {eventSyscalls} from "../plugos/syscalls/event";
|
||||
import {pageIndexSyscalls} from "./syscalls";
|
||||
import knex, {Knex} from "knex";
|
||||
import shellSyscalls from "../plugos/syscalls/shell.node";
|
||||
import { NodeCronHook } from "../plugos/hooks/node_cron";
|
||||
import {NodeCronHook} from "../plugos/hooks/node_cron";
|
||||
import {markdownSyscalls} from "../common/syscalls/markdown";
|
||||
|
||||
export class ExpressServer {
|
||||
app: Express;
|
||||
|
@ -56,6 +57,7 @@ export class ExpressServer {
|
|||
system.registerSyscalls("index", [], pageIndexSyscalls(this.db));
|
||||
system.registerSyscalls("space", [], spaceSyscalls(this.storage));
|
||||
system.registerSyscalls("event", [], eventSyscalls(this.eventHook));
|
||||
system.registerSyscalls("markdown", [], markdownSyscalls());
|
||||
system.addHook(new EndpointHook(app, "/_"));
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
|
||||
import { closeBrackets, closeBracketsKeymap } from "@codemirror/closebrackets";
|
||||
import { indentWithTab, standardKeymap } from "@codemirror/commands";
|
||||
import { history, historyKeymap } from "@codemirror/history";
|
||||
import { bracketMatching } from "@codemirror/matchbrackets";
|
||||
import { searchKeymap } from "@codemirror/search";
|
||||
import { EditorSelection, EditorState } from "@codemirror/state";
|
||||
import {autocompletion, completionKeymap} from "@codemirror/autocomplete";
|
||||
import {closeBrackets, closeBracketsKeymap} from "@codemirror/closebrackets";
|
||||
import {indentWithTab, standardKeymap} from "@codemirror/commands";
|
||||
import {history, historyKeymap} from "@codemirror/history";
|
||||
import {bracketMatching} from "@codemirror/matchbrackets";
|
||||
import {searchKeymap} from "@codemirror/search";
|
||||
import {EditorSelection, EditorState} from "@codemirror/state";
|
||||
import {
|
||||
drawSelection,
|
||||
dropCursor,
|
||||
|
@ -15,36 +15,38 @@ import {
|
|||
ViewPlugin,
|
||||
ViewUpdate,
|
||||
} from "@codemirror/view";
|
||||
import React, { useEffect, useReducer } from "react";
|
||||
import React, {useEffect, useReducer} from "react";
|
||||
import ReactDOM from "react-dom";
|
||||
import { createSandbox as createIFrameSandbox } from "../plugos/environments/iframe_sandbox";
|
||||
import { AppEvent, AppEventDispatcher, ClickEvent } from "./app_event";
|
||||
import {createSandbox as createIFrameSandbox} from "../plugos/environments/iframe_sandbox";
|
||||
import {AppEvent, AppEventDispatcher, ClickEvent} from "./app_event";
|
||||
import * as commands from "./commands";
|
||||
import { CommandPalette } from "./components/command_palette";
|
||||
import { PageNavigator } from "./components/page_navigator";
|
||||
import { TopBar } from "./components/top_bar";
|
||||
import { lineWrapper } from "./line_wrapper";
|
||||
import { markdown } from "./markdown";
|
||||
import { PathPageNavigator } from "./navigator";
|
||||
import {CommandPalette} from "./components/command_palette";
|
||||
import {PageNavigator} from "./components/page_navigator";
|
||||
import {TopBar} from "./components/top_bar";
|
||||
import {lineWrapper} from "./line_wrapper";
|
||||
import {markdown} from "./markdown";
|
||||
import {PathPageNavigator} from "./navigator";
|
||||
import customMarkDown from "./parser";
|
||||
import reducer from "./reducer";
|
||||
import { smartQuoteKeymap } from "./smart_quotes";
|
||||
import { Space } from "./space";
|
||||
import {smartQuoteKeymap} from "./smart_quotes";
|
||||
import {Space} from "./space";
|
||||
import customMarkdownStyle from "./style";
|
||||
import editorSyscalls from "./syscalls/editor";
|
||||
import indexerSyscalls from "./syscalls/indexer";
|
||||
import spaceSyscalls from "./syscalls/space";
|
||||
import { Action, AppViewState, initialViewState } from "./types";
|
||||
import { SilverBulletHooks } from "../common/manifest";
|
||||
import { safeRun, throttle } from "./util";
|
||||
import { System } from "../plugos/system";
|
||||
import { EventHook } from "../plugos/hooks/event";
|
||||
import { systemSyscalls } from "./syscalls/system";
|
||||
import { Panel } from "./components/panel";
|
||||
import { CommandHook } from "./hooks/command";
|
||||
import { SlashCommandHook } from "./hooks/slash_command";
|
||||
import { CompleterHook } from "./hooks/completer";
|
||||
import { pasteLinkExtension } from "./editor_paste";
|
||||
import {editorSyscalls} from "./syscalls/editor";
|
||||
import {indexerSyscalls} from "./syscalls/indexer";
|
||||
import {spaceSyscalls} from "./syscalls/space";
|
||||
import {Action, AppViewState, initialViewState} from "./types";
|
||||
import {SilverBulletHooks} from "../common/manifest";
|
||||
import {safeRun, throttle} from "./util";
|
||||
import {System} from "../plugos/system";
|
||||
import {EventHook} from "../plugos/hooks/event";
|
||||
import {systemSyscalls} from "./syscalls/system";
|
||||
import {Panel} from "./components/panel";
|
||||
import {CommandHook} from "./hooks/command";
|
||||
import {SlashCommandHook} from "./hooks/slash_command";
|
||||
import {CompleterHook} from "./hooks/completer";
|
||||
import {pasteLinkExtension} from "./editor_paste";
|
||||
import {markdownSyscalls} from "../common/syscalls/markdown";
|
||||
|
||||
|
||||
class PageState {
|
||||
scrollTop: number;
|
||||
|
@ -112,6 +114,7 @@ export class Editor implements AppEventDispatcher {
|
|||
this.system.registerSyscalls("space", [], spaceSyscalls(this));
|
||||
this.system.registerSyscalls("index", [], indexerSyscalls(this.space));
|
||||
this.system.registerSyscalls("system", [], systemSyscalls(this.space));
|
||||
this.system.registerSyscalls("markdown", [], markdownSyscalls());
|
||||
}
|
||||
|
||||
async init() {
|
||||
|
|
|
@ -37,7 +37,7 @@ body {
|
|||
|
||||
#top {
|
||||
height: 55px;
|
||||
position: fixed;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
@ -83,7 +83,7 @@ body {
|
|||
#editor {
|
||||
position: absolute;
|
||||
top: 55px;
|
||||
bottom: 0;
|
||||
bottom: 50px;
|
||||
left: 0;
|
||||
right: 0;
|
||||
overflow-y: hidden;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Editor } from "../editor";
|
||||
import { syntaxTree } from "@codemirror/language";
|
||||
import { Transaction } from "@codemirror/state";
|
||||
import { SysCallMapping } from "../../plugos/system";
|
||||
import {Editor} from "../editor";
|
||||
import {syntaxTree} from "@codemirror/language";
|
||||
import {Transaction} from "@codemirror/state";
|
||||
import {SysCallMapping} from "../../plugos/system";
|
||||
|
||||
type SyntaxNode = {
|
||||
name: string;
|
||||
|
@ -26,79 +26,118 @@ function ensureAnchor(expr: any, start: boolean) {
|
|||
);
|
||||
}
|
||||
|
||||
export default (editor: Editor): SysCallMapping => ({
|
||||
getCurrentPage: (): string => {
|
||||
return editor.currentPage!;
|
||||
},
|
||||
getText: () => {
|
||||
return editor.editorView?.state.sliceDoc();
|
||||
},
|
||||
getCursor: (): number => {
|
||||
return editor.editorView!.state.selection.main.from;
|
||||
},
|
||||
save: async () => {
|
||||
return editor.save(true);
|
||||
},
|
||||
navigate: async (ctx, name: string, pos: number) => {
|
||||
await editor.navigate(name, pos);
|
||||
},
|
||||
reloadPage: async (ctx) => {
|
||||
await editor.reloadPage();
|
||||
},
|
||||
openUrl: async (ctx, url: string) => {
|
||||
window.open(url, "_blank")!.focus();
|
||||
},
|
||||
flashNotification: (ctx, message: string) => {
|
||||
editor.flashNotification(message);
|
||||
},
|
||||
showRhs: (ctx, html: string) => {
|
||||
editor.viewDispatch({
|
||||
type: "show-rhs",
|
||||
html: html,
|
||||
});
|
||||
},
|
||||
insertAtPos: (ctx, text: string, pos: number) => {
|
||||
editor.editorView!.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: pos,
|
||||
},
|
||||
});
|
||||
},
|
||||
replaceRange: (ctx, from: number, to: number, text: string) => {
|
||||
editor.editorView!.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: from,
|
||||
to: to,
|
||||
},
|
||||
});
|
||||
},
|
||||
moveCursor: (ctx, pos: number) => {
|
||||
editor.editorView!.dispatch({
|
||||
selection: {
|
||||
anchor: pos,
|
||||
},
|
||||
});
|
||||
},
|
||||
insertAtCursor: (ctx, text: string) => {
|
||||
let editorView = editor.editorView!;
|
||||
let from = editorView.state.selection.main.from;
|
||||
editorView.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: from,
|
||||
},
|
||||
selection: {
|
||||
anchor: from + text.length,
|
||||
},
|
||||
});
|
||||
},
|
||||
getSyntaxNodeUnderCursor: (): SyntaxNode | undefined => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
if (selection.empty) {
|
||||
let node = syntaxTree(editorState).resolveInner(selection.from);
|
||||
export function editorSyscalls(editor: Editor): SysCallMapping {
|
||||
return {
|
||||
getCurrentPage: (): string => {
|
||||
return editor.currentPage!;
|
||||
},
|
||||
getText: () => {
|
||||
return editor.editorView?.state.sliceDoc();
|
||||
},
|
||||
getCursor: (): number => {
|
||||
return editor.editorView!.state.selection.main.from;
|
||||
},
|
||||
save: async () => {
|
||||
return editor.save(true);
|
||||
},
|
||||
navigate: async (ctx, name: string, pos: number) => {
|
||||
await editor.navigate(name, pos);
|
||||
},
|
||||
reloadPage: async (ctx) => {
|
||||
await editor.reloadPage();
|
||||
},
|
||||
openUrl: async (ctx, url: string) => {
|
||||
window.open(url, "_blank")!.focus();
|
||||
},
|
||||
flashNotification: (ctx, message: string) => {
|
||||
editor.flashNotification(message);
|
||||
},
|
||||
showRhs: (ctx, html: string) => {
|
||||
editor.viewDispatch({
|
||||
type: "show-rhs",
|
||||
html: html,
|
||||
});
|
||||
},
|
||||
insertAtPos: (ctx, text: string, pos: number) => {
|
||||
editor.editorView!.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: pos,
|
||||
},
|
||||
});
|
||||
},
|
||||
replaceRange: (ctx, from: number, to: number, text: string) => {
|
||||
editor.editorView!.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: from,
|
||||
to: to,
|
||||
},
|
||||
});
|
||||
},
|
||||
moveCursor: (ctx, pos: number) => {
|
||||
editor.editorView!.dispatch({
|
||||
selection: {
|
||||
anchor: pos,
|
||||
},
|
||||
});
|
||||
},
|
||||
insertAtCursor: (ctx, text: string) => {
|
||||
let editorView = editor.editorView!;
|
||||
let from = editorView.state.selection.main.from;
|
||||
editorView.dispatch({
|
||||
changes: {
|
||||
insert: text,
|
||||
from: from,
|
||||
},
|
||||
selection: {
|
||||
anchor: from + text.length,
|
||||
},
|
||||
});
|
||||
},
|
||||
getSyntaxNodeUnderCursor: (): SyntaxNode | undefined => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
if (selection.empty) {
|
||||
let node = syntaxTree(editorState).resolveInner(selection.from);
|
||||
if (node) {
|
||||
return {
|
||||
name: node.name,
|
||||
text: editorState.sliceDoc(node.from, node.to),
|
||||
from: node.from,
|
||||
to: node.to,
|
||||
};
|
||||
}
|
||||
}
|
||||
},
|
||||
getLineUnderCursor: (): string => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
let line = editorState.doc.lineAt(selection.from);
|
||||
return editorState.sliceDoc(line.from, line.to);
|
||||
},
|
||||
matchBefore: (
|
||||
ctx,
|
||||
regexp: string
|
||||
): { from: number; to: number; text: string } | null => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
let from = selection.from;
|
||||
if (selection.empty) {
|
||||
let line = editorState.doc.lineAt(from);
|
||||
let start = Math.max(line.from, from - 250);
|
||||
let str = line.text.slice(start - line.from, from - line.from);
|
||||
let found = str.search(ensureAnchor(new RegExp(regexp), false));
|
||||
// console.log("Line", line, start, str, new RegExp(regexp), found);
|
||||
return found < 0
|
||||
? null
|
||||
: { from: start + found, to: from, text: str.slice(found) };
|
||||
}
|
||||
return null;
|
||||
},
|
||||
getSyntaxNodeAtPos: (ctx, pos: number): SyntaxNode | undefined => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let node = syntaxTree(editorState).resolveInner(pos);
|
||||
if (node) {
|
||||
return {
|
||||
name: node.name,
|
||||
|
@ -107,49 +146,12 @@ export default (editor: Editor): SysCallMapping => ({
|
|||
to: node.to,
|
||||
};
|
||||
}
|
||||
}
|
||||
},
|
||||
getLineUnderCursor: (): string => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
let line = editorState.doc.lineAt(selection.from);
|
||||
return editorState.sliceDoc(line.from, line.to);
|
||||
},
|
||||
matchBefore: (
|
||||
ctx,
|
||||
regexp: string
|
||||
): { from: number; to: number; text: string } | null => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let selection = editorState.selection.main;
|
||||
let from = selection.from;
|
||||
if (selection.empty) {
|
||||
let line = editorState.doc.lineAt(from);
|
||||
let start = Math.max(line.from, from - 250);
|
||||
let str = line.text.slice(start - line.from, from - line.from);
|
||||
let found = str.search(ensureAnchor(new RegExp(regexp), false));
|
||||
// console.log("Line", line, start, str, new RegExp(regexp), found);
|
||||
return found < 0
|
||||
? null
|
||||
: { from: start + found, to: from, text: str.slice(found) };
|
||||
}
|
||||
return null;
|
||||
},
|
||||
getSyntaxNodeAtPos: (ctx, pos: number): SyntaxNode | undefined => {
|
||||
const editorState = editor.editorView!.state;
|
||||
let node = syntaxTree(editorState).resolveInner(pos);
|
||||
if (node) {
|
||||
return {
|
||||
name: node.name,
|
||||
text: editorState.sliceDoc(node.from, node.to),
|
||||
from: node.from,
|
||||
to: node.to,
|
||||
};
|
||||
}
|
||||
},
|
||||
dispatch: (ctx, change: Transaction) => {
|
||||
editor.editorView!.dispatch(change);
|
||||
},
|
||||
prompt: (ctx, message: string, defaultValue = ""): string | null => {
|
||||
return prompt(message, defaultValue);
|
||||
},
|
||||
});
|
||||
},
|
||||
dispatch: (ctx, change: Transaction) => {
|
||||
editor.editorView!.dispatch(change);
|
||||
},
|
||||
prompt: (ctx, message: string, defaultValue = ""): string | null => {
|
||||
return prompt(message, defaultValue);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { Space } from "../space";
|
||||
import { SysCallMapping } from "../../plugos/system";
|
||||
import { transportSyscalls } from "../../plugos/syscalls/transport";
|
||||
import {Space} from "../space";
|
||||
import {SysCallMapping} from "../../plugos/system";
|
||||
import {transportSyscalls} from "../../plugos/syscalls/transport";
|
||||
|
||||
export default function indexerSyscalls(space: Space): SysCallMapping {
|
||||
export function indexerSyscalls(space: Space): SysCallMapping {
|
||||
return transportSyscalls(
|
||||
[
|
||||
"scanPrefixForPage",
|
||||
|
|
|
@ -1,28 +1,30 @@
|
|||
import { Editor } from "../editor";
|
||||
import { SysCallMapping } from "../../plugos/system";
|
||||
import { PageMeta } from "../../common/types";
|
||||
import {Editor} from "../editor";
|
||||
import {SysCallMapping} from "../../plugos/system";
|
||||
import {PageMeta} from "../../common/types";
|
||||
|
||||
export default (editor: Editor): SysCallMapping => ({
|
||||
listPages: async (): Promise<PageMeta[]> => {
|
||||
return [...(await editor.space.listPages())];
|
||||
},
|
||||
readPage: async (
|
||||
ctx,
|
||||
name: string
|
||||
): Promise<{ text: string; meta: PageMeta }> => {
|
||||
return await editor.space.readPage(name);
|
||||
},
|
||||
writePage: async (ctx, name: string, text: string): Promise<PageMeta> => {
|
||||
return await editor.space.writePage(name, text);
|
||||
},
|
||||
deletePage: async (ctx, name: string) => {
|
||||
// If we're deleting the current page, navigate to the start page
|
||||
if (editor.currentPage === name) {
|
||||
await editor.navigate("start");
|
||||
}
|
||||
// Remove page from open pages in editor
|
||||
editor.openPages.delete(name);
|
||||
console.log("Deleting page");
|
||||
await editor.space.deletePage(name);
|
||||
},
|
||||
});
|
||||
export function spaceSyscalls(editor: Editor): SysCallMapping {
|
||||
return {
|
||||
listPages: async (): Promise<PageMeta[]> => {
|
||||
return [...(await editor.space.listPages())];
|
||||
},
|
||||
readPage: async (
|
||||
ctx,
|
||||
name: string
|
||||
): Promise<{ text: string; meta: PageMeta }> => {
|
||||
return await editor.space.readPage(name);
|
||||
},
|
||||
writePage: async (ctx, name: string, text: string): Promise<PageMeta> => {
|
||||
return await editor.space.writePage(name, text);
|
||||
},
|
||||
deletePage: async (ctx, name: string) => {
|
||||
// If we're deleting the current page, navigate to the start page
|
||||
if (editor.currentPage === name) {
|
||||
await editor.navigate("start");
|
||||
}
|
||||
// Remove page from open pages in editor
|
||||
editor.openPages.delete(name);
|
||||
console.log("Deleting page");
|
||||
await editor.space.deletePage(name);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue