|
1 | 1 | from __future__ import annotations |
2 | | -from typing import Any |
| 2 | +from typing import Any, Optional |
3 | 3 | import traceback |
4 | 4 | import inspect |
5 | 5 | import sublime |
@@ -41,25 +41,33 @@ def printf(*args: Any, prefix: str = 'LSP') -> None: |
41 | 41 | print(prefix + ":", *args) |
42 | 42 |
|
43 | 43 |
|
44 | | -def notify(window: sublime.Window, message: str, status: str = 'LSP: see console log…') -> None: |
45 | | - """Pick either of the 2 ways to show a message: |
46 | | - - via a blocking modal dialog |
47 | | - - via a detailed console message and a short status message""" |
| 44 | +def notify(window: Optional[sublime.Window], message: str, |
| 45 | + status: str = 'LSP: see console log…') -> None: |
| 46 | + """Pick either of the 2 ways to show a user notification message: |
| 47 | + - via a detailed console message and a short status message |
| 48 | + - via a blocking modal dialog""" |
48 | 49 | from .settings import userprefs |
49 | 50 | if userprefs().suppress_error_dialogs: |
50 | | - window.status_message(status) |
51 | | - print(message) |
| 51 | + if window: |
| 52 | + window.status_message(status) # print short message to statusbar |
| 53 | + else: |
| 54 | + sublime.status_message(status) |
| 55 | + print(message) # print full message to console log |
52 | 56 | else: |
53 | | - window.message_dialog(message) |
| 57 | + sublime.message_dialog(message) |
54 | 58 |
|
55 | 59 |
|
56 | | -def notify_error(window: sublime.Window, message: str, status: str = '❗LSP: see console log…') -> None: |
57 | | - """Pick either of the 2 ways to show a message: |
58 | | - - via a blocking modal dialog |
59 | | - - via a detailed console message and a short status message""" |
| 60 | +def notify_error(window: Optional[sublime.Window], message: str, |
| 61 | + status: str = '❗LSP: see console log…') -> None: |
| 62 | + """Pick either of the 2 ways to show a user error notification message: |
| 63 | + - via a detailed console message and a short status message |
| 64 | + - via a blocking error modal dialog""" |
60 | 65 | from .settings import userprefs |
61 | 66 | if userprefs().suppress_error_dialogs: |
62 | | - window.status_message(status) |
63 | | - print(message) |
| 67 | + if window: |
| 68 | + window.status_message(status) # print short message to statusbar |
| 69 | + else: |
| 70 | + sublime.status_message(status) |
| 71 | + print(message) # print full message to console log |
64 | 72 | else: |
65 | 73 | sublime.error_message(message) |
0 commit comments