volar-service-markdown 0.0.30 → 0.0.32

package/index.d.ts

@@ -1,15 +1,11 @@
-import { type ServicePlugin } from '@volar/language-service';
-import type { IMdLanguageService } from 'vscode-markdown-languageservice';
+import type { DocumentSelector, Result, ServiceContext, ServicePlugin } from '@volar/language-service';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { DiagnosticOptions, IMdLanguageService } from 'vscode-markdown-languageservice';
 export interface Provide {
     'markdown/languageService': () => IMdLanguageService;
 }
-export interface CreateOptions {
-    /**
-     * The section to use for configuring validation options.
-     *
-     * @example 'markdown.validate'
-     */
-    configurationSection: string;
-}
-export declare function create(options: CreateOptions): ServicePlugin;
+export declare function create({ documentSelector, getDiagnosticOptions, }?: {
+    documentSelector?: DocumentSelector;
+    getDiagnosticOptions?(document: TextDocument, context: ServiceContext): Result<DiagnosticOptions | undefined>;
+}): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -7,21 +7,20 @@ const vscode_markdown_languageservice_1 = require("vscode-markdown-languageservi
 const vscode_uri_1 = require("vscode-uri");
 const MarkdownIt = require("markdown-it");
 const md = new MarkdownIt();
-function isMarkdown(document) {
-    return document.languageId === 'markdown';
-}
 function assert(condition, message) {
     if (!condition) {
         throw new Error(message);
     }
 }
-function create(options) {
+function create({ documentSelector = ['markdown'], getDiagnosticOptions = async (_document, context) => {
+    return await context.env.getConfiguration?.('markdown.validate');
+}, } = {}) {
     return {
         name: 'markdown',
         triggerCharacters: ['.', '/', '#'],
         create(context) {
             let lastProjectVersion;
-            const { fs, getConfiguration, onDidChangeWatchedFiles } = context.env;
+            const { fs, onDidChangeWatchedFiles } = context.env;
             assert(fs, 'context.env.fs must be defined');
             assert(onDidChangeWatchedFiles, 'context.env.fs.onDidChangeWatchedFiles must be defined');
             const logger = {
@@ -73,7 +72,7 @@ function create(options) {
                 },
                 hasMarkdownDocument(resource) {
                     const document = getTextDocument(resource.toString(), true);
-                    return Boolean(document && isMarkdown(document));
+                    return Boolean(document && matchDocument(documentSelector, document));
                 },
                 onDidChangeMarkdownDocument: onDidChangeMarkdownDocument.event,
                 onDidCreateMarkdownDocument: onDidCreateMarkdownDocument.event,
@@ -94,7 +93,7 @@ function create(options) {
                         return { isDirectory: stat.type === 2 };
                     }
                 },
-                workspaceFolders: []
+                workspaceFolders: [vscode_uri_1.URI.parse(context.env.workspaceFolder)],
             };
             const ls = (0, vscode_markdown_languageservice_1.createLanguageService)({
                 logger,
@@ -120,7 +119,7 @@ function create(options) {
                     const [_, sourceFile] = context.documents.getVirtualCodeByUri(uri);
                     if (sourceFile?.generated) {
                         for (const virtualCode of (0, language_service_1.forEachEmbeddedCode)(sourceFile.generated.code)) {
-                            if (virtualCode.languageId === 'markdown') {
+                            if (matchDocument(documentSelector, virtualCode)) {
                                 const uri = context.documents.getVirtualCodeUri(sourceFile.id, virtualCode.id);
                                 const document = context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
                                 newVersions.set(document.uri, document);
@@ -129,7 +128,7 @@ function create(options) {
                     }
                     else if (sourceFile) {
                         const document = context.documents.get(fileName, sourceFile.languageId, sourceFile.snapshot);
-                        if (document && isMarkdown(document)) {
+                        if (document && matchDocument(documentSelector, document)) {
                             newVersions.set(document.uri, document);
                         }
                     }
@@ -152,7 +151,7 @@ function create(options) {
                 }
             };
             const prepare = (document) => {
-                if (!isMarkdown(document)) {
+                if (!matchDocument(documentSelector, document)) {
                     return false;
                 }
                 sync();
@@ -201,7 +200,7 @@ function create(options) {
                 },
                 async provideDiagnostics(document, token) {
                     if (prepare(document)) {
-                        const configuration = await getConfiguration?.(options.configurationSection, document.uri);
+                        const configuration = await getDiagnosticOptions(document, context);
                         if (configuration) {
                             return ls.computeDiagnostics(document, configuration, token);
                         }
@@ -277,4 +276,12 @@ function create(options) {
     };
 }
 exports.create = create;
+function matchDocument(selector, document) {
+    for (const sel of selector) {
+        if (sel === document.languageId || (typeof sel === 'object' && sel.language === document.languageId)) {
+            return true;
+        }
+    }
+    return false;
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-markdown",
-	"version": "0.0.30",
+	"version": "0.0.32",
 	"description": "Integrate vscode-markdown-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/markdown",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -34,12 +34,12 @@
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.0.1"
+		"@volar/language-service": "~2.1.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "30c3cc3c76e90f75f14fe0c2fa4fd33b7ff06507"
+	"gitHead": "717049e7dcd5c30f451f6db8eb71eaba43f74c83"
 }