Fixes #529 by removing directives (#613)

* Fixes #529 by removing directives
* Load builtin tags on space reindex

common/markdown_parser/parser.ts

@@ -160,6 +160,21 @@ export const Highlight: MarkdownConfig = {
   ],
 };
 
+import { parser as queryParser } from "./parse-query.js";
+
+export const highlightingQueryParser = queryParser.configure({
+  props: [
+    styleTags({
+      "Name": t.variableName,
+      "String": t.string,
+      "Number": t.number,
+      "PageRef": ct.WikiLinkTag,
+      "where limit select render Order OrderKW and or as InKW each all":
+        t.keyword,
+    }),
+  ],
+});
+
 export const attributeStartRegex = /^\[([\w\$]+)(::?\s*)/;
 
 export const Attribute: MarkdownConfig = {
@@ -264,121 +279,8 @@ export const Comment: MarkdownConfig = {
   ],
 };
 
-// Directive parser
-
-const directiveStart = /^\s*<!--\s*#([a-z]+)\s*(.*?)-->\s*/;
-const directiveEnd = /^\s*<!--\s*\/(.*?)-->\s*/;
-
-import { parser as directiveParser } from "./parse-query.js";
-import { parser as expressionParser } from "./parse-expression.js";
 import { Table } from "./table_parser.ts";
 import { foldNodeProp } from "@codemirror/language";
-import { lezerToParseTree } from "./parse_tree.ts";
-
-export const highlightingDirectiveParser = directiveParser.configure({
-  props: [
-    styleTags({
-      "Name": t.variableName,
-      "String": t.string,
-      "Number": t.number,
-      "PageRef": ct.WikiLinkTag,
-      "where limit select render Order OrderKW and or as InKW each all":
-        t.keyword,
-    }),
-  ],
-});
-
-export const Directive: MarkdownConfig = {
-  defineNodes: [
-    { name: "Directive", block: true, style: ct.DirectiveTag },
-    { name: "DirectiveStart", style: ct.DirectiveStartTag, block: true },
-    { name: "DirectiveEnd", style: ct.DirectiveEndTag },
-    { name: "DirectiveBody", block: true },
-  ],
-  parseBlock: [{
-    name: "Directive",
-    parse: (cx, line: Line) => {
-      const match = directiveStart.exec(line.text);
-      if (!match) {
-        return false;
-      }
-
-      // console.log("Parsing directive", line.text);
-
-      const frontStart = cx.parsedPos;
-      const [fullMatch, directive, arg] = match;
-      const elts = [];
-      if (directive === "query") {
-        const queryParseTree = highlightingDirectiveParser.parse(arg);
-        elts.push(cx.elt(
-          "DirectiveStart",
-          cx.parsedPos,
-          cx.parsedPos + line.text.length + 1,
-          [cx.elt(queryParseTree, frontStart + fullMatch.indexOf(arg))],
-        ));
-      } else if (directive === "eval") {
-        const expressionParseTree = expressionParser.parse(arg);
-        elts.push(cx.elt(
-          "DirectiveStart",
-          cx.parsedPos,
-          cx.parsedPos + line.text.length + 1,
-          [cx.elt(expressionParseTree, frontStart + fullMatch.indexOf(arg))],
-        ));
-      } else {
-        elts.push(cx.elt(
-          "DirectiveStart",
-          cx.parsedPos,
-          cx.parsedPos + line.text.length + 1,
-        ));
-      }
-
-      // console.log("Query parse tree", queryParseTree.topNode);
-
-      cx.nextLine();
-      const startPos = cx.parsedPos;
-      let endPos = startPos;
-      let text = "";
-      let lastPos = cx.parsedPos;
-      let nesting = 0;
-      while (true) {
-        if (directiveEnd.exec(line.text) && nesting === 0) {
-          break;
-        }
-        text += line.text + "\n";
-        endPos += line.text.length + 1;
-        if (directiveStart.exec(line.text)) {
-          nesting++;
-        }
-        if (directiveEnd.exec(line.text)) {
-          nesting--;
-        }
-        cx.nextLine();
-        if (cx.parsedPos === lastPos) {
-          // End of file, no progress made, there may be a better way to do this but :shrug:
-          return false;
-        }
-        lastPos = cx.parsedPos;
-      }
-      const directiveBodyTree = cx.parser.parse(text);
-
-      elts.push(
-        cx.elt("DirectiveBody", startPos, endPos, [
-          cx.elt(directiveBodyTree, startPos),
-        ]),
-      );
-      endPos = cx.parsedPos + line.text.length;
-      elts.push(cx.elt(
-        "DirectiveEnd",
-        cx.parsedPos,
-        cx.parsedPos + line.text.length,
-      ));
-      cx.nextLine();
-      cx.addElement(cx.elt("Directive", frontStart, endPos, elts));
-      return true;
-    },
-    before: "HTMLBlock",
-  }],
-};
 
 // FrontMatter parser
 
@@ -450,7 +352,6 @@ export default function buildMarkdown(mdExtensions: MDExt[]): Language {
       CommandLink,
       Attribute,
       FrontMatter,
-      Directive,
       TaskList,
       Comment,
       Highlight,