Align to breaking changes

Nothing too interesting in this one, just updating imports, class names etc to align `pygls` to the definitions in `lsprotocol`
openlawlibrary · Oct 13, 2022 · 9e86598 · 9e86598
1 parent bb62d95
commit 9e86598
Show file tree

Hide file tree

Showing 50 changed files with 826 additions and 792 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.methods import 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
@@ -12,7 +12,7 @@
 
 CHARACTER = re.compile(r"^[A-Z][A-Z ]+$", re.MULTILINE)
 
-@server.feature(COMPLETION, CompletionOptions(trigger_characters=['.']))
+@server.feature(TEXT_DOCUMENT_COMPLETION, CompletionOptions(trigger_characters=['.']))
 def on_completion(ls: LanguageServer, params: CompletionParams) -> CompletionList:
     """Completion suggestions for character names."""
 

diff --git a/examples/json-extension/server/__main__.py b/examples/json-extension/server/__main__.py
@@ -17,7 +17,7 @@
 import argparse
 import logging
 
-from .server import json_server
+from server import json_server
 
 logging.basicConfig(filename="pygls.log", level=logging.DEBUG, filemode="w")
 

diff --git a/examples/json-extension/server/server.py b/examples/json-extension/server/server.py
@@ -22,21 +22,20 @@
 from json import JSONDecodeError
 from typing import Optional
 
-from pygls.lsp.methods import (COMPLETION, TEXT_DOCUMENT_DID_CHANGE,
-                               TEXT_DOCUMENT_DID_CLOSE, TEXT_DOCUMENT_DID_OPEN, 
+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,
                              DidCloseTextDocumentParams,
                              DidOpenTextDocumentParams, MessageType, Position,
                              Range, Registration, RegistrationParams,
                              SemanticTokens, SemanticTokensLegend, SemanticTokensParams,
-                             Unregistration, UnregistrationParams)
-from pygls.lsp.types.basic_structures import (WorkDoneProgressBegin,
-                                              WorkDoneProgressEnd,
-                                              WorkDoneProgressReport)
+                             Unregistration, UnregistrationParams,
+                             WorkDoneProgressBegin, WorkDoneProgressEnd,
+                             WorkDoneProgressReport)
 from pygls.server import LanguageServer
 
 COUNT_DOWN_START_IN_SECONDS = 10
@@ -98,7 +97,7 @@ def _validate_json(source):
     return diagnostics
 
 
-@json_server.feature(COMPLETION, CompletionOptions(trigger_characters=[',']))
+@json_server.feature(TEXT_DOCUMENT_COMPLETION, CompletionOptions(trigger_characters=[',']))
 def completions(params: Optional[CompletionParams] = None) -> CompletionList:
     """Returns completion items."""
     return CompletionList(
@@ -164,9 +163,9 @@ async def did_open(ls, params: DidOpenTextDocumentParams):
 def semantic_tokens(ls: JsonLanguageServer, params: SemanticTokensParams):
     """See https://microsoft.github.io/language-server-protocol/specification#textDocument_semanticTokens
     for details on how semantic tokens are encoded."""
-    
+
     TOKENS = re.compile('".*"(?=:)')
-    
+
     uri = params.text_document.uri
     doc = ls.workspace.get_document(uri)
 
@@ -184,7 +183,7 @@ def semantic_tokens(ls: JsonLanguageServer, params: SemanticTokensParams):
                 (lineno - last_line),
                 (start - last_start),
                 (end - start),
-                0, 
+                0,
                 0
             ]
 
@@ -220,7 +219,7 @@ async def register_completions(ls: JsonLanguageServer, *args):
     params = RegistrationParams(registrations=[
                 Registration(
                     id=str(uuid.uuid4()),
-                    method=COMPLETION,
+                    method=TEXT_DOCUMENT_COMPLETION,
                     register_options={"triggerCharacters": "[':']"})
              ])
     response = await ls.register_capability_async(params)
@@ -292,7 +291,7 @@ def show_configuration_thread(ls: JsonLanguageServer, *args):
 async def unregister_completions(ls: JsonLanguageServer, *args):
     """Unregister completions method on the client."""
     params = UnregistrationParams(unregisterations=[
-        Unregistration(id=str(uuid.uuid4()), method=COMPLETION)
+        Unregistration(id=str(uuid.uuid4()), method=TEXT_DOCUMENT_COMPLETION)
     ])
     response = await ls.unregister_capability_async(params)
     if response is None:

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