From 27031aa63d3d3374e05f2f74b38eae3f15baf738 Mon Sep 17 00:00:00 2001 From: Zef Hemel <zef@zef.me> Date: Mon, 27 Jun 2022 14:14:21 +0200 Subject: [PATCH] Cleanup --- packages/web/commands.ts | 60 ---------------------------------------- packages/web/editor.tsx | 6 +--- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 packages/web/commands.ts diff --git a/packages/web/commands.ts b/packages/web/commands.ts deleted file mode 100644 index e47436e..0000000 --- a/packages/web/commands.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { EditorSelection, StateCommand, Transaction } from "@codemirror/state"; -import { Text } from "@codemirror/state"; - -export function insertMarker(marker: string): StateCommand { - return ({ state, dispatch }) => { - const changes = state.changeByRange((range) => { - const isBoldBefore = - state.sliceDoc(range.from - marker.length, range.from) === marker; - const isBoldAfter = - state.sliceDoc(range.to, range.to + marker.length) === marker; - const changes = []; - - changes.push( - isBoldBefore - ? { - from: range.from - marker.length, - to: range.from, - insert: Text.of([""]), - } - : { - from: range.from, - insert: Text.of([marker]), - } - ); - - changes.push( - isBoldAfter - ? { - from: range.to, - to: range.to + marker.length, - insert: Text.of([""]), - } - : { - from: range.to, - insert: Text.of([marker]), - } - ); - - const extendBefore = isBoldBefore ? -marker.length : marker.length; - const extendAfter = isBoldAfter ? -marker.length : marker.length; - - return { - changes, - range: EditorSelection.range( - range.from + extendBefore, - range.to + extendAfter - ), - }; - }); - - dispatch( - state.update(changes, { - scrollIntoView: true, - annotations: Transaction.userEvent.of("input"), - }) - ); - - return true; - }; -} diff --git a/packages/web/editor.tsx b/packages/web/editor.tsx index 0d46a96..1ce9c68 100644 --- a/packages/web/editor.tsx +++ b/packages/web/editor.tsx @@ -8,7 +8,7 @@ import { indentWithTab, standardKeymap } from "@codemirror/commands"; import { history, historyKeymap } from "@codemirror/commands"; import { bracketMatching, syntaxHighlighting } from "@codemirror/language"; import { searchKeymap } from "@codemirror/search"; -import { Compartment, EditorSelection, EditorState } from "@codemirror/state"; +import { EditorSelection, EditorState } from "@codemirror/state"; import { drawSelection, dropCursor, @@ -24,7 +24,6 @@ import React, { useEffect, useReducer } from "react"; import ReactDOM from "react-dom"; import { createSandbox as createIFrameSandbox } from "@plugos/plugos/environments/webworker_sandbox"; import { AppEvent, 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"; @@ -439,9 +438,6 @@ export class Editor { } ), pasteLinkExtension, - bracketMatching({ - brackets: "()[]{}", - }), closeBrackets(), ], });