refactor(code): move temp cut buffer feature and clean up related code
- Moved cut_to_temp_buffer and paste_temp_buffer commands to plugin - Remove temporary cut buffer logic from SourceView - Remove related keybindings (Ctrl+K / Ctrl+U) - Fix word-end detection in ProviderResponseCacheBase to avoid extending past line end - Improve completion controller to support RequestCompletionEvent with optional provider filtering - Add GetActiveViewEvent handling in SourceViewsController - Ensure view scrolls to cursor after buffer switch via GLib.idle_add - Emit focus-in-event after DnD file load to restore focus behavior - Prevent "buffer" pseudo-path from interfering with loaded file filtering - Remove obsolete AGENTS.md from LSP manager plugin
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
# Python imports
|
||||
|
||||
# Lib imports
|
||||
import gi
|
||||
|
||||
gi.require_version('GtkSource', '4')
|
||||
|
||||
from gi.repository import GtkSource
|
||||
|
||||
# Application imports
|
||||
|
||||
|
||||
|
||||
def execute(
|
||||
view: GtkSource.View,
|
||||
*args,
|
||||
**kwargs
|
||||
):
|
||||
logger.debug("Command: Cut to Temp Buffer")
|
||||
|
||||
view.clear_temp_cut_buffer_delayed()
|
||||
|
||||
buffer = view.get_buffer()
|
||||
itr = buffer.get_iter_at_mark( buffer.get_insert() )
|
||||
start_itr = itr.copy()
|
||||
end_itr = itr.copy()
|
||||
start_line = itr.get_line() + 1
|
||||
start_char = itr.get_line_offset()
|
||||
|
||||
start_itr.backward_visible_line()
|
||||
start_itr.forward_line()
|
||||
end_itr.forward_line()
|
||||
|
||||
line_str = buffer.get_slice(start_itr, end_itr, True)
|
||||
view._cut_buffer += f"{line_str}"
|
||||
buffer.delete(start_itr, end_itr)
|
||||
|
||||
view.set_temp_cut_buffer_delayed()
|
||||
@@ -6,6 +6,8 @@ import gi
|
||||
gi.require_version('GtkSource', '4')
|
||||
|
||||
from gi.repository import GtkSource
|
||||
from gi.repository import Gtk
|
||||
from gi.repository import Gdk
|
||||
from gi.repository import Gio
|
||||
|
||||
# Application imports
|
||||
@@ -20,9 +22,9 @@ def execute(
|
||||
**kwargs
|
||||
):
|
||||
logger.debug("Command: DnD Load File To Buffer")
|
||||
file = view.command.new_file(view)
|
||||
file = view.command.new_file(view)
|
||||
gfile = Gio.File.new_for_uri(uri)
|
||||
|
||||
gfile = Gio.File.new_for_uri(uri)
|
||||
view.command.exec_with_args(
|
||||
"load_file",
|
||||
view, gfile, file
|
||||
@@ -31,3 +33,4 @@ def execute(
|
||||
view.set_buffer(file.buffer)
|
||||
|
||||
update_info_bar_if_focused(view.command, view)
|
||||
view.emit("focus-in-event", Gdk.Event())
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
# Python imports
|
||||
|
||||
# Lib imports
|
||||
import gi
|
||||
|
||||
gi.require_version('GtkSource', '4')
|
||||
|
||||
from gi.repository import GLib
|
||||
from gi.repository import GtkSource
|
||||
|
||||
# Application imports
|
||||
|
||||
|
||||
|
||||
def execute(
|
||||
view: GtkSource.View,
|
||||
*args,
|
||||
**kwargs
|
||||
):
|
||||
logger.debug("Command: Paste Temp Buffer")
|
||||
|
||||
view.clear_temp_cut_buffer_delayed()
|
||||
|
||||
buffer = view.get_buffer()
|
||||
itr = buffer.get_iter_at_mark( buffer.get_insert() )
|
||||
insert_itr = itr.copy()
|
||||
|
||||
buffer.insert(insert_itr, view._cut_buffer, -1)
|
||||
|
||||
view.set_temp_cut_buffer_delayed()
|
||||
@@ -109,8 +109,8 @@ class ProviderResponseCacheBase:
|
||||
if not start_iter.starts_word():
|
||||
start_iter.backward_word_start()
|
||||
|
||||
if not end_iter.ends_word():
|
||||
end_iter.forward_word_end()
|
||||
if not end_iter.ends_line() and not end_iter.ends_word():
|
||||
end_iter.forward_word_end()
|
||||
|
||||
buffer = start_iter.get_buffer()
|
||||
|
||||
|
||||
@@ -43,8 +43,8 @@ class CompletionController(ControllerBase):
|
||||
self.provider_process_file_save(event)
|
||||
elif isinstance(event, Code_Event_Types.TextChangedEvent):
|
||||
self.provider_process_file_change(event)
|
||||
# elif isinstance(event, Code_Event_Types.RequestCompletionEvent):
|
||||
# self.request_unbound_completion( event.view.get_completion() )
|
||||
elif isinstance(event, Code_Event_Types.RequestCompletionEvent):
|
||||
self.request_unbound_completion(event)
|
||||
|
||||
|
||||
def register_completer(self, completer: GtkSource.Completion):
|
||||
@@ -92,8 +92,17 @@ class CompletionController(ControllerBase):
|
||||
for provider in self._providers.values():
|
||||
provider.response_cache.process_file_change(event)
|
||||
|
||||
def request_unbound_completion(self, completer: GtkSource.Completion):
|
||||
def request_unbound_completion(self, event: Code_Event_Types.RequestCompletionEvent):
|
||||
completer = event.view.get_completion()
|
||||
providers = [ *self._providers.values() ]
|
||||
|
||||
if event.provider:
|
||||
if not isinstance(event.provider, list):
|
||||
providers = [ event.provider ]
|
||||
else:
|
||||
providers = event.provider
|
||||
|
||||
completer.start(
|
||||
[ *self._providers.values() ],
|
||||
providers,
|
||||
completer.create_context()
|
||||
)
|
||||
|
||||
@@ -33,7 +33,8 @@ class FilesController(ControllerBase, list):
|
||||
|
||||
|
||||
def filter_loaded(self, event: Code_Event_Types.FilterOutLoadedFilesEvent):
|
||||
loaded_paths = {file.fpath for file in self}
|
||||
loaded_paths = {file.fpath for file in self if not file.fpath == "buffer"}
|
||||
|
||||
files = [
|
||||
uri for uri in event.uris if not any(path in uri for path in loaded_paths)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
# Python imports
|
||||
|
||||
# Lib imports
|
||||
import gi
|
||||
|
||||
from gi.repository import GLib
|
||||
|
||||
# Application imports
|
||||
from ...source_view import SourceView
|
||||
@@ -21,6 +24,7 @@ class SourceViewSignalMapper:
|
||||
def set_buffer_to_active_view(self, buffer):
|
||||
self.active_view.set_buffer(buffer)
|
||||
self.active_view.command.exec("update_info_bar")
|
||||
GLib.idle_add(self._scroll_to_iter)
|
||||
|
||||
def connect_signals(self, source_view: SourceView):
|
||||
signal_mappings = self._get_signal_mappings()
|
||||
@@ -35,6 +39,12 @@ class SourceViewSignalMapper:
|
||||
def insert_text(self, file, string: str):
|
||||
return self.state_manager.handle_insert_text(self.active_view, file, string)
|
||||
|
||||
def _scroll_to_iter(self):
|
||||
buffer = self.active_view.get_buffer()
|
||||
itr = buffer.get_iter_at_mark( buffer.get_insert() )
|
||||
|
||||
self.active_view.scroll_to_iter(itr, 0.2, False, 0, 0)
|
||||
|
||||
def _get_signal_mappings(self):
|
||||
return {
|
||||
"focus-in-event": self._focus_in_event,
|
||||
|
||||
@@ -36,7 +36,9 @@ class SourceViewsController(ControllerBase, list):
|
||||
|
||||
if not self.signal_mapper.active_view: return
|
||||
|
||||
if isinstance(event, Code_Event_Types.TextChangedEvent):
|
||||
if isinstance(event, Code_Event_Types.GetActiveViewEvent):
|
||||
event.response = self.signal_mapper.active_view
|
||||
elif isinstance(event, Code_Event_Types.TextChangedEvent):
|
||||
self.signal_mapper.active_view.command.exec("update_info_bar")
|
||||
elif isinstance(event, Code_Event_Types.SetActiveFileEvent):
|
||||
self.signal_mapper.set_buffer_to_active_view(event.buffer)
|
||||
|
||||
@@ -6,7 +6,6 @@ gi.require_version('Gtk', '3.0')
|
||||
gi.require_version('GtkSource', '4')
|
||||
|
||||
from gi.repository import Gtk
|
||||
from gi.repository import GLib
|
||||
from gi.repository import GtkSource
|
||||
|
||||
# Application imports
|
||||
@@ -22,9 +21,6 @@ class SourceView(GtkSource.View, SourceViewDnDMixin):
|
||||
|
||||
self.state = state
|
||||
|
||||
self._cut_temp_timeout_id = None
|
||||
self._cut_buffer = ""
|
||||
|
||||
self.sibling_right = None
|
||||
self.sibling_left = None
|
||||
|
||||
@@ -74,15 +70,3 @@ class SourceView(GtkSource.View, SourceViewDnDMixin):
|
||||
)
|
||||
|
||||
self._set_up_dnd()
|
||||
|
||||
def clear_temp_cut_buffer_delayed(self):
|
||||
if self._cut_temp_timeout_id:
|
||||
GLib.source_remove(self._cut_temp_timeout_id)
|
||||
|
||||
def set_temp_cut_buffer_delayed(self):
|
||||
def clear_temp_buffer():
|
||||
self._cut_buffer = ""
|
||||
self._cut_temp_timeout_id = None
|
||||
return False
|
||||
|
||||
self._cut_temp_timeout_id = GLib.timeout_add(15000, clear_temp_buffer)
|
||||
|
||||
Reference in New Issue
Block a user