Implemented is_enabled() on all derived classes.

plugin/code_actions.py

@@ -19,6 +19,9 @@ class LspCodeActionsCommand(LspTextCommand):
     def __init__(self, view):
         super().__init__(view, 'codeActionProvider')
 
+    def is_enabled(self):
+        return self.has_client_with_capability()
+
     def run(self, edit, event=None):
         client = client_for_view(self.view)
         if client:

plugin/core/clients.py

@@ -37,21 +37,19 @@ def __init__(self, state=ClientStates.STARTING, client=None):
 
 
 class LspTextCommand(TextCommand):
-    def __init__(self, view, capability='', last_check=lambda: True):
+    def __init__(self, view, capability=''):
         super().__init__(view)
         self.capability = capability
-        self.last_check = last_check
 
     def is_visible(self):
         return is_supported_view(self.view)
 
-    def is_enabled(self):
+    def has_client_with_capability(self):
         client = client_for_view(self.view)
         if client and client.has_capability(self.capability):
-            return self.last_check()
+            return True
         return False
 
-
 def window_configs(window: sublime.Window) -> 'Dict[str, ConfigState]':
     if window.id() in clients_by_window:
         return clients_by_window[window.id()]

plugin/definition.py

@@ -12,6 +12,9 @@ class LspSymbolDefinitionCommand(LspTextCommand):
     def __init__(self, view):
         super().__init__(view, 'definitionProvider')
 
+    def is_enabled(self):
+        return self.has_client_with_capability()
+
     def run(self, edit, event=None):
         client = client_for_view(self.view)
         if client:

plugin/formatting.py

@@ -9,6 +9,9 @@ class LspFormatDocumentCommand(LspTextCommand):
     def __init__(self, view):
         super().__init__(view, 'documentFormattingProvider')
 
+    def is_enabled(self):
+        return self.has_client_with_capability()
+
     def run(self, edit):
         client = client_for_view(self.view)
         if client:
@@ -33,13 +36,15 @@ def handle_response(self, response, pos):
 
 class LspFormatDocumentRangeCommand(LspTextCommand):
     def __init__(self, view):
-        def last_check():
+        super().__init__(view, 'documentRangeFormattingProvider')
+
+    def is_enabled(self):
+        if self.has_client_with_capability():
             if len(self.view.sel()) == 1:
                 region = self.view.sel()[0]
                 if region.begin() != region.end():
                     return True
-            return False
-        super().__init__(view, 'documentRangeFormattingProvider', last_check)
+        return False
 
     def run(self, _):
         client = client_for_view(self.view)

plugin/hover.py

@@ -3,9 +3,9 @@
 import sublime_plugin
 import webbrowser
 
-from .core.configurations import is_supported_syntax, is_supported_view
+from .core.configurations import is_supported_syntax
 from .core.diagnostics import get_point_diagnostics
-from .core.clients import client_for_view
+from .core.clients import LspTextCommand
 from .core.protocol import Request
 from .core.documents import get_document_position
 from .core.popups import popup_css, popup_class
@@ -29,14 +29,13 @@ def on_hover(self, point, hover_zone):
         self.view.run_command("lsp_hover", {"point": point})
 
 
-class LspHoverCommand(sublime_plugin.TextCommand):
+class LspHoverCommand(LspTextCommand):
+    def __init__(self, view):
+        super().__init__(view, 'definitionProvider')
+
     def is_enabled(self):
         # TODO: check what kind of scope we're in.
-        if is_supported_view(self.view):
-            client = client_for_view(self.view)
-            if client:
-                return client.has_capability('hoverProvider')
-        return False
+        return self.has_client_with_capability()
 
     def run(self, edit, point=None):
         if point is None:

plugin/references.py

@@ -30,7 +30,12 @@ def create_references_panel(window: sublime.Window):
 
 class LspSymbolReferencesCommand(LspTextCommand):
     def __init__(self, view):
-        super().__init__(view, 'referencesProvider', lambda: is_at_word(view, None))
+        super().__init__(view, 'referencesProvider')
+
+    def is_enabled(self):
+        if self.has_client_with_capability():
+            return is_at_word(self.view, None)
+        return False
 
     def run(self, edit, event=None):
         client = client_for_view(self.view)

plugin/rename.py

@@ -7,8 +7,13 @@
 
 class LspSymbolRenameCommand(LspTextCommand):
     def __init__(self, view):
+        super().__init__(view, 'renameProvider')
+
+    def is_enabled(self):
         # TODO: check what kind of scope we're in.
-        super().__init__(view, 'renameProvider', lambda: is_at_word(view, None))
+        if self.has_client_with_capability():
+            return is_at_word(self.view, None)
+        return False
 
     def run(self, edit, event=None):
         pos = get_position(self.view, event)

plugin/symbols.py

@@ -40,6 +40,9 @@ class LspDocumentSymbolsCommand(LspTextCommand):
     def __init__(self, view):
         super().__init__(view, 'documentSymbolProvider')
 
+    def is_enabled(self):
+        self.has_client_with_capability()
+
     def run(self, edit):
         client = client_for_view(self.view)
         if client: