From 4f573035e7f2b8b941a36145f5e305c0a2a9ed13 Mon Sep 17 00:00:00 2001 From: Janos Wortmann Date: Thu, 25 Apr 2024 11:13:40 +0200 Subject: [PATCH] Resolve more merge conflicts --- plugin/core/settings.py | 2 +- plugin/session_view.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/core/settings.py b/plugin/core/settings.py index 692ef310e..4a68a518d 100644 --- a/plugin/core/settings.py +++ b/plugin/core/settings.py @@ -119,7 +119,7 @@ def disable(self, config_name: str) -> None: def set_listeners( self, - clients_listener: Callable[[str | None], None] + clients_listener: Callable[[str | None], None], userprefs_listener: Callable[[], None] ) -> None: self._clients_listener = clients_listener diff --git a/plugin/session_view.py b/plugin/session_view.py index c07f856f9..4c03c604b 100644 --- a/plugin/session_view.py +++ b/plugin/session_view.py @@ -56,7 +56,7 @@ class SessionView: def __init__(self, listener: AbstractViewListener, session: Session, uri: DocumentUri) -> None: self._view = listener.view self._session = session - self._diagnostics_data_per_severity = {} # type: Dict[Tuple[int, bool], DiagnosticSeverityData] + self._diagnostics_data_per_severity: dict[tuple[int, bool], DiagnosticSeverityData] = {} self._diagnostic_annotations = DiagnosticsAnnotationsView(self._view, session.config.name) self._initialize_region_keys() self._active_requests: dict[int, ActiveRequest] = {}