Fix: Improve code folding functionality and gutter rendering

- Updated folding actions and engine for more consistent behavior.
- Added helper function `is_fold_hidden()` to check fold visibility state.
- Improved gutter renderer to handle collapsible code blocks more reliably.
- Refined tag handling for invisible folds to prevent desync issues.
- Removed code fold Fix related entry in `TODO.md`.
This commit is contained in:
2026-03-29 14:33:40 -05:00
parent 62a866d9bb
commit d90415bffc
5 changed files with 44 additions and 49 deletions

View File

@@ -12,7 +12,10 @@ ___
___
### Fix
- Fix <Ctrl\>z in multi-insert mode being funky. Insure updates happen on block level.
I.E, maybe push updates to queue to insure block undo/redo?
- Fix multi-insert not acting properly with - in word.
I.E leader desync on <Ctrl\>left/right
- Fix on lsp client unload to close files lsp side and unload server endpoint
- Fix Collapsable code blocks icon desync on new/old lines or text cut/pasted
___

View File

@@ -20,3 +20,5 @@ def expand_range(view, fold):
end = buffer.get_iter_at_line(fold["end_line"] + 1)
buffer.remove_tag_by_name("invisible", start, end)

View File

@@ -7,12 +7,7 @@ from .fold_types import FOLD_NODES
def get_folding_ranges(lang_name: str, ast):
root = ast.root_node
fold_types = FOLD_NODES.get(lang_name, set())
ranges = []
def visit(node):
def visit_node(fold_types, node, ranges):
if node.type in fold_types:
start_line = node.start_point[0]
end_line = node.end_point[0]
@@ -25,7 +20,13 @@ def get_folding_ranges(lang_name: str, ast):
})
for child in node.children:
visit(child)
visit_node(fold_types, child, ranges)
visit(root)
def get_folding_ranges(lang_name: str, ast):
root = ast.root_node
fold_types = FOLD_NODES.get(lang_name, set())
ranges = []
visit_node(fold_types, root, ranges)
return ranges

View File

@@ -16,10 +16,6 @@ from .folding_actions import collapse_range, expand_range
def handle_collapse(view, fold):
collapse_range(view, fold)
for inner in view.fold_starts:
if fold["start_line"] < inner["start_line"] <= fold["end_line"]:
view.fold_states[inner["id"]] = False
def handle_expand(view, fold):
expand_range(view, fold)
@@ -29,6 +25,11 @@ def handle_block_toggle(collapsed, view, fold):
else:
handle_expand(view, fold)
def is_fold_hidden(buffer, fold):
iter_ = buffer.get_iter_at_line(fold["start_line"] + 1)
tags = iter_.get_tags()
return any(tag.get_property("invisible") for tag in tags)
def on_query_data(renderer, start_iter, end_iter, state, view):
line = start_iter.get_line()
@@ -37,8 +38,11 @@ def on_query_data(renderer, start_iter, end_iter, state, view):
renderer.set_text("", -1)
return
fold = next((f for f in view.fold_starts if f["start_line"] == line), None)
collapsed = fold and view.fold_states.get(fold["id"], False)
fold = next(
(f for f in view.fold_starts if f["start_line"] == line), None
)
collapsed = fold and is_fold_hidden(view.get_buffer(), fold)
renderer.set_text("" if collapsed else "", -1)
@@ -59,9 +63,7 @@ def on_click(view, event, renderer):
for fold in view.fold_starts:
if not fold["start_line"] == line: continue
collapsed = view.fold_states.get(fold["id"], False)
view.fold_states[fold["id"]] = not collapsed
collapsed = is_fold_hidden(view.get_buffer(), fold)
handle_block_toggle(collapsed, view, fold)
renderer.queue_draw()
@@ -74,13 +76,8 @@ def setup_gutter(view):
gutter = view.get_gutter(Gtk.TextWindowType.LEFT)
buffer = view.get_buffer()
if not buffer.get_tag_table().lookup("invisible"):
tag = buffer.create_tag("invisible")
tag.set_property("invisible", True)
view.fold_starts = []
view.fold_start_set = set()
view.fold_states = {}
renderer = GtkSource.GutterRendererText()
renderer.set_size(12)

View File

@@ -13,6 +13,7 @@ from libs.event_factory import Event_Factory, Code_Event_Types
from plugins.plugin_types import PluginCode
from .fold_types import FOLD_NODES
from .folding_actions import collapse_range
from .folding_engine import get_folding_ranges
from .gutter_renderer import setup_gutter
@@ -34,6 +35,11 @@ class Plugin(PluginCode):
if file.ftype not in FOLD_NODES: return
if not hasattr(file, "ast"): return
buffer = file.buffer
if not buffer.get_tag_table().lookup("invisible"):
tag = buffer.create_tag("invisible")
tag.set_property("invisible", True)
self.update_gutter(file, self.view)
elif isinstance(event, Code_Event_Types.TextChangedEvent):
if event.file.ftype not in FOLD_NODES: return
@@ -78,21 +84,7 @@ class Plugin(PluginCode):
view.fold_update_source = GLib.timeout_add(delay, callback)
def update_gutter(self, file, view):
old_states = getattr(view, "fold_states", {})
view.fold_starts = get_folding_ranges(file.ftype, file.ast)
view.fold_start_set = {
fold["start_line"] for fold in view.fold_starts
}
buffer = view.get_buffer()
if not buffer.get_tag_table().lookup("invisible"):
tag = buffer.create_tag("invisible")
tag.set_property("invisible", True)
new_states = {}
for fold in view.fold_starts:
if not fold["id"] in old_states: continue
new_states[fold["id"]] = old_states[fold["id"]]
view.fold_states = new_states