From bb44b3cfc3635ad8ff3b970c13157873e44cf6d8 Mon Sep 17 00:00:00 2001 From: Andreas Louv Date: Wed, 12 Apr 2023 07:57:33 +0200 Subject: [PATCH] Remove the unused "lspserver" parameter --- autoload/lsp/diag.vim | 39 ++++++++++++++--------------- autoload/lsp/lsp.vim | 50 ++++++-------------------------------- autoload/lsp/lspserver.vim | 4 +-- 3 files changed, 27 insertions(+), 66 deletions(-) diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim index 12c699c..45d90b6 100644 --- 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, 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, 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, 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, uri: string, newDiags: list, uri: string, newDiags: list): dict +export def DiagsGetErrorCount(): dict 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, 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): 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) enddef # Show the diagnostic message for the current line -export def ShowCurrentDiag(lspserver: dict, atPos: bool) +export def ShowCurrentDiag(atPos: bool) var bnr: number = bufnr() var lnum: number = line('.') var col: number = charcol('.') - var diag: dict = lspserver.getDiagByPos(bnr, lnum, col, atPos) + var diag: dict = 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, atPos: bool) enddef # Show the diagnostic message for the current line without linebreak -export def ShowCurrentDiagInStatusLine(lspserver: dict) +export def ShowCurrentDiagInStatusLine() var bnr: number = bufnr() var lnum: number = line('.') var col: number = charcol('.') - var diag: dict = lspserver.getDiagByPos(bnr, lnum, col) + var diag: dict = 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, bnr: number, - lnum: number, col: number, +export def GetDiagByPos(bnr: number, lnum: number, col: number, atPos: bool = false): dict - 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, bnr: number, enddef # Get all diagnostics from the LSP server for a particular line in a file -export def GetDiagsByLine(lspserver: dict, bnr: number, lnum: number): list> +export def GetDiagsByLine(bnr: number, lnum: number): list> if !diagsMap->has_key(bnr) return [] endif @@ -515,7 +514,7 @@ def JumpDiag(diag: dict) enddef # jump to the next/previous/first diagnostic message in the current buffer -export def LspDiagsJump(lspserver: dict, 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 = 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 88e0b08..38ecfba 100644 --- a/autoload/lsp/lsp.vim +++ b/autoload/lsp/lsp.vim @@ -339,18 +339,13 @@ enddef var lspDiagPopupID: number = 0 var lspDiagPopupInfo: dict = {} def g:LspDiagExpr(): any - var lspserver: dict = 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> = lspserver.getDiagsByLine( + var diagsInfo: list> = diag.GetDiagsByLine( v:beval_bufnr, v:beval_lnum ) @@ -376,11 +371,7 @@ def LspLeftInsertMode() :unlet b:LspDiagsUpdatePending var bnr: number = bufnr() - var lspserver: dict = 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 = 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 = 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 = 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 return res endif - var lspserver: dict = 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 = 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 5c50b23..3e87840 100644 --- a/autoload/lsp/lspserver.vim +++ b/autoload/lsp/lspserver.vim @@ -1164,7 +1164,7 @@ def CodeAction(lspserver: dict, fname_arg: string, line1: number, params->extend({textDocument: {uri: util.LspFileToUri(fname)}, range: r}) var d: list> = [] for lnum in range(line1, line2) - var diagsInfo: list> = diag.GetDiagsByLine(lspserver, bnr, lnum) + var diagsInfo: list> = 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, 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]), -- 2.50.0