revert file names and just rename vue-language-server to volar-server

README.md

@@ -166,7 +166,7 @@ You can change the directory to install servers by set `g:lsp_settings_servers_d
 | Vim               | vim-language-server                 |    Yes    |      Yes      |
 | Vala              | vala-language-server                |    No     |      No       |
 | Vue               | vue-language-server                 |    Yes    |      Yes      |
-| Vue               | vue-language-server (volar)         |    Yes    |      Yes      |
+| Vue               | volar-server                        |    Yes    |      Yes      |
 | V                 | vls                                 |    Yes    |      Yes      |
 | XML               | lemminx                             |    Yes    |      Yes      |
 | YAML              | yaml-language-server                |    Yes    |      Yes      |

installer/install-volar-server.cmd

@@ -1,4 +1,5 @@
 @echo off
 
 call "%~dp0\npm_install.cmd" vue-language-server @volar/vue-language-server@0.33.6
+ren vue-language-server.cmd volar-server.cmd
 call npm install typescript@4.6

installer/install-volar-server.sh

@@ -3,4 +3,5 @@
 set -e
 
 "$(dirname "$0")/npm_install.sh" vue-language-server @volar/vue-language-server@0.33.6
+mv vue-language-server volar-server
 npm install typescript@4.6

settings.json

@@ -1539,7 +1539,7 @@
       }
     },
     {
-      "command": "vue-language-server",
+      "command": "volar-server",
       "url": "https://github.com/johnsoncodehk/volar",
       "description": "Explore high-performance tooling for Vue",
       "config": {

settings/volar-server.vim

@@ -4,7 +4,7 @@ function! s:get_current_ts_path() abort
   let project_dir = lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), 'package.json')
   let tsserverlibrary_path = project_dir . ts_path
 
-  let server_dir = lsp_settings#servers_dir() . '/vue-language-server'
+  let server_dir = lsp_settings#servers_dir() . '/volar-server'
   let fallback_path = server_dir . ts_path
 
   let path = filereadable(tsserverlibrary_path) ? tsserverlibrary_path : fallback_path
@@ -168,47 +168,47 @@ augroup vim_lsp_settings_volar_server
   au!
   if get(g:, 'vim_lsp_settings_volar_experimental_multiple_servers')
     LspRegisterServer {
-    \ 'name': 'vue-language-server-api',
-    \ 'cmd': {server_info->lsp_settings#get('vue-language-server', 'cmd', [lsp_settings#exec_path('vue-language-server')]+lsp_settings#get('vue-language-server', 'args', ['--stdio']))},
-    \ 'root_uri':{server_info->lsp_settings#get('vue-language-server', 'root_uri', lsp_settings#root_uri('vue-language-server'))},
-    \ 'initialization_options': lsp_settings#get('vue-language-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_api_options)),
-    \ 'allowlist': lsp_settings#get('vue-language-server', 'allowlist', ['vue']),
-    \ 'blocklist': lsp_settings#get('vue-language-server', 'blocklist', []),
-    \ 'config': lsp_settings#get('vue-language-server', 'config', lsp_settings#server_config('vue-language-server')),
-    \ 'workspace_config': lsp_settings#get('vue-language-server', 'workspace_config', g:vim_lsp_settings_volar_config),
+    \ 'name': 'volar-server-api',
+    \ 'cmd': {server_info->lsp_settings#get('volar-server', 'cmd', [lsp_settings#exec_path('volar-server')]+lsp_settings#get('volar-server', 'args', ['--stdio']))},
+    \ 'root_uri':{server_info->lsp_settings#get('volar-server', 'root_uri', lsp_settings#root_uri('volar-server'))},
+    \ 'initialization_options': lsp_settings#get('volar-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_api_options)),
+    \ 'allowlist': lsp_settings#get('volar-server', 'allowlist', ['vue']),
+    \ 'blocklist': lsp_settings#get('volar-server', 'blocklist', []),
+    \ 'config': lsp_settings#get('volar-server', 'config', lsp_settings#server_config('volar-server')),
+    \ 'workspace_config': lsp_settings#get('volar-server', 'workspace_config', g:vim_lsp_settings_volar_config),
     \ }
 
     LspRegisterServer {
-    \ 'name': 'vue-language-server-doc',
-    \ 'cmd': {server_info->lsp_settings#get('vue-language-server', 'cmd', [lsp_settings#exec_path('vue-language-server')]+lsp_settings#get('vue-language-server', 'args', ['--stdio']))},
-    \ 'root_uri':{server_info->lsp_settings#get('vue-language-server', 'root_uri', lsp_settings#root_uri('vue-language-server'))},
-    \ 'initialization_options': lsp_settings#get('vue-language-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_doc_options)),
-    \ 'allowlist': lsp_settings#get('vue-language-server', 'allowlist', ['vue']),
-    \ 'blocklist': lsp_settings#get('vue-language-server', 'blocklist', []),
-    \ 'config': lsp_settings#get('vue-language-server', 'config', lsp_settings#server_config('vue-language-server')),
-    \ 'workspace_config': lsp_settings#get('vue-language-server', 'workspace_config', g:vim_lsp_settings_volar_config),
+    \ 'name': 'volar-server-doc',
+    \ 'cmd': {server_info->lsp_settings#get('volar-server', 'cmd', [lsp_settings#exec_path('volar-server')]+lsp_settings#get('volar-server', 'args', ['--stdio']))},
+    \ 'root_uri':{server_info->lsp_settings#get('volar-server', 'root_uri', lsp_settings#root_uri('volar-server'))},
+    \ 'initialization_options': lsp_settings#get('volar-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_doc_options)),
+    \ 'allowlist': lsp_settings#get('volar-server', 'allowlist', ['vue']),
+    \ 'blocklist': lsp_settings#get('volar-server', 'blocklist', []),
+    \ 'config': lsp_settings#get('volar-server', 'config', lsp_settings#server_config('volar-server')),
+    \ 'workspace_config': lsp_settings#get('volar-server', 'workspace_config', g:vim_lsp_settings_volar_config),
     \ }
 
     LspRegisterServer {
-    \ 'name': 'vue-language-server-html',
-    \ 'cmd': {server_info->lsp_settings#get('vue-language-server', 'cmd', [lsp_settings#exec_path('vue-language-server')]+lsp_settings#get('vue-language-server', 'args', ['--stdio']))},
-    \ 'root_uri':{server_info->lsp_settings#get('vue-language-server', 'root_uri', lsp_settings#root_uri('vue-language-server'))},
-    \ 'initialization_options': lsp_settings#get('vue-language-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_html_options)),
-    \ 'allowlist': lsp_settings#get('vue-language-server', 'allowlist', ['vue']),
-    \ 'blocklist': lsp_settings#get('vue-language-server', 'blocklist', []),
-    \ 'config': lsp_settings#get('vue-language-server', 'config', lsp_settings#server_config('vue-language-server')),
-    \ 'workspace_config': lsp_settings#get('vue-language-server', 'workspace_config', g:vim_lsp_settings_volar_config),
+    \ 'name': 'volar-server-html',
+    \ 'cmd': {server_info->lsp_settings#get('volar-server', 'cmd', [lsp_settings#exec_path('volar-server')]+lsp_settings#get('volar-server', 'args', ['--stdio']))},
+    \ 'root_uri':{server_info->lsp_settings#get('volar-server', 'root_uri', lsp_settings#root_uri('volar-server'))},
+    \ 'initialization_options': lsp_settings#get('volar-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_html_options)),
+    \ 'allowlist': lsp_settings#get('volar-server', 'allowlist', ['vue']),
+    \ 'blocklist': lsp_settings#get('volar-server', 'blocklist', []),
+    \ 'config': lsp_settings#get('volar-server', 'config', lsp_settings#server_config('volar-server')),
+    \ 'workspace_config': lsp_settings#get('volar-server', 'workspace_config', g:vim_lsp_settings_volar_config),
     \ }
   else
     LspRegisterServer {
-    \ 'name': 'vue-language-server',
-    \ 'cmd': {server_info->lsp_settings#get('vue-language-server', 'cmd', [lsp_settings#exec_path('vue-language-server')]+lsp_settings#get('vue-language-server', 'args', ['--stdio']))},
-    \ 'root_uri':{server_info->lsp_settings#get('vue-language-server', 'root_uri', lsp_settings#root_uri('vue-language-server'))},
-    \ 'initialization_options': lsp_settings#get('vue-language-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_options)),
-    \ 'allowlist': lsp_settings#get('vue-language-server', 'allowlist', ['vue']),
-    \ 'blocklist': lsp_settings#get('vue-language-server', 'blocklist', []),
-    \ 'config': lsp_settings#get('vue-language-server', 'config', lsp_settings#server_config('vue-language-server')),
-    \ 'workspace_config': lsp_settings#get('vue-language-server', 'workspace_config', g:vim_lsp_settings_volar_config),
+    \ 'name': 'volar-server',
+    \ 'cmd': {server_info->lsp_settings#get('volar-server', 'cmd', [lsp_settings#exec_path('volar-server')]+lsp_settings#get('volar-server', 'args', ['--stdio']))},
+    \ 'root_uri':{server_info->lsp_settings#get('volar-server', 'root_uri', lsp_settings#root_uri('volar-server'))},
+    \ 'initialization_options': lsp_settings#get('volar-server', 'initialization_options', Vim_lsp_settings_volar_setup_ts_path(g:vim_lsp_settings_volar_options)),
+    \ 'allowlist': lsp_settings#get('volar-server', 'allowlist', ['vue']),
+    \ 'blocklist': lsp_settings#get('volar-server', 'blocklist', []),
+    \ 'config': lsp_settings#get('volar-server', 'config', lsp_settings#server_config('volar-server')),
+    \ 'workspace_config': lsp_settings#get('volar-server', 'workspace_config', g:vim_lsp_settings_volar_config),
     \ }
   endif
 augroup END