Fix unload lifecycle, widget cleanup, and plugin removal handling
- Rename GodotHandler to GDScriptHandler in LSP client - Fix unload() method naming in nanoesq_temp_buffer plugin - Return manifest_meta in manifest_manager for manual launch plugins - Properly destroy tabs_widget, viewport, and scrolled_win on unload - Refactor plugin removal to search all manifest lists and fix cleanup order - Fix widget reference in plugins_ui (use child instead of box)
This commit is contained in:
@@ -23,7 +23,7 @@ class Plugin(PluginCode):
|
|||||||
def load(self):
|
def load(self):
|
||||||
self._manage_signals("register_command")
|
self._manage_signals("register_command")
|
||||||
|
|
||||||
def load(self):
|
def unload(self):
|
||||||
self._manage_signals("unregister_command")
|
self._manage_signals("unregister_command")
|
||||||
|
|
||||||
def _manage_signals(self, action: str):
|
def _manage_signals(self, action: str):
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from libs.event_factory import Event_Factory, Code_Event_Types
|
|||||||
|
|
||||||
from plugins.plugin_types import PluginCode
|
from plugins.plugin_types import PluginCode
|
||||||
|
|
||||||
from .response_handler import GodotHandler
|
from .response_handler import GDScriptHandler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ class Plugin(PluginCode):
|
|||||||
event = Event_Factory.create_event("register_lsp_client",
|
event = Event_Factory.create_event("register_lsp_client",
|
||||||
lang_id = "gdscript",
|
lang_id = "gdscript",
|
||||||
lang_config = config,
|
lang_config = config,
|
||||||
handler = GodotHandler
|
handler = GDScriptHandler
|
||||||
)
|
)
|
||||||
self.emit_to("lsp_manager", event)
|
self.emit_to("lsp_manager", event)
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
from .python import PythonHandler
|
from .gdscript import GDScriptHandler
|
||||||
@@ -7,6 +7,6 @@ from lsp_manager.response_handlers.default import DefaultHandler
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
class GodotHandler(DefaultHandler):
|
class GDScriptHandler(DefaultHandler):
|
||||||
"""Uses default handling, can override if Godot needs special logic."""
|
"""Uses default handling, can override if Godot needs special logic."""
|
||||||
...
|
...
|
||||||
@@ -50,7 +50,14 @@ class Plugin(PluginCode):
|
|||||||
def unload(self):
|
def unload(self):
|
||||||
self.unregister_controller("tabs")
|
self.unregister_controller("tabs")
|
||||||
self.tabs_controller.unload_tabs()
|
self.tabs_controller.unload_tabs()
|
||||||
self.tabs_controller.tabs_widget.destroy()
|
|
||||||
|
tabs_widget = self.tabs_controller.tabs_widget
|
||||||
|
viewport = tabs_widget.get_parent()
|
||||||
|
scrolled_win = viewport.get_parent()
|
||||||
|
|
||||||
|
tabs_widget.destroy()
|
||||||
|
viewport.destroy()
|
||||||
|
scrolled_win.destroy()
|
||||||
|
|
||||||
self.tabs_controller.tabs_widget = None
|
self.tabs_controller.tabs_widget = None
|
||||||
self.tabs_controller = None
|
self.tabs_controller = None
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class ManifestManager:
|
|||||||
|
|
||||||
if not manifest.autoload:
|
if not manifest.autoload:
|
||||||
self.manual_launch_manifests.append(manifest_meta)
|
self.manual_launch_manifests.append(manifest_meta)
|
||||||
return
|
return manifest_meta
|
||||||
|
|
||||||
if manifest.pre_launch:
|
if manifest.pre_launch:
|
||||||
self.pre_launch_manifests.append(manifest_meta)
|
self.pre_launch_manifests.append(manifest_meta)
|
||||||
|
|||||||
@@ -48,13 +48,13 @@ class PluginReloadMixin:
|
|||||||
|
|
||||||
def remove_plugin(self, file: str) -> None:
|
def remove_plugin(self, file: str) -> None:
|
||||||
logger.info(f"Removing plugin: {file.get_uri()}")
|
logger.info(f"Removing plugin: {file.get_uri()}")
|
||||||
for manifest_meta in self._plugin_collection[:]:
|
|
||||||
if not manifest_meta.folder in file.get_uri(): continue
|
|
||||||
|
|
||||||
manifest_meta.instance.unload()
|
manifests = self._manifest_manager.pre_launch_manifests \
|
||||||
manifest_meta.instance = None
|
+ self._manifest_manager.post_launch_manifests \
|
||||||
self._plugin_collection.remove(manifest_meta)
|
+ self._manifest_manager.manual_launch_manifests
|
||||||
self.plugins_ui.remove_row(manifest_meta)
|
|
||||||
|
for manifest_meta in manifests:
|
||||||
|
if not manifest_meta.folder in file.get_uri(): continue
|
||||||
|
|
||||||
if manifest_meta in self._manifest_manager.pre_launch_manifests:
|
if manifest_meta in self._manifest_manager.pre_launch_manifests:
|
||||||
self._manifest_manager.pre_launch_manifests.remove(manifest_meta)
|
self._manifest_manager.pre_launch_manifests.remove(manifest_meta)
|
||||||
@@ -63,4 +63,15 @@ class PluginReloadMixin:
|
|||||||
elif manifest_meta in self._manifest_manager.manual_launch_manifests:
|
elif manifest_meta in self._manifest_manager.manual_launch_manifests:
|
||||||
self._manifest_manager.manual_launch_manifests.remove(manifest_meta)
|
self._manifest_manager.manual_launch_manifests.remove(manifest_meta)
|
||||||
|
|
||||||
|
self.plugins_ui.remove_row(manifest_meta)
|
||||||
|
break
|
||||||
|
|
||||||
|
del manifests
|
||||||
|
for manifest_meta in self._plugin_collection[:]:
|
||||||
|
if not manifest_meta.folder in file.get_uri(): continue
|
||||||
|
|
||||||
|
manifest_meta.instance.unload()
|
||||||
|
manifest_meta.instance = None
|
||||||
|
self._plugin_collection.remove(manifest_meta)
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ class PluginsUI(Gtk.Dialog):
|
|||||||
|
|
||||||
toggle_bttn.toggle_id = \
|
toggle_bttn.toggle_id = \
|
||||||
toggle_bttn.connect("toggled", callback, manifest_meta)
|
toggle_bttn.connect("toggled", callback, manifest_meta)
|
||||||
|
box.toggle_bttn = toggle_bttn
|
||||||
|
|
||||||
box.add(plugin_lbl)
|
box.add(plugin_lbl)
|
||||||
box.add(author_lbl)
|
box.add(author_lbl)
|
||||||
@@ -96,5 +97,5 @@ class PluginsUI(Gtk.Dialog):
|
|||||||
toggle_bttn.disconnect(toggle_bttn.toggle_id)
|
toggle_bttn.disconnect(toggle_bttn.toggle_id)
|
||||||
|
|
||||||
self.list_box.remove(row)
|
self.list_box.remove(row)
|
||||||
box.destroy()
|
child.destroy()
|
||||||
break
|
break
|
||||||
|
|||||||
Reference in New Issue
Block a user