Remove the s: prefix for script local functions

diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim
index 85fe67b62603af557a5ce238692eb9eb7129e7fd..e4b1c95e9106a935e5ab2c154b8967884a626847 100644 (file)
--- a/autoload/lsp/lsp.vim
+++ b/autoload/lsp/lsp.vim
@@ -352,7 +352,7 @@ export def AddFile(bnr: number): void
   lspserver.textdocDidOpen(bnr, ftype)
 
   # add a listener to track changes to this buffer
-  listener_add(function('s:Bufchange_listener'), bnr)
+  listener_add(Bufchange_listener, bnr)
 
   # set options for insert mode completion
   if opt.lspOptions.autoComplete

diff --git a/autoload/lsp/lspserver.vim b/autoload/lsp/lspserver.vim
index 2077722dfac816d732908e26f2235c97d2b84639..b6f6256858d943d6fc62df909e2d7b1e979a129e 100644 (file)
--- a/autoload/lsp/lspserver.vim
+++ b/autoload/lsp/lspserver.vim
@@ -92,9 +92,9 @@ def StartServer(lspserver: dict<any>, isSync: bool = false): number
                out_mode: 'raw',
                err_mode: 'raw',
                noblock: 1,
-               out_cb: function('s:Output_cb', [lspserver]),
-               err_cb: function('s:Error_cb', [lspserver]),
-               exit_cb: function('s:Exit_cb', [lspserver])}
+               out_cb: function(Output_cb, [lspserver]),
+               err_cb: function(Error_cb, [lspserver]),
+               exit_cb: function(Exit_cb, [lspserver])}
 
   lspserver.data = ''
   lspserver.caps = {}
@@ -1035,54 +1035,54 @@ export def NewLspServer(path: string, args: list<string>): dict<any>
   }
   # Add the LSP server functions
   lspserver->extend({
-    startServer: function('s:StartServer', [lspserver]),
-    initServer: function('s:InitServer', [lspserver]),
-    stopServer: function('s:StopServer', [lspserver]),
-    shutdownServer: function('s:ShutdownServer', [lspserver]),
-    exitServer: function('s:ExitServer', [lspserver]),
-    setTrace: function('s:SetTrace', [lspserver]),
-    nextReqID: function('s:NextReqID', [lspserver]),
-    createRequest: function('s:CreateRequest', [lspserver]),
-    createResponse: function('s:CreateResponse', [lspserver]),
-    createNotification: function('s:CreateNotification', [lspserver]),
-    sendResponse: function('s:SendResponse', [lspserver]),
-    sendMessage: function('s:SendMessage', [lspserver]),
-    waitForReponse: function('s:WaitForReponse', [lspserver]),
+    startServer: function(StartServer, [lspserver]),
+    initServer: function(InitServer, [lspserver]),
+    stopServer: function(StopServer, [lspserver]),
+    shutdownServer: function(ShutdownServer, [lspserver]),
+    exitServer: function(ExitServer, [lspserver]),
+    setTrace: function(SetTrace, [lspserver]),
+    nextReqID: function(NextReqID, [lspserver]),
+    createRequest: function(CreateRequest, [lspserver]),
+    createResponse: function(CreateResponse, [lspserver]),
+    createNotification: function(CreateNotification, [lspserver]),
+    sendResponse: function(SendResponse, [lspserver]),
+    sendMessage: function(SendMessage, [lspserver]),
+    waitForReponse: function(WaitForReponse, [lspserver]),
     processReply: function(handlers.ProcessReply, [lspserver]),
     processNotif: function(handlers.ProcessNotif, [lspserver]),
     processRequest: function(handlers.ProcessRequest, [lspserver]),
     processMessages: function(handlers.ProcessMessages, [lspserver]),
     getDiagByLine: function(diag.GetDiagByLine, [lspserver]),
-    textdocDidOpen: function('s:TextdocDidOpen', [lspserver]),
-    textdocDidClose: function('s:TextdocDidClose', [lspserver]),
-    textdocDidChange: function('s:TextdocDidChange', [lspserver]),
-    sendInitializedNotif: function('s:SendInitializedNotif', [lspserver]),
-    getCompletion: function('s:GetCompletion', [lspserver]),
-    gotoDefinition: function('s:GotoDefinition', [lspserver]),
-    gotoDeclaration: function('s:GotoDeclaration', [lspserver]),
-    gotoTypeDef: function('s:GotoTypeDef', [lspserver]),
-    gotoImplementation: function('s:GotoImplementation', [lspserver]),
-    showSignature: function('s:ShowSignature', [lspserver]),
-    didSaveFile: function('s:DidSaveFile', [lspserver]),
-    hover: function('s:Hover', [lspserver]),
-    showReferences: function('s:ShowReferences', [lspserver]),
-    docHighlight: function('s:DocHighlight', [lspserver]),
-    getDocSymbols: function('s:GetDocSymbols', [lspserver]),
-    textDocFormat: function('s:TextDocFormat', [lspserver]),
-    prepareCallHierarchy: function('s:PrepareCallHierarchy', [lspserver]),
-    incomingCalls: function('s:IncomingCalls', [lspserver]),
-    outgoingCalls: function('s:OutgoingCalls', [lspserver]),
-    renameSymbol: function('s:RenameSymbol', [lspserver]),
-    codeAction: function('s:CodeAction', [lspserver]),
-    workspaceQuery: function('s:WorkspaceQuerySymbols', [lspserver]),
-    addWorkspaceFolder: function('s:AddWorkspaceFolder', [lspserver]),
-    removeWorkspaceFolder: function('s:RemoveWorkspaceFolder', [lspserver]),
-    selectionRange: function('s:SelectionRange', [lspserver]),
-    selectionExpand: function('s:SelectionExpand', [lspserver]),
-    selectionShrink: function('s:SelectionShrink', [lspserver]),
-    foldRange: function('s:FoldRange', [lspserver]),
-    executeCommand: function('s:ExecuteCommand', [lspserver]),
-    showCapabilities: function('s:ShowCapabilities', [lspserver])
+    textdocDidOpen: function(TextdocDidOpen, [lspserver]),
+    textdocDidClose: function(TextdocDidClose, [lspserver]),
+    textdocDidChange: function(TextdocDidChange, [lspserver]),
+    sendInitializedNotif: function(SendInitializedNotif, [lspserver]),
+    getCompletion: function(GetCompletion, [lspserver]),
+    gotoDefinition: function(GotoDefinition, [lspserver]),
+    gotoDeclaration: function(GotoDeclaration, [lspserver]),
+    gotoTypeDef: function(GotoTypeDef, [lspserver]),
+    gotoImplementation: function(GotoImplementation, [lspserver]),
+    showSignature: function(ShowSignature, [lspserver]),
+    didSaveFile: function(DidSaveFile, [lspserver]),
+    hover: function(Hover, [lspserver]),
+    showReferences: function(ShowReferences, [lspserver]),
+    docHighlight: function(DocHighlight, [lspserver]),
+    getDocSymbols: function(GetDocSymbols, [lspserver]),
+    textDocFormat: function(TextDocFormat, [lspserver]),
+    prepareCallHierarchy: function(PrepareCallHierarchy, [lspserver]),
+    incomingCalls: function(IncomingCalls, [lspserver]),
+    outgoingCalls: function(OutgoingCalls, [lspserver]),
+    renameSymbol: function(RenameSymbol, [lspserver]),
+    codeAction: function(CodeAction, [lspserver]),
+    workspaceQuery: function(WorkspaceQuerySymbols, [lspserver]),
+    addWorkspaceFolder: function(AddWorkspaceFolder, [lspserver]),
+    removeWorkspaceFolder: function(RemoveWorkspaceFolder, [lspserver]),
+    selectionRange: function(SelectionRange, [lspserver]),
+    selectionExpand: function(SelectionExpand, [lspserver]),
+    selectionShrink: function(SelectionShrink, [lspserver]),
+    foldRange: function(FoldRange, [lspserver]),
+    executeCommand: function(ExecuteCommand, [lspserver]),
+    showCapabilities: function(ShowCapabilities, [lspserver])
   })
 
   return lspserver

diff --git a/autoload/lsp/symbol.vim b/autoload/lsp/symbol.vim
index 9f9644583d61abc6f5ebe6db588433e1e27f54e7..66b1ea5e3520e0e4c9befb310041b1556b3f05ad 100644 (file)
--- a/autoload/lsp/symbol.vim
+++ b/autoload/lsp/symbol.vim
@@ -150,8 +150,8 @@ export def ShowSymbolMenu(lspserver: dict<any>, query: string)
       mapping: false,
       fixed: 1,
       close: "button",
-      filter: function('s:FilterSymbols', [lspserver]),
-      callback: function('s:JumpToWorkspaceSymbol')
+      filter: function(FilterSymbols, [lspserver]),
+      callback: JumpToWorkspaceSymbol
   }
   lspserver.workspaceSymbolPopup = popup_menu([], popupAttr)
   lspserver.workspaceSymbolQuery = query