From 850077bad0619d5d321bbcd4ca7589e1d51c5a22 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Fri, 9 Dec 2022 17:13:26 +0100
Subject: [PATCH] Fixes #144

---
 web/cm_plugins/directive.ts | 98 ++++++++++++++++++++++---------------
 web/styles/editor.scss      |  4 --
 website/CHANGELOG.md        |  1 +
 3 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/web/cm_plugins/directive.ts b/web/cm_plugins/directive.ts
index a895a9e3..dd4faf3e 100644
--- a/web/cm_plugins/directive.ts
+++ b/web/cm_plugins/directive.ts
@@ -1,44 +1,62 @@
 import { Decoration, EditorState, syntaxTree } from "../deps.ts";
-import { decoratorStateField, isCursorInRange } from "./util.ts";
-
-function getDirectives(state: EditorState) {
-  const widgets: any[] = [];
-
-  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);
-}
+import {
+  decoratorStateField,
+  invisibleDecoration,
+  isCursorInRange,
+} from "./util.ts";
 
+// Does a few things: hides the directives when the cursor is not placed inside
+// Adds a class to the start and end of the directive when the cursor is placed inside
 export function directivePlugin() {
-  return decoratorStateField(getDirectives);
+  return decoratorStateField((state: EditorState) => {
+    const widgets: any[] = [];
+    const cursorPos = state.selection.main.head;
+
+    // TODO: This doesn't handle nested directives properly
+    let posOfLastOpen = { from: 0, to: 0 };
+
+    syntaxTree(state).iterate({
+      enter: ({ type, from, to }) => {
+        if (type.name !== "CommentBlock") {
+          return;
+        }
+        const text = state.sliceDoc(from, to);
+        if (/<!--\s*#/.exec(text)) {
+          // Open directive
+          posOfLastOpen = { from, to };
+        } else if (/<!--\s*\//.exec(text)) {
+          // Close directive
+          if (
+            (cursorPos > to || cursorPos < posOfLastOpen.from) &&
+            !isCursorInRange(state, [posOfLastOpen.from, to])
+          ) {
+            widgets.push(
+              invisibleDecoration.range(
+                posOfLastOpen.from,
+                posOfLastOpen.to + 1,
+              ),
+            );
+            widgets.push(
+              invisibleDecoration.range(from - 1, to),
+            );
+          } else {
+            widgets.push(
+              Decoration.line({
+                class: "sb-directive-start",
+              }).range(posOfLastOpen.from),
+            );
+            widgets.push(
+              Decoration.line({
+                class: "sb-directive-end",
+              }).range(from),
+            );
+          }
+        } else {
+          return;
+        }
+      },
+    });
+
+    return Decoration.set(widgets, true);
+  });
 }
diff --git a/web/styles/editor.scss b/web/styles/editor.scss
index 2f5a58df..59738fb8 100644
--- a/web/styles/editor.scss
+++ b/web/styles/editor.scss
@@ -146,10 +146,6 @@
     left: -20px;
 	}
 
-  .sb-directive-outside {
-    opacity: 0.4;
-  }
-
   .sb-line-frontmatter-outside, .sb-line-code-outside {
     display: none;
   }
diff --git a/website/CHANGELOG.md b/website/CHANGELOG.md
index 2e42f218..a6a4f2f1 100644
--- a/website/CHANGELOG.md
+++ b/website/CHANGELOG.md
@@ -7,6 +7,7 @@ release.
 
 * Replaced the `--password` flag with `--user` taking a basic auth combination of username and password, e.g. `--user pete:1234`. Authentication now uses standard basic auth. This should fix attachments not working with password-protected setups.
 * Added support for ~~strikethrough~~ syntax.
+* Directives are now hidden unless the cursor is placed inside them for an even cleaner look
 * New logo! Contributed by [petercoyne](https://github.com/silverbulletmd/silverbullet/pull/177)
 * New button icons, from [feather](https://feathericons.com/)
 * UI font tweaks