Fix some nasty bug

webapp/editor.tsx

@@ -36,7 +36,7 @@ import indexerSyscalls from "./syscalls/indexer";
 import spaceSyscalls from "./syscalls/space";
 import { Action, AppViewState, initialViewState } from "./types";
 import { SilverBulletHooks } from "../common/manifest";
-import { safeRun } from "./util";
+import { safeRun, throttle } from "./util";
 import { System } from "../plugos/system";
 import { EventHook } from "../plugos/hooks/event";
 import { systemSyscalls } from "./syscalls/system";
@@ -132,6 +132,10 @@ export class Editor implements AppEventDispatcher {
       }
     });
 
+    let throttledRebuildEditorState = throttle(() => {
+      this.rebuildEditorState();
+    }, 100);
+
     this.space.on({
       pageCreated: (meta) => {
         console.log("Page created", meta);
@@ -156,12 +160,14 @@ export class Editor implements AppEventDispatcher {
         safeRun(async () => {
           console.log("Plug load", plugName);
           await this.system.load(plugName, plug, createIFrameSandbox);
+          throttledRebuildEditorState();
         });
       },
       plugUnloaded: (plugName) => {
         safeRun(async () => {
           console.log("Plug unload", plugName);
           await this.system.unload(plugName);
+          throttledRebuildEditorState();
         });
       },
     });
@@ -364,6 +370,15 @@ export class Editor implements AppEventDispatcher {
     });
   }
 
+  rebuildEditorState() {
+    const editorView = this.editorView;
+    if (editorView && this.currentPage) {
+      editorView.setState(
+        this.createEditorState(this.currentPage, editorView.state.sliceDoc())
+      );
+    }
+  }
+
   reloadPage() {
     console.log("Reloading page");
     safeRun(async () => {

webapp/markdown/index.ts

@@ -35,40 +35,40 @@ const htmlNoMatch = html({ matchClosingTags: false });
 
 /// Markdown language support.
 export function markdown(
-    config: {
-      /// When given, this language will be used by default to parse code
-      /// blocks.
-      defaultCodeLanguage?: Language | LanguageSupport;
-      /// A collection of language descriptions to search through for a
-      /// matching language (with
-      /// [`LanguageDescription.matchLanguageName`](#language.LanguageDescription^matchLanguageName))
-      /// when a fenced code block has an info string.
-      codeLanguages?: readonly LanguageDescription[];
-      /// Set this to false to disable installation of the Markdown
-      /// [keymap](#lang-markdown.markdownKeymap).
-      addKeymap?: boolean;
-      /// Markdown parser
-      /// [extensions](https://github.com/lezer-parser/markdown#user-content-markdownextension)
-      /// to add to the parser.
-      extensions?: MarkdownExtension;
-      /// The base language to use. Defaults to
-      /// [`commonmarkLanguage`](#lang-markdown.commonmarkLanguage).
-      base?: Language;
-    } = {}
+  config: {
+    /// When given, this language will be used by default to parse code
+    /// blocks.
+    defaultCodeLanguage?: Language | LanguageSupport;
+    /// A collection of language descriptions to search through for a
+    /// matching language (with
+    /// [`LanguageDescription.matchLanguageName`](#language.LanguageDescription^matchLanguageName))
+    /// when a fenced code block has an info string.
+    codeLanguages?: readonly LanguageDescription[];
+    /// Set this to false to disable installation of the Markdown
+    /// [keymap](#lang-markdown.markdownKeymap).
+    addKeymap?: boolean;
+    /// Markdown parser
+    /// [extensions](https://github.com/lezer-parser/markdown#user-content-markdownextension)
+    /// to add to the parser.
+    extensions?: MarkdownExtension;
+    /// The base language to use. Defaults to
+    /// [`commonmarkLanguage`](#lang-markdown.commonmarkLanguage).
+    base?: Language;
+  } = {}
 ) {
   let {
     codeLanguages,
     defaultCodeLanguage,
     addKeymap = true,
-    base: {parser} = commonmarkLanguage,
+    base: { parser } = commonmarkLanguage,
   } = config;
   if (!(parser instanceof MarkdownParser))
     throw new RangeError(
-        "Base parser provided to `markdown` should be a Markdown parser"
+      "Base parser provided to `markdown` should be a Markdown parser"
     );
   let extensions = config.extensions ? [config.extensions] : [];
   let support = [htmlNoMatch.support],
-      defaultCode;
+    defaultCode;
   if (defaultCodeLanguage instanceof LanguageSupport) {
     support.push(defaultCodeLanguage.support);
     defaultCode = defaultCodeLanguage.language;
@@ -76,11 +76,11 @@ export function markdown(
     defaultCode = defaultCodeLanguage;
   }
   let codeParser =
-      codeLanguages || defaultCode
-          ? getCodeParser(codeLanguages || [], defaultCode)
-          : undefined;
+    codeLanguages || defaultCode
+      ? getCodeParser(codeLanguages || [], defaultCode)
+      : undefined;
   extensions.push(
-      parseCode({codeParser, htmlParser: htmlNoMatch.language.parser})
+    parseCode({ codeParser, htmlParser: htmlNoMatch.language.parser })
   );
   if (addKeymap) support.push(Prec.high(keymap.of(markdownKeymap)));
   return new LanguageSupport(mkLang(parser.configure(extensions)), support);

webapp/reducer.ts

@@ -10,11 +10,11 @@ export default function reducer(
       return {
         ...state,
         allPages: new Set(
-            [...state.allPages].map((pageMeta) =>
-                pageMeta.name === action.name
-                    ? {...pageMeta, lastOpened: Date.now()}
-                    : pageMeta
-            )
+          [...state.allPages].map((pageMeta) =>
+            pageMeta.name === action.name
+              ? { ...pageMeta, lastOpened: Date.now() }
+              : pageMeta
+          )
         ),
         currentPage: action.name,
       };

webapp/space.ts

@@ -185,7 +185,6 @@ export class Space extends EventEmitter<SpaceEvents> {
     name: string,
     args: any[]
   ): Promise<any> {
-    console.log("Making a remote syscall", name, args);
     let req = await fetch(`${this.plugUrl}/${plug.name}/syscall/${name}`, {
       method: "POST",
       headers: {
@@ -204,7 +203,6 @@ export class Space extends EventEmitter<SpaceEvents> {
   }
 
   async remoteInvoke(plug: Plug<any>, name: string, args: any[]): Promise<any> {
-    console.log("Making a remote syscall", name, JSON.stringify(args));
     let req = await fetch(`${this.plugUrl}/${plug.name}/function/${name}`, {
       method: "POST",
       headers: {

webapp/syscalls/editor.ts

@@ -39,6 +39,9 @@ export default (editor: Editor): SysCallMapping => ({
   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();
   },