volar-service-markdown 0.0.47 → 0.0.48

package/index.d.ts

@@ -1,4 +1,4 @@
-import { type DocumentSelector, type LanguageServicePlugin, type ProviderResult, type ServiceContext } from '@volar/language-service';
+import { type DocumentSelector, type LanguageServicePlugin, type ProviderResult, type LanguageServiceContext } from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { DiagnosticOptions, IMdLanguageService } from 'vscode-markdown-languageservice';
 export interface Provide {
@@ -7,6 +7,6 @@ export interface Provide {
 export declare function create({ documentSelector, fileExtensions, getDiagnosticOptions, }?: {
     documentSelector?: DocumentSelector;
     fileExtensions?: string[];
-    getDiagnosticOptions?(document: TextDocument, context: ServiceContext): ProviderResult<DiagnosticOptions | undefined>;
+    getDiagnosticOptions?(document: TextDocument, context: LanguageServiceContext): ProviderResult<DiagnosticOptions | undefined>;
 }): LanguageServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -22,7 +22,28 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
 }, } = {}) {
     return {
         name: 'markdown',
-        triggerCharacters: ['.', '/', '#'],
+        capabilities: {
+            codeActionProvider: {},
+            completionProvider: {
+                triggerCharacters: ['.', '/', '#'],
+            },
+            definitionProvider: true,
+            diagnosticProvider: true,
+            documentHighlightProvider: true,
+            documentLinkProvider: {
+                resolveProvider: true,
+            },
+            documentSymbolProvider: true,
+            // fileReferencesProvider: true
+            foldingRangeProvider: true,
+            hoverProvider: true,
+            referencesProvider: true,
+            renameProvider: {
+                prepareProvider: true,
+            },
+            selectionRangeProvider: true,
+            workspaceSymbolProvider: true,
+        },
         create(context) {
             const logger = {
                 level: vscode_markdown_languageservice_1.LogLevel.Off,
@@ -172,14 +193,14 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                     for (const change of event.changes) {
                         switch (change.type) {
                             case 2: {
-                                const document = getTextDocument(change.uri);
+                                const document = getTextDocument(vscode_uri_1.URI.parse(change.uri));
                                 if (document) {
                                     onDidChangeMarkdownDocument.fire(document);
                                 }
                                 break;
                             }
                             case 1: {
-                                const document = getTextDocument(change.uri);
+                                const document = getTextDocument(vscode_uri_1.URI.parse(change.uri));
                                 if (document) {
                                     onDidCreateMarkdownDocument.fire(document);
                                 }
@@ -197,29 +218,29 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                         // TODO: Add opened files (such as untitled files)
                         // const openTextDocumentResults = this.documents.all()
                         // 	.filter(doc => this.isRelevantMarkdownDocument(doc));
-                        return await findMarkdownFilesInWorkspace(vscode_uri_1.URI.parse(context.env.workspaceFolder));
+                        return (await Promise.all(context.env.workspaceFolders.map(findMarkdownFilesInWorkspace))).flat();
                     },
                     getContainingDocument(resource) {
-                        const decoded = context.decodeEmbeddedDocumentUri(resource.toString());
+                        const decoded = context.decodeEmbeddedDocumentUri(resource);
                         if (decoded) {
                             return {
-                                uri: vscode_uri_1.URI.parse(decoded[0]),
+                                uri: decoded[0],
                                 children: [],
                             };
                         }
                     },
                     hasMarkdownDocument(resource) {
-                        const document = getTextDocument(resource.toString());
+                        const document = getTextDocument(resource);
                         return Boolean(document && matchDocument(documentSelector, document));
                     },
                     onDidChangeMarkdownDocument: onDidChangeMarkdownDocument.event,
                     onDidCreateMarkdownDocument: onDidCreateMarkdownDocument.event,
                     onDidDeleteMarkdownDocument: onDidDeleteMarkdownDocument.event,
                     async openMarkdownDocument(resource) {
-                        return getTextDocument(resource.toString());
+                        return getTextDocument(resource);
                     },
                     async readDirectory(resource) {
-                        const directory = await fs?.readDirectory(resource.toString()) ?? [];
+                        const directory = await fs?.readDirectory(resource) ?? [];
                         return directory
                             .filter(file => file[1] !== 0)
                             .map(([fileName, fileType]) => [
@@ -228,13 +249,13 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                         ]);
                     },
                     async stat(resource) {
-                        const stat = await fs?.stat(resource.toString());
+                        const stat = await fs?.stat(resource);
                         if (stat?.type === 0) {
                             return;
                         }
                         return { isDirectory: stat?.type === 2 };
                     },
-                    workspaceFolders: [vscode_uri_1.URI.parse(context.env.workspaceFolder)],
+                    workspaceFolders: context.env.workspaceFolders,
                 };
                 return {
                     workspace,
@@ -251,7 +272,7 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
             }
             async function findMarkdownFilesInWorkspace(folder) {
                 const { fs } = context.env;
-                const files = await fs?.readDirectory(folder.toString()) ?? [];
+                const files = await fs?.readDirectory(folder) ?? [];
                 const docs = [];
                 await Promise.all(files.map(async ([fileName, fileType]) => {
                     if (fileType === 2 && fileName !== 'node_modules') {
@@ -261,13 +282,13 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                     }
                     else if (fileExtensions.some(ext => fileName.endsWith('.' + ext))) {
                         const fileUri = vscode_uri_1.Utils.joinPath(folder, fileName);
-                        let sourceScript = context.language.scripts.get(fileUri.toString());
+                        let sourceScript = context.language.scripts.get(fileUri);
                         if (!sourceScript) {
                             if (!fsSourceScripts.has(fileUri.toString())) {
                                 fsSourceScripts.set(fileUri.toString(), undefined);
-                                const fileContent = await fs?.readFile(fileUri.toString());
+                                const fileContent = await fs?.readFile(fileUri);
                                 if (fileContent !== undefined) {
-                                    fsSourceScripts.set(fileUri.toString(), context.language.scripts.set(fileUri.toString(), {
+                                    fsSourceScripts.set(fileUri.toString(), context.language.scripts.set(fileUri, {
                                         getText(start, end) {
                                             return fileContent.substring(start, end);
                                         },
@@ -278,7 +299,7 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                                             return undefined;
                                         },
                                     }));
-                                    context.language.scripts.delete(fileUri.toString());
+                                    context.language.scripts.delete(fileUri);
                                 }
                             }
                             sourceScript = fsSourceScripts.get(fileUri.toString());
@@ -293,7 +314,7 @@ function create({ documentSelector = ['markdown'], fileExtensions = [
                             }
                         }
                         else if (sourceScript) {
-                            const doc = context.documents.get(fileName, sourceScript.languageId, sourceScript.snapshot);
+                            const doc = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
                             if (doc && matchDocument(documentSelector, doc)) {
                                 docs.push(doc);
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-markdown",
-	"version": "0.0.47",
+	"version": "0.0.48",
 	"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.2.3"
+		"@volar/language-service": "~2.3.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "d53f4dfa7007e77409af3ef28cc165e9940e7313"
+	"gitHead": "6a80c92133e154907a79eefa05603f63994214c3"
 }