feat(lsp): improve shutdown lifecycle and response handling
- Add explicit shutdown and exit requests to LSP client - Rename initialized message to initialized notification - Handle initialize → send initialized notification - Handle shutdown → send exit notification fix(lsp): delay client teardown to allow graceful shutdown - Close LSP client and response handlers after timeout (GLib) feat(vte): major terminal widget improvements - Switch to spawn_async with full environment inheritance - Improve PROMPT_COMMAND handling for cwd tracking (OSC7) - Enable scrollback, disable audible bell, enable scroll-on-output - Add clipboard shortcuts (Ctrl+Shift+C/V), middle-click paste - Track current directory changes and update UI label - Add proper signal wiring and cleanup on destroy feat(ui): improve Plugins dialog behavior - Make dialog non-modal and centered on parent window - Auto-hide on focus loss and Ctrl+Shift+P shortcut - Ensure proper destroy-with-parent behavior refactor: add type hints and minor cleanup - Add explicit typing for VteWidget fields - Improve signal naming consistency - Minor formatting and cleanup in folding and LSP modules
This commit is contained in:
@@ -15,6 +15,8 @@ from ..dto.code.lsp.lsp_messages import definition_request
|
|||||||
from ..dto.code.lsp.lsp_messages import implementation_request
|
from ..dto.code.lsp.lsp_messages import implementation_request
|
||||||
from ..dto.code.lsp.lsp_messages import references_request
|
from ..dto.code.lsp.lsp_messages import references_request
|
||||||
from ..dto.code.lsp.lsp_messages import symbols_request
|
from ..dto.code.lsp.lsp_messages import symbols_request
|
||||||
|
from ..dto.code.lsp.lsp_messages import shutdown_request
|
||||||
|
from ..dto.code.lsp.lsp_messages import exit_request
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -36,9 +38,15 @@ class LSPClientEvents:
|
|||||||
self._init_params["initializationOptions"] = self._init_opts
|
self._init_params["initializationOptions"] = self._init_opts
|
||||||
self.send_request("initialize", self._init_params)
|
self.send_request("initialize", self._init_params)
|
||||||
|
|
||||||
def send_initialized_message(self):
|
def send_initialized_notification(self):
|
||||||
self.send_notification("initialized")
|
self.send_notification("initialized")
|
||||||
|
|
||||||
|
def send_shutdown_request(self):
|
||||||
|
self.send_request("shutdown")
|
||||||
|
|
||||||
|
def send_exit_notification(self):
|
||||||
|
self.send_notification("exit")
|
||||||
|
|
||||||
def _lsp_did_open(self, data: dict):
|
def _lsp_did_open(self, data: dict):
|
||||||
method = "textDocument/didOpen"
|
method = "textDocument/didOpen"
|
||||||
params = didopen_notification["params"]
|
params = didopen_notification["params"]
|
||||||
|
|||||||
@@ -183,7 +183,6 @@ references_request = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
symbols_request = {
|
symbols_request = {
|
||||||
"method": "textDocument/documentSymbol",
|
"method": "textDocument/documentSymbol",
|
||||||
"params": {
|
"params": {
|
||||||
@@ -195,3 +194,14 @@ symbols_request = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shutdown_request = {
|
||||||
|
"method": "shutdown",
|
||||||
|
"params": None
|
||||||
|
}
|
||||||
|
|
||||||
|
exit_request = {
|
||||||
|
"method": "exit",
|
||||||
|
"params": None
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
# Python imports
|
# Python imports
|
||||||
|
|
||||||
# Lib imports
|
# Lib imports
|
||||||
|
import gi
|
||||||
|
|
||||||
|
from gi.repository import GLib
|
||||||
|
|
||||||
# Application imports
|
# Application imports
|
||||||
from libs.controllers.controller_base import ControllerBase
|
from libs.controllers.controller_base import ControllerBase
|
||||||
@@ -109,9 +112,17 @@ class LSPManager(ControllerBase):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def close_client(self, lang_id: str) -> bool:
|
def close_client(self, lang_id: str) -> bool:
|
||||||
|
controller = self.client_manager.get_active_client()
|
||||||
|
controller.send_shutdown_request()
|
||||||
|
|
||||||
|
def _close():
|
||||||
self.client_manager.close_client(lang_id)
|
self.client_manager.close_client(lang_id)
|
||||||
self.response_registry.close_handler(lang_id)
|
self.response_registry.close_handler(lang_id)
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
GLib.timeout_add(5000, _close)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def server_response(self, lsp_response: LSPResponseTypes | dict):
|
def server_response(self, lsp_response: LSPResponseTypes | dict):
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ class DefaultHandler(BaseHandler):
|
|||||||
|
|
||||||
def handle(self, method: str, response, controller):
|
def handle(self, method: str, response, controller):
|
||||||
match method:
|
match method:
|
||||||
|
case "initialize":
|
||||||
|
controller.send_initialized_notification()
|
||||||
|
case "shutdown":
|
||||||
|
controller.send_exit_notification()
|
||||||
case "textDocument/completion":
|
case "textDocument/completion":
|
||||||
self._handle_completion(response)
|
self._handle_completion(response)
|
||||||
case "textDocument/definition":
|
case "textDocument/definition":
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ class VteWidget(Vte.Terminal):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(VteWidget, self).__init__()
|
super(VteWidget, self).__init__()
|
||||||
|
|
||||||
self.cd_cmd_prefix = ("cd".encode(), "cd ".encode())
|
self.cd_cmd_prefix: tuple = ("cd".encode(), "cd ".encode())
|
||||||
self.dont_process = False
|
self.dont_process: bool = False
|
||||||
|
|
||||||
self._setup_styling()
|
self._setup_styling()
|
||||||
self._setup_signals()
|
self._setup_signals()
|
||||||
@@ -48,9 +48,17 @@ class VteWidget(Vte.Terminal):
|
|||||||
self.set_hexpand(True)
|
self.set_hexpand(True)
|
||||||
self.set_enable_sixel(True)
|
self.set_enable_sixel(True)
|
||||||
self.set_cursor_shape( Vte.CursorShape.IBEAM )
|
self.set_cursor_shape( Vte.CursorShape.IBEAM )
|
||||||
|
self.set_audible_bell(False)
|
||||||
|
self.set_scroll_on_output(True)
|
||||||
|
|
||||||
def _setup_signals(self):
|
def _setup_signals(self):
|
||||||
self.connect("commit", self._commit)
|
self.connect("commit", self._handle_commit)
|
||||||
|
self.connect("current-directory-uri-changed", self._handle_path_change)
|
||||||
|
self.connect("selection-changed", self._handle_selection)
|
||||||
|
self.connect("button-press-event", self._on_button_press)
|
||||||
|
self.connect("key-press-event", self._on_key_press)
|
||||||
|
self.connect("key-release-event", self._on_key_release)
|
||||||
|
self.connect("destroy", self._handle_destroy)
|
||||||
|
|
||||||
def _subscribe_to_events(self):
|
def _subscribe_to_events(self):
|
||||||
event_system.subscribe("update_term_path", self.update_term_path)
|
event_system.subscribe("update_term_path", self.update_term_path)
|
||||||
@@ -59,35 +67,87 @@ class VteWidget(Vte.Terminal):
|
|||||||
...
|
...
|
||||||
|
|
||||||
def _do_session_spawn(self):
|
def _do_session_spawn(self):
|
||||||
env = [
|
env_dict = os.environ.copy()
|
||||||
"DISPLAY=:0",
|
existing_pc = env_dict.get("PROMPT_COMMAND", "")
|
||||||
"LC_ALL=C",
|
# Note: Needed for 'current-directory-uri-changed' to work.
|
||||||
"TERM='xterm-256color'",
|
# Make sure user .bashrc doesn't affect it...
|
||||||
f"HOME='{settings_manager.path_manager.get_home_path()}'",
|
osc7 = 'printf "\\033]7;file://%s%s\\007" "$PWD"'
|
||||||
"XDG_RUNTIME_DIR='/run/user/1000'",
|
|
||||||
f"XAUTHORITY='{settings_manager.path_manager.get_home_path()}/.Xauthority'",
|
|
||||||
"HISTFILE=/dev/null",
|
|
||||||
"HISTSIZE=0",
|
|
||||||
"HISTFILESIZE=0",
|
|
||||||
"PS1=\\h@\\u \\W -->: ",
|
|
||||||
]
|
|
||||||
|
|
||||||
self.spawn_sync(
|
env_dict.update({
|
||||||
|
"LC_ALL": "C",
|
||||||
|
"TERM": "xterm-256color",
|
||||||
|
"HISTFILE": "/dev/null",
|
||||||
|
"HISTSIZE": "0",
|
||||||
|
"HISTFILESIZE": "0",
|
||||||
|
"PS1": "\\h@\\u \\W -->: ",
|
||||||
|
"PROMPT_COMMAND": f"{osc7};{existing_pc}" if existing_pc else osc7,
|
||||||
|
})
|
||||||
|
|
||||||
|
env = [f"{k}={v}" for k, v in env_dict.items()]
|
||||||
|
|
||||||
|
self.spawn_async(
|
||||||
Vte.PtyFlags.DEFAULT,
|
Vte.PtyFlags.DEFAULT,
|
||||||
settings_manager.path_manager.get_home_path(),
|
settings_manager.path_manager.get_home_path(),
|
||||||
["/bin/bash"],
|
["/bin/bash"],
|
||||||
env,
|
env,
|
||||||
GLib.SpawnFlags.DEFAULT,
|
GLib.SpawnFlags.DEFAULT,
|
||||||
None, None,
|
None, None, -1, None, None,
|
||||||
)
|
)
|
||||||
|
|
||||||
startup_cmds = [
|
startup_cmds = [
|
||||||
]
|
]
|
||||||
|
|
||||||
|
self.set_scrollback_lines(15000)
|
||||||
for i in startup_cmds:
|
for i in startup_cmds:
|
||||||
self.run_command(i)
|
self.run_command(i)
|
||||||
|
|
||||||
def _commit(self, terminal, text, size):
|
def _handle_destroy(self, terminal):
|
||||||
|
logger.debug("Destroying terminal...")
|
||||||
|
terminal.disconnect_by_func(terminal._handle_commit)
|
||||||
|
terminal.disconnect_by_func(terminal._handle_path_change)
|
||||||
|
terminal.disconnect_by_func(terminal._handle_selection)
|
||||||
|
terminal.disconnect_by_func(terminal._on_button_press)
|
||||||
|
terminal.disconnect_by_func(terminal._on_key_press)
|
||||||
|
terminal.disconnect_by_func(terminal._on_key_release)
|
||||||
|
terminal.disconnect_by_func(terminal._handle_destroy)
|
||||||
|
|
||||||
|
def _handle_path_change(self, terminal):
|
||||||
|
if not hasattr(self, "label"): return
|
||||||
|
|
||||||
|
uri = terminal.get_current_directory_uri().replace("file://", "")
|
||||||
|
|
||||||
|
terminal.label.set_text(uri)
|
||||||
|
terminal.label.set_tooltip_text(uri)
|
||||||
|
|
||||||
|
def _handle_selection(self, *args):
|
||||||
|
if self.get_has_selection():
|
||||||
|
self.copy_primary()
|
||||||
|
|
||||||
|
def _on_button_press(self, widget, event):
|
||||||
|
if event.button == 2: # middle click
|
||||||
|
self.paste_clipboard()
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _on_key_press(self, widget, event):
|
||||||
|
ctrl_pressed = event.state & Gdk.ModifierType.CONTROL_MASK
|
||||||
|
shift_pressed = event.state & Gdk.ModifierType.SHIFT_MASK
|
||||||
|
|
||||||
|
if ctrl_pressed:
|
||||||
|
if shift_pressed:
|
||||||
|
if event.keyval in [Gdk.KEY_C, Gdk.KEY_V]:
|
||||||
|
if event.keyval == Gdk.KEY_C:
|
||||||
|
self.copy_clipboard()
|
||||||
|
elif event.keyval == Gdk.KEY_V:
|
||||||
|
self.paste_clipboard()
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
def _on_key_release(self, widget, event):
|
||||||
|
...
|
||||||
|
|
||||||
|
def _handle_commit(self, terminal, text, size):
|
||||||
if self.dont_process:
|
if self.dont_process:
|
||||||
self.dont_process = False
|
self.dont_process = False
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -2,7 +2,10 @@
|
|||||||
|
|
||||||
# Lib imports
|
# Lib imports
|
||||||
import gi
|
import gi
|
||||||
|
gi.require_version('Gdk', '3.0')
|
||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
|
from gi.repository import Gdk
|
||||||
|
from gi.repository import GLib
|
||||||
|
|
||||||
# Application imports
|
# Application imports
|
||||||
|
|
||||||
@@ -25,6 +28,7 @@ class PluginsUI(Gtk.Dialog):
|
|||||||
|
|
||||||
self.set_title("Plugins")
|
self.set_title("Plugins")
|
||||||
self.set_size_request(450, 530)
|
self.set_size_request(450, 530)
|
||||||
|
self.set_modal(False)
|
||||||
self.set_deletable(False)
|
self.set_deletable(False)
|
||||||
self.set_skip_pager_hint(True)
|
self.set_skip_pager_hint(True)
|
||||||
self.set_skip_taskbar_hint(True)
|
self.set_skip_taskbar_hint(True)
|
||||||
@@ -35,9 +39,13 @@ class PluginsUI(Gtk.Dialog):
|
|||||||
|
|
||||||
window = widget_registery.get_object("main-window")
|
window = widget_registery.get_object("main-window")
|
||||||
self.set_transient_for(window)
|
self.set_transient_for(window)
|
||||||
|
self.set_destroy_with_parent(True)
|
||||||
|
|
||||||
|
self.set_position(Gtk.WindowPosition.CENTER_ON_PARENT)
|
||||||
|
|
||||||
def _setup_signals(self):
|
def _setup_signals(self):
|
||||||
...
|
self.connect("focus-out-event", self._on_focus_out)
|
||||||
|
self.connect("key-release-event", self._on_key_release)
|
||||||
|
|
||||||
def _subscribe_to_events(self):
|
def _subscribe_to_events(self):
|
||||||
...
|
...
|
||||||
@@ -59,6 +67,19 @@ class PluginsUI(Gtk.Dialog):
|
|||||||
|
|
||||||
scrolled_win.show_all()
|
scrolled_win.show_all()
|
||||||
|
|
||||||
|
def _on_key_release(self, widget, event):
|
||||||
|
ctrl_pressed = event.state & Gdk.ModifierType.CONTROL_MASK
|
||||||
|
shift_pressed = event.state & Gdk.ModifierType.SHIFT_MASK
|
||||||
|
|
||||||
|
if ctrl_pressed:
|
||||||
|
if shift_pressed:
|
||||||
|
if event.keyval == Gdk.KEY_P:
|
||||||
|
self.hide()
|
||||||
|
|
||||||
|
def _on_focus_out(self, *args):
|
||||||
|
self.hide()
|
||||||
|
GLib.idle_add(self.hide)
|
||||||
|
|
||||||
def add_row(self, manifest_meta, callback: callable):
|
def add_row(self, manifest_meta, callback: callable):
|
||||||
box = Gtk.Box()
|
box = Gtk.Box()
|
||||||
plugin_lbl = Gtk.Label(label = manifest_meta.manifest.name)
|
plugin_lbl = Gtk.Label(label = manifest_meta.manifest.name)
|
||||||
|
|||||||
Reference in New Issue
Block a user