From 00af994d697b9be19f2245c8f4ee8fadb3a03b1e Mon Sep 17 00:00:00 2001
From: MrMugame <40832361+MrMugame@users.noreply.github.com>
Date: Fri, 10 Oct 2025 08:42:25 +0200
Subject: [PATCH] Fix navigation for `Autolink`s and clean up code (#1607)

---
 client/markdown_parser/parser.ts | 15 +++------------
 client/style.ts                  |  1 -
 plugs/editor/navigate.ts         | 12 +++++++++++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/markdown_parser/parser.ts b/client/markdown_parser/parser.ts
index 41f40d88..324f3106 100644
--- a/client/markdown_parser/parser.ts
+++ b/client/markdown_parser/parser.ts
@@ -1,5 +1,5 @@
 import { yaml as yamlLanguage } from "@codemirror/legacy-modes/mode/yaml";
-import { styleTags, type Tag, tags as t } from "@lezer/highlight";
+import { styleTags, tags as t } from "@lezer/highlight";
 import {
   type Line,
   type MarkdownConfig,
@@ -10,7 +10,6 @@ import {
 import { markdown } from "@codemirror/lang-markdown";
 import { foldNodeProp, StreamLanguage } from "@codemirror/language";
 import * as ct from "./customtags.ts";
-import { NakedURLTag } from "./customtags.ts";
 import { TaskList } from "./extended_task.ts";
 import { Table } from "./table_parser.ts";
 import { nakedUrlRegex, pWikiLinkRegex, tagRegex } from "./constants.ts";
@@ -259,8 +258,6 @@ type RegexParserExtension = {
   firstCharCode: number;
   regex: RegExp;
   nodeType: string;
-  tag: Tag;
-  className?: string;
 };
 
 function regexParser({
@@ -293,8 +290,6 @@ const NakedURL = regexParser(
     firstCharCode: 104, // h
     regex: new RegExp(`^${nakedUrlRegex.source}`),
     nodeType: "NakedURL",
-    className: "sb-naked-url",
-    tag: NakedURLTag,
   },
 );
 
@@ -302,16 +297,12 @@ const Hashtag = regexParser({
   firstCharCode: 35, // #
   regex: new RegExp(`^${tagRegex.source}`),
   nodeType: "Hashtag",
-  className: "sb-hashtag-text",
-  tag: ct.HashtagTag,
 });
 
 const TaskDeadline = regexParser({
   firstCharCode: 55357, // 📅
   regex: /^📅\s*\d{4}\-\d{2}\-\d{2}/,
-  className: "sb-task-deadline",
   nodeType: "DeadlineDate",
-  tag: ct.TaskDeadlineTag,
 });
 
 // FrontMatter parser
@@ -414,8 +405,8 @@ export const extendedMarkdownLanguage = markdown({
           Task: ct.TaskTag,
           TaskMark: ct.TaskMarkTag,
           Comment: ct.CommentTag,
-          "Subscript": ct.SubscriptTag,
-          "Superscript": ct.SuperscriptTag,
+          Subscript: ct.SubscriptTag,
+          Superscript: ct.SuperscriptTag,
           "TableDelimiter StrikethroughMark": t.processingInstruction,
           "TableHeader/...": t.heading,
           TableCell: t.content,
diff --git a/client/style.ts b/client/style.ts
index 0f06e1a1..9459e1d6 100644
--- a/client/style.ts
+++ b/client/style.ts
@@ -12,7 +12,6 @@ export default function highlightStyles() {
     { tag: t.meta, class: "sb-meta" },
     { tag: t.quote, class: "sb-quote" },
     { tag: t.monospace, class: "sb-code" },
-    { tag: t.url, class: "sb-url" },
     { tag: ct.WikiLinkPartTag, class: "sb-wiki-link" },
     { tag: ct.AttributeTag, class: "sb-frontmatter" },
     { tag: ct.AttributeNameTag, class: "sb-atom" },
diff --git a/plugs/editor/navigate.ts b/plugs/editor/navigate.ts
index 5e80df7b..9bcc4308 100644
--- a/plugs/editor/navigate.ts
+++ b/plugs/editor/navigate.ts
@@ -27,7 +27,7 @@ async function actionClickOrActionEnter(
       "WikiLink",
       "Link",
       "Image",
-      "URL",
+      "Autolink",
       "NakedURL",
       "Hashtag",
     ]
@@ -68,8 +68,18 @@ async function actionClickOrActionEnter(
       }
       return editor.navigate(ref, false, inNewWindow);
     }
+    // https://example.org
     case "NakedURL":
       return editor.openUrl(mdTree.children![0].text!);
+    // <https://example.org>
+    case "Autolink": {
+      const urlNode = findNodeOfType(mdTree, "URL");
+      if (!urlNode) {
+        return;
+      }
+
+      return editor.openUrl(urlNode.children![0].text!);
+    }
     case "Image":
     case "Link": {
       const urlNode = findNodeOfType(mdTree, "URL");