Merge pull request #89 from perrinjerome/fix/decorator_types

server: more specific types for decorators

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning][semver].
 
 ## [Unreleased]
 
+### Changed
+
+- Fixed `@command`, `@feature` and `@thread` decorators to retain type of wrapped functions ([#89])
+
+[#89]: https://github.com/openlawlibrary/pygls/pull/89
+
 ### Added
 
 - Add comparisons and repr support to Range and Location types ([#90])

pygls/server.py

@@ -21,7 +21,7 @@
 from concurrent.futures import Future, ThreadPoolExecutor
 from multiprocessing.pool import ThreadPool
 from threading import Event
-from typing import Callable, Dict, List
+from typing import Callable, Dict, List, TypeVar
 
 from pygls.types import (ApplyWorkspaceEditResponse, ConfigCallbackType, Diagnostic, MessageType,
                          RegistrationParams, TextDocumentSyncKind, UnregistrationParams,
@@ -34,6 +34,8 @@
 
 logger = logging.getLogger(__name__)
 
+F = TypeVar('F', bound=Callable)
+
 
 async def aio_readline(loop, executor, stop_event, rfile, proxy):
     """Reads data from stdin in separate thread (asynchronously)."""
@@ -234,7 +236,7 @@ def apply_edit(self, edit: WorkspaceEdit, label: str = None) -> ApplyWorkspaceEd
         """Sends apply edit request to the client."""
         return self.lsp.apply_edit(edit, label)
 
-    def command(self, command_name: str) -> Callable:
+    def command(self, command_name: str) -> Callable[[F], F]:
         """Decorator used to register custom commands.
 
         Example:
@@ -244,7 +246,7 @@ def my_cmd(ls, a, b, c):
         """
         return self.lsp.fm.command(command_name)
 
-    def feature(self, feature_name: str, **options: Dict) -> Callable:
+    def feature(self, feature_name: str, **options: Dict) -> Callable[[F], F]:
         """Decorator used to register LSP features.
 
         Example:
@@ -287,7 +289,7 @@ def show_message_log(self, message, msg_type=MessageType.Log) -> None:
         """Sends message to the client's output channel."""
         self.lsp.show_message_log(message, msg_type)
 
-    def thread(self) -> Callable:
+    def thread(self) -> Callable[[F], F]:
         """Decorator that mark function to execute it in a thread."""
         return self.lsp.thread()