Drop pygls.lsp.types, use lsprotocol.types directly

openlawlibrary · Aug 20, 2022 · 4ee8edb · 4ee8edb
1 parent 595995f
commit 4ee8edb
Show file tree

Hide file tree

Showing 49 changed files with 98 additions and 117 deletions.
diff --git a/examples/fountain-extension/src/server.py b/examples/fountain-extension/src/server.py
@@ -1,7 +1,7 @@
 import re
 from pygls.server import LanguageServer
-from pygls.lsp.types import TEXT_DOCUMENT_COMPLETION
-from pygls.lsp.types import (CompletionItem, CompletionParams, CompletionList, CompletionOptions)
+from lsprotocol.types import TEXT_DOCUMENT_COMPLETION
+from lsprotocol.types import (CompletionItem, CompletionParams, CompletionList, CompletionOptions)
 
 # The following imports are required for the glue code in 'server.ts'
 import json

diff --git a/examples/json-extension/server/server.py b/examples/json-extension/server/server.py
@@ -22,10 +22,10 @@
 from json import JSONDecodeError
 from typing import Optional
 
-from pygls.lsp.types import (TEXT_DOCUMENT_COMPLETION, TEXT_DOCUMENT_DID_CHANGE,
+from lsprotocol.types import (TEXT_DOCUMENT_COMPLETION, TEXT_DOCUMENT_DID_CHANGE,
                                TEXT_DOCUMENT_DID_CLOSE, TEXT_DOCUMENT_DID_OPEN,
                                TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL)
-from pygls.lsp.types import (CompletionItem, CompletionList, CompletionOptions,
+from lsprotocol.types import (CompletionItem, CompletionList, CompletionOptions,
                              CompletionParams, ConfigurationItem,
                              ConfigurationParams, Diagnostic,
                              DidChangeTextDocumentParams,

diff --git a/examples/json-extension/server/tests/unit/test_features.py b/examples/json-extension/server/tests/unit/test_features.py
@@ -19,7 +19,7 @@
 
 import pytest
 from mock import Mock
-from pygls.lsp.types import (DidCloseTextDocumentParams,
+from lsprotocol.types import (DidCloseTextDocumentParams,
                              DidOpenTextDocumentParams, TextDocumentIdentifier,
                              TextDocumentItem)
 from pygls.workspace import Document, Workspace

diff --git a/pygls/capabilities.py b/pygls/capabilities.py
@@ -17,7 +17,7 @@
 from functools import reduce
 from typing import Any
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_CODE_ACTION, TEXT_DOCUMENT_CODE_LENS,
     TEXT_DOCUMENT_COMPLETION, TEXT_DOCUMENT_DECLARATION,
     TEXT_DOCUMENT_DEFINITION, TEXT_DOCUMENT_DOCUMENT_COLOR,
@@ -38,7 +38,7 @@
     WORKSPACE_SYMBOL, WORKSPACE_WILL_CREATE_FILES,
     WORKSPACE_WILL_DELETE_FILES, WORKSPACE_WILL_RENAME_FILES
 )
-from pygls.lsp.types import (ClientCapabilities, CodeLensOptions, CompletionOptions,
+from lsprotocol.types import (ClientCapabilities, CodeLensOptions, CompletionOptions,
                              DocumentLinkOptions, ExecuteCommandOptions, ImplementationOptions,
                              SaveOptions, SemanticTokensOptions, SemanticTokensRegistrationOptions,
                              SemanticTokensOptionsFullType1, ServerCapabilities,

diff --git a/pygls/lsp/__init__.py b/pygls/lsp/__init__.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and      #
 # limitations under the License.                                           #
 ############################################################################
-from typing import Any, Optional, Union
+from typing import Any, Callable, List, Optional, Union
 
 import attrs
 from lsprotocol.types import (
@@ -24,12 +24,16 @@
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL_DELTA,
     TEXT_DOCUMENT_SEMANTIC_TOKENS_RANGE,
     SemanticTokensLegend,
-    SemanticTokensRegistrationOptions
+    SemanticTokensRegistrationOptions,
+    ShowDocumentResult
 )
 from typeguard import check_type
 
 from pygls.exceptions import MethodTypeNotRegisteredError
 
+ConfigCallbackType = Callable[[List[Any]], None]
+ShowDocumentCallbackType = Callable[[ShowDocumentResult], None]
+
 METHOD_TO_OPTIONS = {
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL:  Union[SemanticTokensLegend, SemanticTokensRegistrationOptions],
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL_DELTA:  Union[SemanticTokensLegend, SemanticTokensRegistrationOptions],

diff --git a/pygls/lsp/types.py b/pygls/lsp/types.py
diff --git a/pygls/progress.py b/pygls/progress.py
@@ -2,9 +2,9 @@
 from concurrent.futures import Future
 from typing import Dict
 
-from pygls.lsp.types import (PROGRESS, WINDOW_WORK_DONE_PROGRESS_CANCEL,
+from lsprotocol.types import (PROGRESS, WINDOW_WORK_DONE_PROGRESS_CANCEL,
                                WINDOW_WORK_DONE_PROGRESS_CREATE)
-from pygls.lsp.types import (ProgressParams, ProgressToken, WorkDoneProgressBegin,
+from lsprotocol.types import (ProgressParams, ProgressToken, WorkDoneProgressBegin,
                              WorkDoneProgressEnd, WorkDoneProgressReport,
                              WorkDoneProgressCancelParams, WorkDoneProgressCreateParams)
 from pygls.protocol import LanguageServerProtocol

diff --git a/pygls/protocol.py b/pygls/protocol.py
@@ -38,9 +38,10 @@
                               MethodTypeNotRegisteredError)
 from pygls.feature_manager import (FeatureManager, assign_help_attrs, get_help_attrs,
                                    is_thread_function)
-from pygls.lsp import (JsonRPCNotification, JsonRPCRequestMessage, JsonRPCResponseMessage,
+from pygls.lsp import (ConfigCallbackType, ShowDocumentCallbackType,
+                       JsonRPCNotification, JsonRPCRequestMessage, JsonRPCResponseMessage,
                        get_method_params_type, get_method_return_type)
-from pygls.lsp.types import (CANCEL_REQUEST, CLIENT_REGISTER_CAPABILITY,
+from lsprotocol.types import (CANCEL_REQUEST, CLIENT_REGISTER_CAPABILITY,
                                CLIENT_UNREGISTER_CAPABILITY, EXIT, INITIALIZE, INITIALIZED,
                                LOG_TRACE, SET_TRACE, SHUTDOWN,
                                TEXT_DOCUMENT_DID_CHANGE, TEXT_DOCUMENT_DID_CLOSE,
@@ -49,14 +50,14 @@
                                WORKSPACE_APPLY_EDIT, WORKSPACE_CONFIGURATION,
                                WORKSPACE_DID_CHANGE_WORKSPACE_FOLDERS, WORKSPACE_EXECUTE_COMMAND,
                                WORKSPACE_SEMANTIC_TOKENS_REFRESH)
-from pygls.lsp.types import (ApplyWorkspaceEditParams,
-                             ConfigurationParams, ConfigCallbackType, Diagnostic,
+from lsprotocol.types import (ApplyWorkspaceEditParams,
+                             ConfigurationParams, Diagnostic,
                              DidChangeTextDocumentParams, DidChangeWorkspaceFoldersParams,
                              DidCloseTextDocumentParams, DidOpenTextDocumentParams,
                              ExecuteCommandParams, InitializeParams, InitializeResult,
                              LogMessageParams, LogTraceParams, MessageType, PublishDiagnosticsParams,
                              RegistrationParams, ResponseErrorMessage, SetTraceParams,
-                             ShowDocumentParams, ShowMessageParams, ShowDocumentCallbackType,
+                             ShowDocumentParams, ShowMessageParams,
                              TraceValues, UnregistrationParams, WorkspaceApplyEditResponse,
                              WorkspaceEdit)
 from pygls.uris import from_fs_path

diff --git a/pygls/server.py b/pygls/server.py
@@ -24,9 +24,10 @@
 from typing import Any, Callable, List, Optional, TypeVar
 
 from pygls import IS_WIN, IS_PYODIDE
-from pygls.lsp.types import (WorkspaceApplyEditResponse, ClientCapabilities, ConfigCallbackType,
+from pygls.lsp import ConfigCallbackType, ShowDocumentCallbackType
+from lsprotocol.types import (WorkspaceApplyEditResponse, ClientCapabilities,
                              ConfigurationParams, Diagnostic, MessageType, RegistrationParams,
-                             ServerCapabilities, ShowDocumentCallbackType, ShowDocumentParams,
+                             ServerCapabilities, ShowDocumentParams,
                              TextDocumentSyncKind, UnregistrationParams,
                              WorkspaceEdit)
 from pygls.progress import Progress

diff --git a/pygls/workspace.py b/pygls/workspace.py
@@ -22,7 +22,7 @@
 import re
 from typing import List, Optional, Pattern
 
-from pygls.lsp.types import (Position, Range, TextDocumentContentChangeEvent,
+from lsprotocol.types import (Position, Range, TextDocumentContentChangeEvent,
                              TextDocumentItem, TextDocumentSyncKind,
                              VersionedTextDocumentIdentifier, WorkspaceFolder)
 from pygls.uris import to_fs_path, uri_scheme

diff --git a/tests/ls_setup.py b/tests/ls_setup.py
@@ -20,7 +20,7 @@
 import threading
 
 import pytest
-from pygls.lsp.types import (
+from lsprotocol.types import (
     EXIT,
     INITIALIZE,
     SHUTDOWN,

diff --git a/tests/lsp/semantic_tokens/test_delta_missing_legend.py b/tests/lsp/semantic_tokens/test_delta_missing_legend.py
@@ -16,10 +16,10 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL_DELTA,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     SemanticTokens,
     SemanticTokensDeltaParams,
     SemanticTokensLegend,

diff --git a/tests/lsp/semantic_tokens/test_delta_missing_legend_none.py b/tests/lsp/semantic_tokens/test_delta_missing_legend_none.py
@@ -16,12 +16,12 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     SemanticTokens,
     SemanticTokensDeltaParams,
     SemanticTokensPartialResult,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL_DELTA,
 )
 

diff --git a/tests/lsp/semantic_tokens/test_full_missing_legend.py b/tests/lsp/semantic_tokens/test_full_missing_legend.py
@@ -16,10 +16,10 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     SemanticTokens,
     SemanticTokensPartialResult,
     SemanticTokensParams

diff --git a/tests/lsp/semantic_tokens/test_range.py b/tests/lsp/semantic_tokens/test_range.py
@@ -16,10 +16,10 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_RANGE,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     Position,
     Range,
     SemanticTokens,

diff --git a/tests/lsp/semantic_tokens/test_range_missing_legends.py b/tests/lsp/semantic_tokens/test_range_missing_legends.py
@@ -16,10 +16,10 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_RANGE,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     SemanticTokens,
     SemanticTokensParams,
     SemanticTokensPartialResult,

diff --git a/tests/lsp/semantic_tokens/test_semantic_tokens_full.py b/tests/lsp/semantic_tokens/test_semantic_tokens_full.py
@@ -16,10 +16,10 @@
 ############################################################################
 from typing import Optional, Union
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     TEXT_DOCUMENT_SEMANTIC_TOKENS_FULL,
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     SemanticTokens,
     SemanticTokensLegend,
     SemanticTokensParams,

diff --git a/tests/lsp/test_call_hierarchy.py b/tests/lsp/test_call_hierarchy.py
@@ -16,12 +16,12 @@
 ############################################################################
 from typing import List, Optional
 
-from pygls.lsp.types import (
+from lsprotocol.types import (
     CALL_HIERARCHY_INCOMING_CALLS,
     CALL_HIERARCHY_OUTGOING_CALLS,
     TEXT_DOCUMENT_PREPARE_CALL_HIERARCHY
 )
-from pygls.lsp.types import (
+from lsprotocol.types import (
     CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams,
     CallHierarchyItem, CallHierarchyOptions, CallHierarchyOutgoingCall,
     CallHierarchyOutgoingCallsParams, CallHierarchyPrepareParams,

diff --git a/tests/lsp/test_code_action.py b/tests/lsp/test_code_action.py
@@ -16,8 +16,8 @@
 ############################################################################
 from typing import List, Optional, Union
 
-from pygls.lsp.types import TEXT_DOCUMENT_CODE_ACTION
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_CODE_ACTION
+from lsprotocol.types import (
     CodeAction,
     CodeActionContext,
     CodeActionKind,

diff --git a/tests/lsp/test_code_lens.py b/tests/lsp/test_code_lens.py
@@ -16,8 +16,8 @@
 ############################################################################
 from typing import List, Optional
 
-from pygls.lsp.types import TEXT_DOCUMENT_CODE_LENS
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_CODE_LENS
+from lsprotocol.types import (
     CodeLens,
     CodeLensOptions,
     CodeLensParams,

diff --git a/tests/lsp/test_color_presentation.py b/tests/lsp/test_color_presentation.py
@@ -17,8 +17,8 @@
 
 from typing import List
 
-from pygls.lsp.types import TEXT_DOCUMENT_COLOR_PRESENTATION
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_COLOR_PRESENTATION
+from lsprotocol.types import (
     Color,
     ColorPresentation,
     ColorPresentationParams,

diff --git a/tests/lsp/test_completion.py b/tests/lsp/test_completion.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and      #
 # limitations under the License.                                           #
 ############################################################################
-from pygls.lsp.types import TEXT_DOCUMENT_COMPLETION
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_COMPLETION
+from lsprotocol.types import (
     CompletionItem,
     CompletionItemKind,
     CompletionList,

diff --git a/tests/lsp/test_declaration.py b/tests/lsp/test_declaration.py
@@ -17,8 +17,8 @@
 
 from typing import List, Optional, Union
 
-from pygls.lsp.types import TEXT_DOCUMENT_DECLARATION
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DECLARATION
+from lsprotocol.types import (
     DeclarationOptions,
     DeclarationParams,
     Location,

diff --git a/tests/lsp/test_definition.py b/tests/lsp/test_definition.py
@@ -17,8 +17,8 @@
 
 from typing import List, Optional, Union
 
-from pygls.lsp.types import TEXT_DOCUMENT_DEFINITION
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DEFINITION
+from lsprotocol.types import (
     DefinitionOptions,
     DefinitionParams,
     Location,

diff --git a/tests/lsp/test_document_color.py b/tests/lsp/test_document_color.py
@@ -17,8 +17,8 @@
 
 from typing import List
 
-from pygls.lsp.types import TEXT_DOCUMENT_DOCUMENT_COLOR
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DOCUMENT_COLOR
+from lsprotocol.types import (
     Color,
     ColorInformation,
     DocumentColorOptions,

diff --git a/tests/lsp/test_document_highlight.py b/tests/lsp/test_document_highlight.py
@@ -17,8 +17,8 @@
 
 from typing import List, Optional
 
-from pygls.lsp.types import TEXT_DOCUMENT_DOCUMENT_HIGHLIGHT
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DOCUMENT_HIGHLIGHT
+from lsprotocol.types import (
     DocumentHighlight,
     DocumentHighlightKind,
     DocumentHighlightOptions,

diff --git a/tests/lsp/test_document_link.py b/tests/lsp/test_document_link.py
@@ -17,8 +17,8 @@
 
 from typing import List, Optional
 
-from pygls.lsp.types import TEXT_DOCUMENT_DOCUMENT_LINK
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DOCUMENT_LINK
+from lsprotocol.types import (
     DocumentLink,
     DocumentLinkOptions,
     DocumentLinkParams,

diff --git a/tests/lsp/test_document_symbol.py b/tests/lsp/test_document_symbol.py
@@ -17,8 +17,8 @@
 
 from typing import List, Union
 
-from pygls.lsp.types import TEXT_DOCUMENT_DOCUMENT_SYMBOL
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_DOCUMENT_SYMBOL
+from lsprotocol.types import (
     DocumentSymbol,
     DocumentSymbolOptions,
     DocumentSymbolParams,

diff --git a/tests/lsp/test_folding_range.py b/tests/lsp/test_folding_range.py
@@ -17,8 +17,8 @@
 
 from typing import List, Optional
 
-from pygls.lsp.types import TEXT_DOCUMENT_FOLDING_RANGE
-from pygls.lsp.types import (
+from lsprotocol.types import TEXT_DOCUMENT_FOLDING_RANGE
+from lsprotocol.types import (
     FoldingRange,
     FoldingRangeKind,
     FoldingRangeOptions,