Remove vim mode from mini-editor, which didn't really work anyway

Author: zefhemel

build_client.ts

@@ -62,7 +62,7 @@ async function buildCopyBundleAssets() {
     sourcemap: "linked",
     minify: true,
     jsxFactory: "h",
-    metafile: true,
+    // metafile: true,
     splitting: true,
     format: "esm",
     chunkNames: ".client/[name]-[hash]",
@@ -85,9 +85,12 @@ async function buildCopyBundleAssets() {
     "/", // The index page
     "/.client/manifest.json", // Dynamically generated by the server, but needed for PWA
     ...allFiles
-      .filter((f) =>
-        !f.endsWith(".map") && f !== "auth.html" && f !== "index.html" &&
-        f !== "LICENSE.md"
+      .filter(
+        (f) =>
+          !f.endsWith(".map") &&
+          f !== "auth.html" &&
+          f !== "index.html" &&
+          f !== "LICENSE.md",
       )
       .map((f) => `/.client/${f}`),
   ];

client/components/anything_picker.tsx

@@ -21,15 +21,13 @@ export function AnythingPicker({
   extensions,
   onNavigate,
   onModeSwitch,
-  vimMode,
   mode,
   darkMode,
   currentPath,
 }: {
   allDocuments: DocumentMeta[];
   allPages: PageMeta[];
   extensions: Set<string>;
-  vimMode: boolean;
   darkMode?: boolean;
   mode: "page" | "meta" | "document" | "all";
   onNavigate: (name: string | null) => void;
@@ -178,7 +176,6 @@ export function AnythingPicker({
       }
       label="Open"
       options={options}
-      vimMode={vimMode}
       darkMode={darkMode}
       phrasePreprocessor={(phrase) => {
         phrase = phrase.replaceAll(tagRegex, "").trim();

client/components/basic_modals.tsx

@@ -5,13 +5,11 @@ import type { ComponentChildren, Ref } from "preact";
 export function Prompt({
   message,
   defaultValue,
-  vimMode,
   darkMode,
   callback,
 }: {
   message: string;
   defaultValue?: string;
-  vimMode: boolean;
   darkMode: boolean | undefined;
   callback: (value?: string) => void;
 }) {
@@ -26,8 +24,6 @@ export function Prompt({
         <label>{message}</label>
         <MiniEditor
           text={defaultValue || ""}
-          vimMode={vimMode}
-          vimStartInInsertMode={true}
           focus={true}
           darkMode={darkMode}
           onEnter={(text) => {

client/components/command_palette.tsx

@@ -7,11 +7,9 @@ import { isMacLike } from "../codemirror/editor_state.ts";
 export function CommandPalette({
   commands,
   onTrigger,
-  vimMode,
   darkMode,
 }: {
   commands: Map<string, Command>;
-  vimMode: boolean;
   darkMode?: boolean;
   onTrigger: (command: Command | undefined) => void;
 }) {
@@ -36,7 +34,6 @@ export function CommandPalette({
       options={options}
       allowNew={false}
       icon={Terminal}
-      vimMode={vimMode}
       darkMode={darkMode}
       helpText="Start typing the command name to filter results, press <code>Enter</code> to run."
       onSelect={(opt) => {

client/components/filter.tsx

@@ -17,7 +17,6 @@ export function FilterList({
   label,
   onSelect,
   onKeyPress,
-  vimMode,
   darkMode,
   preFilter,
   phrasePreprocessor,
@@ -34,7 +33,6 @@ export function FilterList({
   onSelect: (option: FilterOption | undefined) => void;
   preFilter?: (options: FilterOption[], phrase: string) => FilterOption[];
   phrasePreprocessor?: (phrase: string) => string;
-  vimMode: boolean;
   darkMode?: boolean;
   allowNew?: boolean;
   completePrefix?: string;
@@ -107,8 +105,6 @@ export function FilterList({
         <label>{label}</label>
         <MiniEditor
           text={text}
-          vimMode={vimMode}
-          vimStartInInsertMode={true}
           focus={true}
           darkMode={darkMode}
           placeholderText={placeholder}

client/components/mini_editor.tsx

@@ -8,7 +8,6 @@ import {
   ViewPlugin,
   type ViewUpdate,
 } from "@codemirror/view";
-import { getVimModule } from "../vim_loader.ts";
 import { createCommandKeyBindings } from "../codemirror/editor_state.ts";
 
 type MiniEditorEvents = {
@@ -23,9 +22,7 @@ type MiniEditorEvents = {
 export function MiniEditor({
   text,
   placeholderText,
-  vimMode,
   darkMode,
-  vimStartInInsertMode,
   onBlur,
   onEscape,
   onKeyUp,
@@ -37,15 +34,12 @@ export function MiniEditor({
 }: {
   text: string;
   placeholderText?: string;
-  vimMode: boolean;
   darkMode?: boolean;
-  vimStartInInsertMode?: boolean;
   focus?: boolean;
   editable: boolean;
 } & MiniEditorEvents) {
   const editorDiv = useRef<HTMLDivElement>(null);
   const editorViewRef = useRef<EditorView>();
-  const vimModeRef = useRef<string>("normal");
   // TODO: This super duper ugly, but I don't know how to avoid it
   // Due to how MiniCodeEditor is built, it captures the closures of all callback functions
   // which results in them pointing to old state variables, to avoid this we do this...
@@ -102,7 +96,7 @@ export function MiniEditor({
         });
       }
     }
-  }, [text, vimMode]);
+  }, [text]);
 
   let onBlurred = false,
     onEntered = false;
@@ -128,31 +122,11 @@ export function MiniEditor({
   );
 
   function buildEditorState() {
-    // When vim mode is active, we need for CM to have created the new state
-    // and the subscribe to the vim mode's events
-    // This needs to happen in the next tick, so we wait a tick with setTimeout
-    const vimMod = getVimModule();
-    if (vimMode && vimMod) {
-      // Only applies to vim mode
-      setTimeout(() => {
-        const cm = vimMod.getCM(editorViewRef.current!)!;
-        cm.on("vim-mode-change", ({ mode }: { mode: string }) => {
-          vimModeRef.current = mode;
-        });
-        if (vimStartInInsertMode) {
-          vimMod.Vim.handleKey(cm, "i", "+input");
-        }
-      });
-    }
     return EditorState.create({
       doc: text,
       extensions: [
         EditorView.theme({}, { dark: darkMode }),
-        // Insert command bindings before vim-mode to ensure they're available
-        // in normal mode. See editor_state.ts for more details.
         createCommandKeyBindings(globalThis.client),
-        // Enable vim mode, or not (uses already-loaded module if available)
-        [...(vimMode && vimMod ? [vimMod.vim()] : [])],
         [
           ...(editable
             ? []
@@ -195,12 +169,7 @@ export function MiniEditor({
               return false;
             }
             if (event.key === "Enter") {
-              // Enter should be handled by the keymap, except when in Vim normal mode
-              // because then it's disabled
-              if (vimMode && vimModeRef.current === "normal") {
-                onEnterHandler(view, event.shiftKey);
-                return true;
-              }
+              // Enter should be handled by the keymap
               return false;
             }
             if (callbacksRef.current!.onKeyUp) {

client/components/top_bar.tsx

@@ -153,7 +153,6 @@ export function TopBar({
   onDismissNotification,
   actionButtons,
   darkMode,
-  vimMode,
   progressPercentage,
   progressType,
   lhs,
@@ -170,7 +169,6 @@ export function TopBar({
   isLoading: boolean;
   notifications: Notification[];
   darkMode?: boolean;
-  vimMode: boolean;
   progressPercentage?: number;
   progressType?: string;
   onRename: (newName?: string) => Promise<void>;
@@ -201,7 +199,6 @@ export function TopBar({
             >
               <MiniEditor
                 text={pageName ?? ""}
-                vimMode={vimMode}
                 darkMode={darkMode}
                 onBlur={(newName) => {
                   if (newName !== pageName) {

client/config.ts

@@ -1,7 +1,7 @@
 import { type OutputUnit, Validator, format } from "@cfworker/json-schema";
 
 // Register custom formats (shared with jsonschema.ts)
-format["email"] = (data: string) => data.includes("@");
+format.email = (data: string) => data.includes("@");
 format["page-ref"] = (data: string) =>
   data.startsWith("[[") && data.endsWith("]]");
 

client/editor_ui.tsx

@@ -269,7 +269,6 @@ export class MainUI {
             }
             currentPath={client.currentPath()}
             mode={viewState.pageNavigatorMode}
-            vimMode={viewState.uiOptions.vimMode}
             darkMode={viewState.uiOptions.darkMode}
             onModeSwitch={(mode) => {
               dispatch({ type: "stop-navigate" });
@@ -363,7 +362,6 @@ export class MainUI {
               });
             }}
             commands={client.getCommandsByContext(viewState)}
-            vimMode={viewState.uiOptions.vimMode}
             darkMode={viewState.uiOptions.darkMode}
           />
         )}
@@ -372,7 +370,6 @@ export class MainUI {
             label={viewState.filterBoxLabel}
             placeholder={viewState.filterBoxPlaceHolder}
             options={viewState.filterBoxOptions}
-            vimMode={viewState.uiOptions.vimMode}
             darkMode={viewState.uiOptions.darkMode}
             allowNew={false}
             helpText={viewState.filterBoxHelpText}
@@ -383,7 +380,6 @@ export class MainUI {
           <Prompt
             message={viewState.promptMessage!}
             defaultValue={viewState.promptDefaultValue}
-            vimMode={viewState.uiOptions.vimMode}
             darkMode={viewState.uiOptions.darkMode}
             callback={(value) => {
               dispatch({ type: "hide-prompt" });
@@ -411,7 +407,6 @@ export class MainUI {
           isOnline={viewState.isOnline}
           unsavedChanges={viewState.unsavedChanges}
           isLoading={viewState.isLoading}
-          vimMode={viewState.uiOptions.vimMode}
           darkMode={viewState.uiOptions.darkMode}
           progressPercentage={viewState.progressPercentage}
           progressType={viewState.progressType}

client/plugos/syscalls/jsonschema.ts

@@ -2,7 +2,7 @@ import type { SysCallMapping } from "../system.ts";
 import { type OutputUnit, Validator, format } from "@cfworker/json-schema";
 
 // Register custom formats
-format["email"] = (data: string) => data.includes("@");
+format.email = (data: string) => data.includes("@");
 format["page-ref"] = (data: string) =>
   data.startsWith("[[") && data.endsWith("]]");