hexedtech/codemp-sublime
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-sublime.git synced 2024-11-22 14:54:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix/tweaks: minor changes and fixes

Browse source
This commit is contained in:
cschen 2024-11-03 17:59:17 +01:00
parent c8db688852
commit b706644e10
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
main.py
View file

@ -6,6 +6,7 @@ import logging
import codemp import codemp
from .plugin.utils import safe_listener_detach from .plugin.utils import safe_listener_detach
from .plugin.utils import safe_listener_attach from .plugin.utils import safe_listener_attach
from .plugin.utils import some
from .plugin.core.session import session from .plugin.core.session import session
from .plugin.core.workspace import workspaces from .plugin.core.workspace import workspaces
from .plugin.core.buffers import buffers from .plugin.core.buffers import buffers
@ -66,10 +67,7 @@ def objects_from_view(view):
assert view.settings().get(g.CODEMP_VIEW_TAG, False) assert view.settings().get(g.CODEMP_VIEW_TAG, False)
buffid = str(view.settings().get(g.CODEMP_BUFFER_ID)) buffid = str(view.settings().get(g.CODEMP_BUFFER_ID))
try: vbuff = buffers.lookupId(buffid) vbuff = buffers.lookupId(buffid)
except KeyError:
logger.error("we couldn't find the matching buffer or workspace!")
raise ValueError
vws = buffers.lookupParent(vbuff) vws = buffers.lookupParent(vbuff)
win = workspaces.lookupParent(vws) win = workspaces.lookupParent(vws)
@ -92,7 +90,7 @@ class CodempBrowseServerCommand(sublime_plugin.WindowCommand):
def run(self): def run(self):
wks = session.get_workspaces() wks = session.get_workspaces()
QPServerBrowser(self.window, session.host, wks).run() QPServerBrowser(self.window, session.config.host, wks).run()
class CodempReplaceTextCommand(sublime_plugin.TextCommand): class CodempReplaceTextCommand(sublime_plugin.TextCommand):
@ -113,8 +111,6 @@ class EventListener(sublime_plugin.EventListener):
# client.driver.stop() # client.driver.stop()
def on_pre_close_window(self, window): def on_pre_close_window(self, window):
assert session.client is not None
for vws in workspaces.lookup(window): for vws in workspaces.lookup(window):
sublime.run_command("codemp_leave_workspace", { sublime.run_command("codemp_leave_workspace", {
"workspace_id": vws.id "workspace_id": vws.id
@ -145,9 +141,9 @@ class CodempClientViewEventListener(sublime_plugin.ViewEventListener):
try: try:
_, vws, vbuff = objects_from_view(self.view) _, vws, vbuff = objects_from_view(self.view)
except ValueError: except KeyError:
logger.error(f"Could not find buffers associated with the view {self.view}.\ logger.error(f"Could not find buffers associated with the view {self.view}.\
Removig the tag to disable event listener. Reattach.") Removing the tag to disable event listener. Reattach.")
# delete the tag so we disable this event listener on the view # delete the tag so we disable this event listener on the view
del self.view.settings()[g.CODEMP_VIEW_TAG] del self.view.settings()[g.CODEMP_VIEW_TAG]
return return
@ -156,24 +152,24 @@ class CodempClientViewEventListener(sublime_plugin.ViewEventListener):
logger.debug(f"selection modified! {vws.id}, {vbuff.id} - {start}, {end}") logger.debug(f"selection modified! {vws.id}, {vbuff.id} - {start}, {end}")
def on_activated(self): def on_activated(self):
global TEXT_LISTENER
logger.debug(f"'{self.view}' view activated!") logger.debug(f"'{self.view}' view activated!")
safe_listener_attach(TEXT_LISTENER, self.view.buffer()) # pyright: ignore safe_listener_attach(TEXT_LISTENER, self.view.buffer()) # pyright: ignore
def on_deactivated(self): def on_deactivated(self):
global TEXT_LISTENER
logger.debug(f"'{self.view}' view deactivated!") logger.debug(f"'{self.view}' view deactivated!")
safe_listener_detach(TEXT_LISTENER) # pyright: ignore safe_listener_detach(TEXT_LISTENER) # pyright: ignore
def on_pre_close(self): def on_pre_close(self):
if self.view == sublime.active_window().active_view(): if self.view == sublime.active_window().active_view():
logger.debug("closing active view") logger.debug("closing active view")
global TEXT_LISTENER
safe_listener_detach(TEXT_LISTENER) # pyright: ignore safe_listener_detach(TEXT_LISTENER) # pyright: ignore
try: try:
_, vws, vbuff = objects_from_view(self.view) bid = str(self.view.settings().get(g.CODEMP_BUFFER_ID))
buffers.remove(vbuff) vws = buffers.lookupParent(bid)
except ValueError: some(self.view.window()).run_command(
"codemp_leave_buffer",
{"workspace_id": vws.id, "buffer_id": bid})
except KeyError:
return return
def on_text_command(self, command_name, args): def on_text_command(self, command_name, args):

2
plugin/commands/client.py
View file

@ -167,7 +167,7 @@ class CodempDeleteWorkspaceCommand(sublime_plugin.WindowCommand):
def input(self, args): def input(self, args):
workspaces = session.get_workspaces(owned=True, invited=False) # noqa: F841 workspaces = session.get_workspaces(owned=True, invited=False) # noqa: F841
if "workspace_id" not in args: if "workspace_id" not in args:
return SimpleListInput(("workspace_id", workspaces) return SimpleListInput(("workspace_id", workspaces))
def run(self, workspace_id: str): # pyright: ignore[reportIncompatibleMethodOverride] def run(self, workspace_id: str): # pyright: ignore[reportIncompatibleMethodOverride]
try: try: