volar-service-markdown 0.0.34 → 0.0.35

package/index.d.ts

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

package/index.js

@@ -38,7 +38,7 @@ function create({ documentSelector = ['markdown'], getDiagnosticOptions = async
             const onDidChangeMarkdownDocument = new vscode_jsonrpc_1.Emitter();
             const onDidCreateMarkdownDocument = new vscode_jsonrpc_1.Emitter();
             const onDidDeleteMarkdownDocument = new vscode_jsonrpc_1.Emitter();
-            const fileWatcher = onDidChangeWatchedFiles((event) => {
+            const fileWatcher = onDidChangeWatchedFiles(event => {
                 for (const change of event.changes) {
                     switch (change.type) {
                         case 2: {
@@ -116,18 +116,19 @@ function create({ documentSelector = ['markdown'], getDiagnosticOptions = async
                 const newVersions = new Map();
                 for (const fileName of languageServiceHost.getScriptFileNames()) {
                     const uri = context.env.typescript.fileNameToUri(fileName);
-                    const [_, sourceFile] = context.documents.getVirtualCodeByUri(uri);
-                    if (sourceFile?.generated) {
-                        for (const virtualCode of (0, language_service_1.forEachEmbeddedCode)(sourceFile.generated.code)) {
+                    const decoded = context.decodeEmbeddedDocumentUri(uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    if (sourceScript?.generated) {
+                        for (const virtualCode of (0, language_service_1.forEachEmbeddedCode)(sourceScript.generated.root)) {
                             if (matchDocument(documentSelector, virtualCode)) {
-                                const uri = context.documents.getVirtualCodeUri(sourceFile.id, virtualCode.id);
+                                const uri = context.encodeEmbeddedDocumentUri(sourceScript.id, virtualCode.id);
                                 const document = context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
                                 newVersions.set(document.uri, document);
                             }
                         }
                     }
-                    else if (sourceFile) {
-                        const document = context.documents.get(fileName, sourceFile.languageId, sourceFile.snapshot);
+                    else if (sourceScript) {
+                        const document = context.documents.get(fileName, sourceScript.languageId, sourceScript.snapshot);
                         if (document && matchDocument(documentSelector, document)) {
                             newVersions.set(document.uri, document);
                         }
@@ -262,14 +263,16 @@ function create({ documentSelector = ['markdown'], getDiagnosticOptions = async
             };
             function getTextDocument(uri, includeVirtualFile) {
                 if (includeVirtualFile) {
-                    const virtualCode = context.documents.getVirtualCodeByUri(uri)[0];
+                    const decoded = context.decodeEmbeddedDocumentUri(uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (virtualCode) {
                         return context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
                     }
                 }
-                const sourceFile = context.language.files.get(uri);
-                if (sourceFile) {
-                    return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
+                const sourceScript = context.language.scripts.get(uri);
+                if (sourceScript) {
+                    return context.documents.get(uri, sourceScript.languageId, sourceScript.snapshot);
                 }
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-markdown",
-	"version": "0.0.34",
+	"version": "0.0.35",
 	"description": "Integrate vscode-markdown-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/markdown",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -26,7 +26,7 @@
 	"dependencies": {
 		"markdown-it": "^13.0.2",
 		"vscode-jsonrpc": "^8.2.0",
-		"vscode-markdown-languageservice": "~0.4.0-alpha.7",
+		"vscode-markdown-languageservice": "~0.5.0-alpha.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
@@ -34,12 +34,12 @@
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.1.0"
+		"@volar/language-service": "~2.2.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "aafefd1d65541462b3e99208f14dbb2cd8477ae9"
+	"gitHead": "cbd8ef0ada6eae9656286535599c9b289134d1e3"
 }