Change domain to feature

diff --git a/autoload/lsp/buffer.vim b/autoload/lsp/buffer.vim
index 455e6920f9ea03f3415e1c9f0f54b66b26b64aea..c717e0d8b77aa2aaa16ddad4037869cadde8b45a 100644 (file)
--- a/autoload/lsp/buffer.vim
+++ b/autoload/lsp/buffer.vim
@@ -47,9 +47,10 @@ var SupportedCheckFns = {
   typeDefinition: (lspserver) => lspserver.isTypeDefinitionProvider,
 }
 
-# Returns the LSP server for the buffer 'bnr' and optionally 'domain'.
+# Returns the LSP server for the buffer "bnr".  If "feature" is specified,
+# then returns the LSP server that provides the "feature".
 # Returns an empty dict if the server is not found.
-export def BufLspServerGet(bnr: number, domain: string = null_string): dict<any>
+export def BufLspServerGet(bnr: number, feature: string = null_string): dict<any>
   if !bufnrToServers->has_key(bnr)
     return {}
   endif
@@ -58,17 +59,17 @@ export def BufLspServerGet(bnr: number, domain: string = null_string): dict<any>
     return {}
   endif
 
-  if domain == null_string
+  if feature == null_string
     return bufnrToServers[bnr][0]
   endif
 
-  if !SupportedCheckFns->has_key(domain)
+  if !SupportedCheckFns->has_key(feature)
     # If this happns it is a programming error, and should be fixed in the source code
-    :throw $'Error: ''{domain}'' is not a valid domain'
+    :throw $'Error: ''{feature}'' is not a valid feature'
     return {}
   endif
 
-  var SupportedCheckFn = SupportedCheckFns[domain]
+  var SupportedCheckFn = SupportedCheckFns[feature]
 
   var possibleLSPs: list<dict<any>> = []
 
@@ -80,21 +81,21 @@ export def BufLspServerGet(bnr: number, domain: string = null_string): dict<any>
     possibleLSPs->add(lspserver)
   endfor
 
-  if possibleLSPs->len() == 0
+  if possibleLSPs->empty()
     return {}
   endif
 
-  # LSP server is configured to be a provider for 'domain'
+  # LSP server is configured to be a provider for 'feature'
   for lspserver in possibleLSPs
-    if lspserver.features->has_key(domain) && lspserver.features[domain]
+    if lspserver.features->has_key(feature) && lspserver.features[feature]
       return lspserver
     endif
   endfor
 
-  # Return the first LSP server that supports 'domain' and doesn't have it
+  # Return the first LSP server that supports "feature" and doesn't have it
   # disabled
   for lspserver in possibleLSPs
-    if !lspserver.features->has_key(domain)
+    if !lspserver.features->has_key(feature)
       return lspserver
     endif
   endfor
@@ -128,10 +129,10 @@ export def BufLspServersGet(bnr: number): list<dict<any>>
   return bufnrToServers[bnr]
 enddef
 
-# Returns the LSP server for the current buffer with the optionally 'domain'.
+# Returns the LSP server for the current buffer with the optionally 'feature'.
 # Returns an empty dict if the server is not found.
-export def CurbufGetServer(domain: string = null_string): dict<any>
-  return BufLspServerGet(bufnr(), domain)
+export def CurbufGetServer(feature: string = null_string): dict<any>
+  return BufLspServerGet(bufnr(), feature)
 enddef
 
 # Returns the LSP servers for the current buffer. Returns an empty list if the
@@ -146,16 +147,16 @@ export def BufHasLspServer(bnr: number): bool
   return !lspserver->empty()
 enddef
 
-# Returns the LSP server for the current buffer with the optinally 'domain' if
+# Returns the LSP server for the current buffer with the optinally 'feature' if
 # it is running and is ready.
 # Returns an empty dict if the server is not found or is not ready.
-export def CurbufGetServerChecked(domain: string = null_string): dict<any>
+export def CurbufGetServerChecked(feature: string = null_string): dict<any>
   var fname: string = @%
   if fname == ''
     return {}
   endif
 
-  var lspserver: dict<any> = CurbufGetServer(domain)
+  var lspserver: dict<any> = CurbufGetServer(feature)
   if lspserver->empty()
     util.ErrMsg($'Language server for "{&filetype}" file type is not found')
     return {}

diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim
index 83ee3900a0f9c2ac719e238d8cc345fb3ef8e7ca..9ef112cd7fbfd6feabb3701344b8617e5da59e18 100644 (file)
--- a/autoload/lsp/lsp.vim
+++ b/autoload/lsp/lsp.vim
@@ -1135,4 +1135,4 @@ export def LspServerCmd(args: string)
   endif
 enddef
 
-# vim: tabstop=8 shiftwidth=2 softtabstop=2
+# vim: tabstop=8 shiftwidth=2 softtabstop=2 noexpandtab

diff --git a/autoload/lsp/lspserver.vim b/autoload/lsp/lspserver.vim
index f37b8b5fede078aacbb7beda9df165905bb51cd4..68e662f6019ad0195d0b5dd1c9b2a3148fc6196a 100644 (file)
--- a/autoload/lsp/lspserver.vim
+++ b/autoload/lsp/lspserver.vim
@@ -39,7 +39,7 @@ enddef
 
 # LSP server exit callback
 def Exit_cb(lspserver: dict<any>, job: job, status: number): void
-  util.WarnMsg($'{strftime("%m/%d/%y %T")}: LSP server exited with status {status}')
+  util.WarnMsg($'{strftime("%m/%d/%y %T")}: LSP server ({lspserver.name}) exited with status {status}')
   lspserver.running = false
   lspserver.ready = false
   lspserver.requests = {}
@@ -49,7 +49,7 @@ enddef
 #
 def StartServer(lspserver: dict<any>, bnr: number): number
   if lspserver.running
-    util.WarnMsg('LSP server for is already running')
+    util.WarnMsg($'LSP server "{lspserver.name}" is already running')
     return 0
   endif
 
@@ -221,7 +221,7 @@ enddef
 # Stop a LSP server
 def StopServer(lspserver: dict<any>): number
   if !lspserver.running
-    util.WarnMsg('LSP server is not running')
+    util.WarnMsg($'LSP server {lspserver.name} is not running')
     return 0
   endif