feat: support volar 1.0 (#2181)

neovim · Oct 9, 2022 · 87c8c7b · 87c8c7b
1 parent 9d4b8d3
commit 87c8c7b
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lua/lspconfig/server_configurations/volar.lua b/lua/lspconfig/server_configurations/volar.lua
@@ -2,14 +2,13 @@ local util = require 'lspconfig.util'
 
 local function get_typescript_server_path(root_dir)
   local project_root = util.find_node_modules_ancestor(root_dir)
-  return project_root and (util.path.join(project_root, 'node_modules', 'typescript', 'lib', 'tsserverlibrary.js'))
-    or ''
+  return project_root and (util.path.join(project_root, 'node_modules', 'typescript', 'lib')) or ''
 end
 
 -- https://github.com/johnsoncodehk/volar/blob/master/packages/shared/src/types.ts
 local volar_init_options = {
   typescript = {
-    serverPath = '',
+    tsdk = '',
   },
   languageFeatures = {
     implementation = true,
@@ -63,9 +62,9 @@ return {
       if
         new_config.init_options
         and new_config.init_options.typescript
-        and new_config.init_options.typescript.serverPath == ''
+        and new_config.init_options.typescript.tsdk == ''
       then
-        new_config.init_options.typescript.serverPath = get_typescript_server_path(new_root_dir)
+        new_config.init_options.typescript.tsdk = get_typescript_server_path(new_root_dir)
       end
     end,
   },