From: shane.xb.qian <shane.qian@foxmail.com>
Date: Mon, 10 Apr 2023 02:00:08 +0000 (+0800)
Subject: fix: init workspace list was wrong if set rootSearch
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=a5b102e00ebb9e7ff1f2c69c3fa724751d1029f7;p=vim-lsp.git

fix: init workspace list was wrong if set rootSearch

Signed-off-by: shane.xb.qian <shane.qian@foxmail.com>
---

diff --git a/autoload/lsp/lspserver.vim b/autoload/lsp/lspserver.vim
index 8f8ba89..89822e4 100644
--- a/autoload/lsp/lspserver.vim
+++ b/autoload/lsp/lspserver.vim
@@ -72,7 +72,6 @@ def StartServer(lspserver: dict<any>, bnr: number): number
   lspserver.completionLazyDoc = false
   lspserver.completionTriggerChars = []
   lspserver.signaturePopup = -1
-  lspserver.workspaceFolders = [bnr->bufname()->fnamemodify(':p:h')]
 
   var job = cmd->job_start(opts)
   if job->job_status() == 'fail'
@@ -163,6 +162,9 @@ def InitServer(lspserver: dict<any>, bnr: number)
   if rootPath == ''
     rootPath = bufDir
   endif
+
+  lspserver.workspaceFolders = [rootPath]
+
   var rootUri = util.LspFileToUri(rootPath)
   initparams.rootPath = rootPath
   initparams.rootUri = rootUri
@@ -170,6 +172,7 @@ def InitServer(lspserver: dict<any>, bnr: number)
 	name: rootPath->fnamemodify(':t'),
 	uri: rootUri
      }]
+
   initparams.trace = 'off'
   initparams.capabilities = capabilities.GetClientCaps()
   if !lspserver.initializationOptions->empty()