Remove the unused "lspserver" parameter

diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim
index 12c699c4dd55640b28a55fd9f973a42f0c8e36b2..45d90b69dde8ad3f47d4efa1b4085a82512d556b 100644 (file)
--- a/autoload/lsp/diag.vim
+++ b/autoload/lsp/diag.vim
@@ -118,7 +118,7 @@ enddef
 
 # Refresh the placed diagnostics in buffer 'bnr'
 # This inline signs, inline props, and virtual text diagnostics
-def DiagsRefresh(lspserver: dict<any>, bnr: number)
+def DiagsRefresh(bnr: number)
   bnr->bufload()
   # Remove all the existing diagnostic signs
   sign_unplace('LSPDiag', {buffer: bnr})
@@ -183,9 +183,9 @@ enddef
 
 # New LSP diagnostic messages received from the server for a file.
 # Update the signs placed in the buffer for this file
-export def ProcessNewDiags(lspserver: dict<any>, bnr: number)
+export def ProcessNewDiags(bnr: number)
   if opt.lspOptions.autoPopulateDiags
-    DiagsUpdateLocList(lspserver, bnr)
+    DiagsUpdateLocList(bnr)
   endif
 
   if !opt.lspOptions.autoHighlightDiags
@@ -204,7 +204,7 @@ export def ProcessNewDiags(lspserver: dict<any>, bnr: number)
     return
   endif
 
-  DiagsRefresh(lspserver, bnr)
+  DiagsRefresh(bnr)
 enddef
 
 # process a diagnostic notification message from the LSP server
@@ -264,7 +264,7 @@ export def DiagNotification(lspserver: dict<any>, uri: string, newDiags: list<di
     serverDiagnostics: serverDiags
   }
 
-  ProcessNewDiags(lspserver, bnr)
+  ProcessNewDiags(bnr)
 
   # Notify user scripts that diags has been updated
   if exists('#User#LspDiagsUpdated')
@@ -273,7 +273,7 @@ export def DiagNotification(lspserver: dict<any>, uri: string, newDiags: list<di
 enddef
 
 # get the count of error in the current buffer
-export def DiagsGetErrorCount(lspserver: dict<any>): dict<number>
+export def DiagsGetErrorCount(): dict<number>
   var errCount = 0
   var warnCount = 0
   var infoCount = 0
@@ -313,7 +313,7 @@ enddef
 # Update the location list window for the current window with the diagnostic
 # messages.
 # Returns true if diagnostics is not empty and false if it is empty.
-def DiagsUpdateLocList(lspserver: dict<any>, bnr: number): bool
+def DiagsUpdateLocList(bnr: number): bool
   var fname: string = bnr->bufname()->fnamemodify(':p')
   if fname == ''
     return false
@@ -363,8 +363,8 @@ enddef
 
 # Display the diagnostic messages from the LSP server for the current buffer
 # in a location list
-export def ShowAllDiags(lspserver: dict<any>): void
-  if !DiagsUpdateLocList(lspserver, bufnr())
+export def ShowAllDiags(): void
+  if !DiagsUpdateLocList(bufnr())
     util.WarnMsg($'No diagnostic messages found for {@%}')
     return
   endif
@@ -427,11 +427,11 @@ def DisplayDiag(diag: dict<any>)
 enddef
 
 # Show the diagnostic message for the current line
-export def ShowCurrentDiag(lspserver: dict<any>, atPos: bool)
+export def ShowCurrentDiag(atPos: bool)
   var bnr: number = bufnr()
   var lnum: number = line('.')
   var col: number = charcol('.')
-  var diag: dict<any> = lspserver.getDiagByPos(bnr, lnum, col, atPos)
+  var diag: dict<any> = GetDiagByPos(bnr, lnum, col, atPos)
   if diag->empty()
     util.WarnMsg($'No diagnostic messages found for current {atPos ? "position" : "line"}')
   else
@@ -440,11 +440,11 @@ export def ShowCurrentDiag(lspserver: dict<any>, atPos: bool)
 enddef
 
 # Show the diagnostic message for the current line without linebreak
-export def ShowCurrentDiagInStatusLine(lspserver: dict<any>)
+export def ShowCurrentDiagInStatusLine()
   var bnr: number = bufnr()
   var lnum: number = line('.')
   var col: number = charcol('.')
-  var diag: dict<any> = lspserver.getDiagByPos(bnr, lnum, col)
+  var diag: dict<any> = GetDiagByPos(bnr, lnum, col)
   if !diag->empty()
     # 15 is a enough length not to cause line break
     var max_width = &columns - 15
@@ -461,10 +461,9 @@ enddef
 
 # Get the diagnostic from the LSP server for a particular line and character
 # offset in a file
-export def GetDiagByPos(lspserver: dict<any>, bnr: number,
-                       lnum: number, col: number,
+export def GetDiagByPos(bnr: number, lnum: number, col: number,
                        atPos: bool = false): dict<any>
-  var diags_in_line = GetDiagsByLine(lspserver, bnr, lnum)
+  var diags_in_line = GetDiagsByLine(bnr, lnum)
 
   for diag in diags_in_line
     if atPos
@@ -485,7 +484,7 @@ export def GetDiagByPos(lspserver: dict<any>, bnr: number,
 enddef
 
 # Get all diagnostics from the LSP server for a particular line in a file
-export def GetDiagsByLine(lspserver: dict<any>, bnr: number, lnum: number): list<dict<any>>
+export def GetDiagsByLine(bnr: number, lnum: number): list<dict<any>>
   if !diagsMap->has_key(bnr)
     return []
   endif
@@ -515,7 +514,7 @@ def JumpDiag(diag: dict<any>)
 enddef
 
 # jump to the next/previous/first diagnostic message in the current buffer
-export def LspDiagsJump(lspserver: dict<any>, which: string, a_count: number = 0): void
+export def LspDiagsJump(which: string, a_count: number = 0): void
   var fname: string = expand('%:p')
   if fname == ''
     return
@@ -613,9 +612,7 @@ enddef
 export def DiagsHighlightEnable()
   opt.lspOptions.autoHighlightDiags = true
   for binfo in getbufinfo({bufloaded: true})
-    var lspserver: dict<any> = buf.BufLspServerGet(binfo.bufnr)
-    if !lspserver->empty() && lspserver.running
-      DiagsRefresh(lspserver, binfo.bufnr)
+    DiagsRefresh(binfo.bufnr)
     endif
   endfor
 enddef

diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim
index 88e0b086038627ecf674a7754ca5cc6304b12cba..38ecfba366f792a2d019118e4770067023e3472e 100644 (file)
--- a/autoload/lsp/lsp.vim
+++ b/autoload/lsp/lsp.vim
@@ -339,18 +339,13 @@ enddef
 var lspDiagPopupID: number = 0
 var lspDiagPopupInfo: dict<any> = {}
 def g:LspDiagExpr(): any
-  var lspserver: dict<any> = buf.BufLspServerGet(v:beval_bufnr)
-  if lspserver->empty() || !lspserver.running
-    return ''
-  endif
-
   # Display the diagnostic message only if the mouse is over the gutter for
   # the signs.
   if opt.lspOptions.noDiagHoverOnLine && v:beval_col >= 2
     return ''
   endif
 
-  var diagsInfo: list<dict<any>> = lspserver.getDiagsByLine(
+  var diagsInfo: list<dict<any>> = diag.GetDiagsByLine(
     v:beval_bufnr,
     v:beval_lnum
   )
@@ -376,11 +371,7 @@ def LspLeftInsertMode()
   :unlet b:LspDiagsUpdatePending
 
   var bnr: number = bufnr()
-  var lspserver: dict<any> = buf.CurbufGetServer()
-  if lspserver->empty() || !lspserver.running
-    return
-  endif
-  diag.ProcessNewDiags(lspserver, bnr)
+  diag.ProcessNewDiags(bnr)
 enddef
 
 # Add buffer-local autocmds when attaching a LSP server to a buffer
@@ -505,7 +496,7 @@ export def RemoveFile(bnr: number): void
     if lspserver.running
       lspserver.textdocDidClose(bnr)
     endif
-    diag.DiagRemoveFile(lspserver, bnr)
+    diag.DiagRemoveFile(bnr)
     buf.BufLspServerRemove(bnr, lspserver)
   endfor
 enddef
@@ -689,22 +680,12 @@ enddef
 # Display the diagnostic messages from the LSP server for the current buffer
 # in a quickfix list
 export def ShowDiagnostics(): void
-  var lspserver: dict<any> = buf.CurbufGetServerChecked()
-  if lspserver->empty()
-    return
-  endif
-
-  diag.ShowAllDiags(lspserver)
+  diag.ShowAllDiags()
 enddef
 
 # Show the diagnostic message for the current line
 export def LspShowCurrentDiag(atPos: bool)
-  var lspserver: dict<any> = buf.CurbufGetServerChecked()
-  if lspserver->empty()
-    return
-  endif
-
-  diag.ShowCurrentDiag(lspserver, atPos)
+  diag.ShowCurrentDiag(atPos)
 enddef
 
 # Display the diagnostics for the current line in the status line.
@@ -714,12 +695,7 @@ export def LspShowCurrentDiagInStatusLine()
     return
   endif
 
-  var lspserver: dict<any> = buf.CurbufGetServer()
-  if lspserver->empty() || !lspserver.running
-    return
-  endif
-
-  diag.ShowCurrentDiagInStatusLine(lspserver)
+  diag.ShowCurrentDiagInStatusLine()
 enddef
 
 # get the count of diagnostics in the current buffer
@@ -730,22 +706,12 @@ export def ErrorCount(): dict<number>
     return res
   endif
 
-  var lspserver: dict<any> = buf.CurbufGetServer()
-  if lspserver->empty() || !lspserver.running
-    return res
-  endif
-
-  return diag.DiagsGetErrorCount(lspserver)
+  return diag.DiagsGetErrorCount()
 enddef
 
 # jump to the next/previous/first diagnostic message in the current buffer
 export def JumpToDiag(which: string, count: number = 0): void
-  var lspserver: dict<any> = buf.CurbufGetServerChecked()
-  if lspserver->empty()
-    return
-  endif
-
-  diag.LspDiagsJump(lspserver, which, count)
+  diag.LspDiagsJump(which, count)
 enddef
 
 # Display the hover message from the LSP server for the current cursor

diff --git a/autoload/lsp/lspserver.vim b/autoload/lsp/lspserver.vim
index 5c50b232b00b226d5e105fa4a8dbd2b0a684cefa..3e87840603b55de5bac8a2c6827d1903a03cf0ee 100644 (file)
--- a/autoload/lsp/lspserver.vim
+++ b/autoload/lsp/lspserver.vim
@@ -1164,7 +1164,7 @@ def CodeAction(lspserver: dict<any>, fname_arg: string, line1: number,
   params->extend({textDocument: {uri: util.LspFileToUri(fname)}, range: r})
   var d: list<dict<any>> = []
   for lnum in range(line1, line2)
-    var diagsInfo: list<dict<any>> = diag.GetDiagsByLine(lspserver, bnr, lnum)
+    var diagsInfo: list<dict<any>> = diag.GetDiagsByLine(bnr, lnum)
     d->extend(diagsInfo)
   endfor
   params->extend({context: {diagnostics: d, triggerKind: 1}})
@@ -1534,8 +1534,6 @@ export def NewLspServer(name_arg: string, path_arg: string, args: list<string>,
     processNotif: function(handlers.ProcessNotif, [lspserver]),
     processRequest: function(handlers.ProcessRequest, [lspserver]),
     processMessages: function(handlers.ProcessMessages, [lspserver]),
-    getDiagByPos: function(diag.GetDiagByPos, [lspserver]),
-    getDiagsByLine: function(diag.GetDiagsByLine, [lspserver]),
     textdocDidOpen: function(TextdocDidOpen, [lspserver]),
     textdocDidClose: function(TextdocDidClose, [lspserver]),
     textdocDidChange: function(TextdocDidChange, [lspserver]),