From a0c7ebfc9a8252f5df68701fed2a3a4b8e8bae80 Mon Sep 17 00:00:00 2001 From: Remco Haszing Date: Mon, 30 Oct 2023 11:27:18 +0100 Subject: [PATCH] Use Volar utility to get the TypeScript tsdk --- packages/vscode-mdx/src/extension.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/vscode-mdx/src/extension.js b/packages/vscode-mdx/src/extension.js index 4c30a219..d07d412e 100644 --- a/packages/vscode-mdx/src/extension.js +++ b/packages/vscode-mdx/src/extension.js @@ -2,11 +2,10 @@ * @typedef {import('vscode').ExtensionContext} ExtensionContext */ -import * as path from 'node:path' import {DiagnosticModel} from '@volar/language-server' import * as languageServerProtocol from '@volar/language-server/protocol.js' -import {activateAutoInsertion, supportLabsVersion} from '@volar/vscode' -import {env, languages, workspace} from 'vscode' +import {activateAutoInsertion, getTsdk, supportLabsVersion} from '@volar/vscode' +import {languages, workspace} from 'vscode' import {LanguageClient} from 'vscode-languageclient/node.js' import {documentDropEditProvider} from './document-drop-edit-provider.js' @@ -26,15 +25,15 @@ export async function activate(context) { return } + const {tsdk} = await getTsdk(context) + client = new LanguageClient( 'MDX', {module: context.asAbsolutePath('out/language-server.js')}, { documentSelector: [{language: 'mdx'}], initializationOptions: { - typescript: { - tsdk: path.join(env.appRoot, 'extensions/node_modules/typescript/lib') - }, + typescript: {tsdk}, diagnosticModel: DiagnosticModel.Pull } }