moved notification logging functions to a separate file to avoid circ…

…ular imports

plugin/code_actions.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from .core.logging import notify_error
+from .core.logging_notify import notify_error
 from .core.promise import Promise
 from .core.protocol import CodeAction
 from .core.protocol import CodeActionKind

plugin/core/logging.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Any, Optional
+from typing import Any
 import traceback
 import inspect
 import sublime
@@ -39,31 +39,3 @@ def exception_log(message: str, ex: Exception) -> None:
 def printf(*args: Any, prefix: str = 'LSP') -> None:
     """Print args to the console, prefixed by the plugin name."""
     print(prefix + ":", *args)
-
-
-def notify(window: sublime.Window | None, message: str, status_message: str = 'LSP: see console log…') -> None:
-    """Pick either of the 2 ways to show a user notification message:
-      - via a detailed console message and a short status message
-      - via a blocking modal dialog"""
-    from .settings import userprefs
-    if not window:
-        return
-    if userprefs().suppress_error_dialogs:
-        window.status_message(status_message)
-        print(message)
-    else:
-        sublime.message_dialog(message)
-
-
-def notify_error(window: sublime.Window | None, message: str, status_message: str = '❗LSP: see console log…') -> None:
-    """Pick either of the 2 ways to show a user error notification message:
-      - via a detailed console message and a short status message
-      - via a blocking error modal dialog"""
-    from .settings import userprefs
-    if not window:
-        return
-    if userprefs().suppress_error_dialogs:
-        window.status_message(status_message)
-        print(message)
-    else:
-        sublime.error_message(message)

plugin/core/logging_notify.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+import sublime
+from .settings import userprefs
+
+
+def notify(window: sublime.Window | None, message: str, status_message: str = 'LSP: see console log…') -> None:
+    """Pick either of the 2 ways to show a user notification message:
+      - via a detailed console message and a short status message
+      - via a blocking modal dialog"""
+    if not window:
+        return
+    if userprefs().suppress_error_dialogs:
+        window.status_message(status_message)
+        print(message)
+    else:
+        sublime.message_dialog(message)
+
+
+def notify_error(window: sublime.Window | None, message: str, status_message: str = '❗LSP: see console log…') -> None:
+    """Pick either of the 2 ways to show a user error notification message:
+      - via a detailed console message and a short status message
+      - via a blocking error modal dialog"""
+    from .settings import userprefs
+    if not window:
+        return
+    if userprefs().suppress_error_dialogs:
+        window.status_message(status_message)
+        print(message)
+    else:
+        sublime.error_message(message)

plugin/core/windows.py

@@ -7,7 +7,7 @@
 from .diagnostics_storage import is_severity_included
 from .logging import debug
 from .logging import exception_log
-from .logging import notify
+from .logging_notify import notify
 from .message_request_handler import MessageRequestHandler
 from .panels import LOG_LINES_LIMIT_SETTING_NAME
 from .panels import MAX_LOG_LINES_LIMIT_OFF

plugin/core/workspace.py

@@ -4,7 +4,7 @@
 from .types import matches_pattern
 from .types import sublime_pattern_to_glob
 from .url import filename_to_uri
-from .logging import notify
+from .logging_notify import notify
 from typing import Any
 import sublime
 import os

plugin/execute_command.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from .core.logging import notify
+from .core.logging_notify import notify
 from .core.protocol import Error
 from .core.protocol import ExecuteCommandParams
 from .core.registry import LspTextCommand

plugin/rename.py

@@ -2,7 +2,7 @@
 from .core.edit import parse_range
 from .core.edit import parse_workspace_edit
 from .core.edit import WorkspaceChanges
-from .core.logging import notify_error
+from .core.logging_notify import notify_error
 from .core.protocol import PrepareRenameParams
 from .core.protocol import PrepareRenameResult
 from .core.protocol import Range

plugin/tooling.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 from .core.css import css
 from .core.logging import debug
-from .core.logging import notify
-from .core.logging import notify_error
+from .core.logging_notify import notify
+from .core.logging_notify import notify_error
 from .core.registry import windows
 from .core.sessions import get_plugin
 from .core.transports import create_transport