@volar/monaco 1.4.0-alpha.8 → 1.4.0

package/out/utils/provider.js

@@ -10,6 +10,8 @@ async function createLanguageFeaturesProvider(worker, getSyncUris) {
     const codeLens = new WeakMap();
     const codeActions = new WeakMap();
     const colorInfos = new WeakMap();
+    const documentLinks = new WeakMap();
+    const inlayHints = new WeakMap();
     const languageService = await worker.getProxy();
     return {
         triggerCharacters: await languageService.triggerCharacters(),
@@ -178,10 +180,22 @@ async function createLanguageFeaturesProvider(worker, getSyncUris) {
             const codeResult = await languageService.findDocumentLinks(model.uri.toString());
             if (codeResult) {
                 return {
-                    links: codeResult.map(protocol2monaco.asLink),
+                    links: codeResult.map(link => {
+                        const monacoLink = protocol2monaco.asLink(link);
+                        documentLinks.set(monacoLink, link);
+                        return monacoLink;
+                    }),
                 };
             }
         },
+        async resolveLink(link) {
+            let codeResult = documentLinks.get(link);
+            if (codeResult) {
+                codeResult = await languageService.doDocumentLinkResolve(codeResult);
+                return protocol2monaco.asLink(codeResult);
+            }
+            return link;
+        },
         async provideCompletionItems(model, position, context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeResult = await languageService.doComplete(model.uri.toString(), monaco2protocol.asPosition(position), monaco2protocol.asCompletionContext(context));
@@ -276,11 +290,24 @@ async function createLanguageFeaturesProvider(worker, getSyncUris) {
             const codeResult = await languageService.getInlayHints(model.uri.toString(), monaco2protocol.asRange(range));
             if (codeResult) {
                 return {
-                    hints: codeResult.map(protocol2monaco.asInlayHint),
+                    hints: codeResult.map(hint => {
+                        const monacoHint = protocol2monaco.asInlayHint(hint);
+                        inlayHints.set(monacoHint, hint);
+                        return monacoHint;
+                    }),
                     dispose: () => { },
                 };
             }
         },
+        async resolveInlayHint(hint) {
+            const languageService = await worker.withSyncedResources(getSyncUris());
+            const codeHint = inlayHints.get(hint);
+            if (codeHint) {
+                const resolvedCodeHint = await languageService.doInlayHintResolve(codeHint);
+                return protocol2monaco.asInlayHint(resolvedCodeHint);
+            }
+            return hint;
+        },
         async provideHover(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeResult = await languageService.doHover(model.uri.toString(), monaco2protocol.asPosition(position));

package/out/worker.js

@@ -4,12 +4,13 @@ exports.createDtsHost = exports.createLanguageService = void 0;
 const language_service_1 = require("@volar/language-service");
 const vscode_uri_1 = require("vscode-uri");
 function createLanguageService(options) {
+    const ts = options.typescript?.module;
     const dtsFiles = new Map();
-    const ts = options.typescript ? options.typescript.module : undefined;
     const config = options.config ?? {};
     const compilerOptions = options.typescript?.compilerOptions ?? {};
     let host = createLanguageServiceHost();
     let languageService = (0, language_service_1.createLanguageService)({
+        modules: { typescript: ts },
         host,
         config,
         uriToFileName: (uri) => vscode_uri_1.URI.parse(uri).fsPath.replace(/\\/g, '/'),
@@ -40,6 +41,7 @@ function createLanguageService(options) {
                     dtsVersion = newVersion;
                     languageService.dispose();
                     languageService = (0, language_service_1.createLanguageService)({
+                        modules: { typescript: ts },
                         host,
                         config,
                         rootUri: vscode_uri_1.URI.file('/'),
@@ -143,7 +145,6 @@ function createLanguageService(options) {
                 }
                 return readDtsFile(fileName) !== undefined;
             },
-            getTypeScriptModule: ts ? (() => ts) : undefined,
         };
         return host;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.4.0-alpha.8",
+	"version": "1.4.0",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,9 +15,10 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.4.0-alpha.8",
+		"@volar/language-service": "1.4.0",
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
-	}
+	},
+	"gitHead": "9bf14ef0d08c53f9ae32cf538d9748fa91cc4ab7"
 }