Skip to content

Commit ca0e088

Browse files
committed
Import __future__ annotations
This commit... 1. adds `from __future__ import annotations` to each relevant module in order to enable language level type annotation support. 2. as a result most quotation marks can be removed from type annotations.
1 parent c5321ad commit ca0e088

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+159
-77
lines changed

boot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
import os
23
import sublime
34
import sublime_plugin

plugin/code_actions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .core.promise import Promise
23
from .core.protocol import CodeAction
34
from .core.protocol import CodeActionKind

plugin/code_lens.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .core.constants import CODE_LENS_ENABLED_KEY
23
from .core.protocol import CodeLens
34
from .core.protocol import CodeLensExtended

plugin/color.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .core.edit import apply_text_edits
23
from .core.protocol import ColorInformation
34
from .core.protocol import ColorPresentation

plugin/completion.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .core.constants import COMPLETION_KINDS
23
from .core.edit import apply_text_edits
34
from .core.logging import debug
@@ -26,7 +27,7 @@
2627
from .core.views import show_lsp_popup
2728
from .core.views import text_document_position_params
2829
from .core.views import update_lsp_popup
29-
from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Union
30+
from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, TypeAlias, Union
3031
from typing import cast
3132
from typing_extensions import TypeGuard
3233
import functools
@@ -35,10 +36,10 @@
3536
import weakref
3637
import webbrowser
3738

38-
SessionName = str
39-
CompletionResponse = Union[List[CompletionItem], CompletionList, None]
40-
ResolvedCompletions = Tuple[Union[CompletionResponse, Error], 'weakref.ref[Session]']
41-
CompletionsStore = Tuple[List[CompletionItem], CompletionItemDefaults]
39+
SessionName: TypeAlias = str
40+
CompletionResponse: TypeAlias = Union[List[CompletionItem], CompletionList, None]
41+
ResolvedCompletions: TypeAlias = Tuple[Union[CompletionResponse, Error], 'weakref.ref[Session]']
42+
CompletionsStore: TypeAlias = Tuple[List[CompletionItem], CompletionItemDefaults]
4243

4344

4445
def format_completion(
@@ -199,7 +200,7 @@ def _create_completion_request_async(self, session: Session) -> Promise[Resolved
199200
return promise.then(lambda response: self._on_completion_response_async(response, request_id, weak_session))
200201

201202
def _on_completion_response_async(
202-
self, response: CompletionResponse, request_id: int, weak_session: 'weakref.ref[Session]'
203+
self, response: CompletionResponse, request_id: int, weak_session: weakref.ref[Session]
203204
) -> ResolvedCompletions:
204205
self._pending_completion_requests.pop(request_id, None)
205206
return (response, weak_session)

plugin/configuration.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .core.registry import windows
23
from .core.settings import client_configs
34
from .core.windows import WindowManager

plugin/core/active_request.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .sessions import SessionViewProtocol
23
from .progress import ProgressReporter
34
from .progress import ViewProgressReporter

plugin/core/collections.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Module with additional collections.
33
"""
4+
from __future__ import annotations
45
from copy import deepcopy
56
from typing import Any, Dict, Generator, Optional
67
import sublime

plugin/core/configurations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .logging import debug
23
from .logging import exception_log
34
from .logging import printf

plugin/core/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from .protocol import CodeActionKind
23
from .protocol import CompletionItemKind
34
from .protocol import DiagnosticSeverity

0 commit comments

Comments
 (0)