Rpaul markdoc 030 (#6)

* Updates to Markdoc 0.3.0 and enables support for slots

* Make the formatter respect tokenizer settings

Author: rpaul-stripe

client/package.json

@@ -3,7 +3,7 @@
   "description": "Markdoc Extension",
   "author": "Ryan Paul",
   "license": "MIT",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "scripts": {
     "build": "esbuild index.ts --bundle --outdir=dist --sourcemap=linked --external:vscode --platform=node --format=cjs",
     "build:server": "esbuild server.ts --bundle --outdir=dist --sourcemap=linked --external:vscode --platform=node --format=cjs"

package.json

@@ -7,7 +7,7 @@
   "author": "Ryan Paul",
   "publisher": "stripe",
   "license": "MIT",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A Markdoc language server and Visual Studio Code extension",
   "repository": {
     "type": "git",

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@markdoc/language-server",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A Markdoc language server",
   "main": "dist/index.js",
   "author": "Ryan Paul",
   "license": "MIT",
   "devDependencies": {
-    "@markdoc/markdoc": "^0.2.1",
+    "@markdoc/markdoc": "^0.3.0",
     "@types/picomatch": "^2.3.0",
     "picomatch": "^2.3.1",
     "typescript": "^5.0.4",

server/package.json

@@ -93,7 +93,6 @@ export default class CompletionProvider {
         insertText: item.data.block ? text : text.replaceAll("\n", ""),
         insertTextFormat: LSP.InsertTextFormat.Snippet,
         kind: LSP.CompletionItemKind.Function,
-        // @ts-expect-error
         documentation: config.description ?? "",
       };
     },

server/plugins/completion.ts

@@ -13,11 +13,11 @@ const example1 = `
 const example1Formatted = `
 # This is a test {% #foo %}
 
-- This is an example [foo](/bar)
+* This is an example [foo](/bar)
 `;
 
 const example1LastLine = `
-- This is an example [foo](/bar)
+* This is an example [foo](/bar)
 `;
 
 const mockConnection = {

server/plugins/formatting.test.ts

@@ -5,11 +5,14 @@ import type { Config, ServiceInstances } from "../types";
 import { TextDocument } from "vscode-languageserver-textdocument";
 
 export default class FormattingProvider {
+  protected tokenizer: Markdoc.Tokenizer;
+
   constructor(
     protected config: Config,
     protected connection: LSP.Connection,
     protected services: ServiceInstances
   ) {
+    this.tokenizer = new Markdoc.Tokenizer(config.markdoc ?? {});
     connection.onDocumentFormatting(this.onDocumentFormatting.bind(this));
     connection.onDocumentRangeFormatting(this.onRangeFormatting.bind(this));
   }
@@ -30,7 +33,8 @@ export default class FormattingProvider {
       : LSP.Range.create(0, 0, doc.lineCount, 0);
 
     const text = doc.getText(actualRange);
-    const ast = Markdoc.parse(text);
+    const tokens = this.tokenizer.tokenize(text);
+    const ast = Markdoc.parse(tokens, { slots: this.config.markdoc?.slots });
     const output = Markdoc.format(ast);
 
     return [LSP.TextEdit.replace(actualRange, output)];

server/plugins/formatting.ts

@@ -27,7 +27,7 @@ export default class Documents<
 
   parse(content: string, file: string) {
     const tokens = this.tokenizer.tokenize(content);
-    return Markdoc.parse(tokens, file);
+    return Markdoc.parse(tokens, { file, slots: this.config.markdoc?.slots });
   }
 
   protected handleClose({ document }: TextChangeEvent) {

server/services/documents.ts

@@ -75,7 +75,7 @@ export default class Scanner<
 
   parse(content: string, file: string) {
     const tokens = this.tokenizer.tokenize(content);
-    return Markdoc.parse(tokens, file);
+    return Markdoc.parse(tokens, { file, slots: this.config.markdoc?.slots });
   }
 
   async scan() {