Fixes #164: Rewrote all CM view plugins to statefields

2022-12-09 16:12:55 +01:00
parent 453c613ef4
commit c8c4271aeb
16 changed files with 433 additions and 739 deletions
@@ -1,70 +1,44 @@
-import {
-  Decoration,
-  DecorationSet,
-  EditorView,
-  syntaxTree,
-  ViewPlugin,
-  ViewUpdate,
-} from "../deps.ts";
-import { isCursorInRange } from "./util.ts";
+import { Decoration, EditorState, syntaxTree } from "../deps.ts";
+import { decoratorStateField, isCursorInRange } from "./util.ts";

-function getDirectives(view: EditorView) {
+function getDirectives(state: EditorState) {
  const widgets: any[] = [];

-  for (const { from, to } of view.visibleRanges) {
-    syntaxTree(view.state).iterate({
-      from,
-      to,
-      enter: ({ type, from, to }) => {
-        if (type.name !== "CommentBlock") {
-          return;
-        }
-        const text = view.state.sliceDoc(from, to);
-        if (/<!--\s*#/.exec(text)) {
-          // Open directive
-          widgets.push(
-            Decoration.line({
-              class: "sb-directive-start",
-            }).range(from),
-          );
-        } else if (/<!--\s*\//.exec(text)) {
-          widgets.push(
-            Decoration.line({
-              class: "sb-directive-end",
-            }).range(from),
-          );
-        } else {
-          return;
-        }
-        if (!isCursorInRange(view.state, [from, to])) {
-          widgets.push(
-            Decoration.line({
-              class: "sb-directive-outside",
-            }).range(from),
-          );
-        }
-      },
-    });
-  }
+  syntaxTree(state).iterate({
+    enter: ({ type, from, to }) => {
+      if (type.name !== "CommentBlock") {
+        return;
+      }
+      const text = state.sliceDoc(from, to);
+      if (/<!--\s*#/.exec(text)) {
+        // Open directive
+        widgets.push(
+          Decoration.line({
+            class: "sb-directive-start",
+          }).range(from),
+        );
+      } else if (/<!--\s*\//.exec(text)) {
+        widgets.push(
+          Decoration.line({
+            class: "sb-directive-end",
+          }).range(from),
+        );
+      } else {
+        return;
+      }
+      if (!isCursorInRange(state, [from, to])) {
+        widgets.push(
+          Decoration.line({
+            class: "sb-directive-outside",
+          }).range(from),
+        );
+      }
+    },
+  });

  return Decoration.set(widgets, true);
 }

-export const directivePlugin = ViewPlugin.fromClass(
-  class {
-    decorations: DecorationSet = Decoration.none;
-    constructor(view: EditorView) {
-      this.decorations = getDirectives(view);
-    }
-    update(update: ViewUpdate) {
-      if (
-        update.docChanged ||
-        update.viewportChanged ||
-        update.selectionSet
-      ) {
-        this.decorations = getDirectives(update.view);
-      }
-    }
-  },
-  { decorations: (v) => v.decorations },
-);
+export function directivePlugin() {
+  return decoratorStateField(getDirectives);
+}