fix: update support for new volar

Author: zardoy

package.json

@@ -146,7 +146,7 @@
         "@types/mocha": "^9.1.1",
         "@types/pluralize": "^0.0.29",
         "@volar/language-server": "1.3.0-alpha.3",
-        "@volar/language-service": "1.3.0-alpha.3",
+        "@volar/language-service": "1.5.0",
         "@volar/vue-language-core": "^1.2.0-patch.2",
         "@vscode/emmet-helper": "^2.8.4",
         "@vscode/test-electron": "^2.1.5",

pnpm-lock.yaml

@@ -6,27 +6,24 @@ export default () => {
     if (process.env.PLATFORM !== 'node') return
     const handler = () => {
         const config = vscode.workspace.getConfiguration('')
-        if (
-            !getExtensionSetting('enableVueSupport') ||
-            !vscode.extensions.getExtension('Vue.volar') ||
-            isConfigValueChanged('volar.vueserver.configFilePath')
-        ) {
+        const VOLAR_CONFIG_FILE_SETTING = 'vue.server.configFilePath'
+        if (!getExtensionSetting('enableVueSupport') || !vscode.extensions.getExtension('Vue.volar') || isConfigValueChanged(VOLAR_CONFIG_FILE_SETTING)) {
             return
         }
 
-        void config.update('volar.vueserver.configFilePath', extensionCtx.asAbsolutePath('./volarConfig.js'), vscode.ConfigurationTarget.Global)
+        void config.update(VOLAR_CONFIG_FILE_SETTING, extensionCtx.asAbsolutePath('./volarConfig.js'), vscode.ConfigurationTarget.Global)
     }
 
     handler()
     watchExtensionSettings(['enableVueSupport'], handler)
     vscode.extensions.onDidChange(handler)
 }
 
-const isConfigValueChanged = (id: string) => {
+const isConfigValueChanged = (settingId: string) => {
     if (process.env.PLATFORM !== 'web') {
         const config = vscode.workspace.getConfiguration('')
-        const userValue = config.get<string>(id)
-        if (userValue === config.inspect(id)!.defaultValue) return false
+        const userValue = config.get<string>(settingId)
+        if (userValue === config.inspect(settingId)!.defaultValue) return false
         // means that value was set by us programmatically, let's update it
         // eslint-disable-next-line @typescript-eslint/no-require-imports
         if (userValue?.startsWith(require('path').join(extensionCtx.extensionPath, '../..'))) return false

src/vueVolarSupport.ts

@@ -2,10 +2,11 @@
 // will be required from ./node_modules/typescript-essential-plugins/index.js
 const originalPluginFactory = require('typescript-essential-plugins')
 
-const plugin = (context => {
+const plugin = ((context, { typescript: tsModule } = {}) => {
+    if (!context) throw new Error('Not recieve context')
     const { typescript } = context
-    let configurationHost = context.configurationHost!
-    configurationHost ??= context['env'].configurationHost
+    let configurationHost = context.env
+    if (context['configurationHost']!) configurationHost = context['configurationHost']!
     const patchConfig = config => {
         return {
             ...config,
@@ -17,13 +18,14 @@ const plugin = (context => {
     }
 
     if (typescript && configurationHost) {
+        const ts = tsModule ?? typescript['module']
         const plugin = originalPluginFactory({
-            typescript: typescript.module,
+            typescript: ts,
         })
         // todo support vue-specific settings
         const originalLsMethods = { ...typescript.languageService }
 
-        void configurationHost.getConfiguration<any>('tsEssentialPlugins').then(_configuration => {
+        void configurationHost.getConfiguration!<any>('tsEssentialPlugins').then(_configuration => {
             // if (typescript.languageService[thisPluginMarker]) return
             const config = patchConfig(_configuration)
             if (!config.enablePlugin) return
@@ -39,8 +41,8 @@ const plugin = (context => {
             }
         })
 
-        configurationHost.onDidChangeConfiguration(() => {
-            void configurationHost.getConfiguration<any>('tsEssentialPlugins').then(config => {
+        configurationHost.onDidChangeConfiguration!(() => {
+            void configurationHost.getConfiguration!<any>('tsEssentialPlugins').then(config => {
                 config = patchConfig(config)
                 plugin.onConfigurationChanged?.(config)
                 // temporary workaround
@@ -54,17 +56,17 @@ const plugin = (context => {
         console.warn('Failed to activate tsEssentialPlugins, because of no typescript or configurationHost context')
     }
     return {}
-}) satisfies import('@volar/language-service').LanguageServicePlugin
+}) satisfies import('@volar/language-service').Service
 
 module.exports = {
     plugins: [
-        c => {
+        (...args) => {
             try {
-                return plugin(c)
+                return plugin(...(args as [any]))
             } catch (err) {
                 console.log('TS Essentials error', err)
                 return {}
             }
         },
     ],
-}
+} /*  satisfies import('@volar/language-service').ServiceContext */