Skip to content

Fix crash from Document get_slice () on start up under some conditions #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeebok merged 2 commits into from
Jun 12, 2025
Merged

Fix crash from Document get_slice () on start up under some conditions #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
152b697
Add tooltips after tree finished constructing
jeremypw Jun 11, 2025
89f0ee3
Merge branch 'master' into jeremypw/vala-symbols/fix-crash-on-startup
jeremypw Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/SymbolPane/SymbolOutline.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public class Scratch.Services.SymbolOutline : Gtk.Box {
}

public virtual void parse_symbols () {}
public virtual void add_tooltips (Code.Widgets.SourceList.ExpandableItem root) {}

Gtk.MenuButton filter_button;

Expand Down
41 changes: 29 additions & 12 deletions src/SymbolPane/Vala/ValaSymbolOutline.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public class Scratch.Services.ValaSymbolOutline : Scratch.Services.SymbolOutline
}

store.root.expand_all ();
add_tooltips (store.root);
store.vadjustment.set_value (adjustment_value);

return false;
});
} else {
Expand All @@ -145,6 +145,30 @@ public class Scratch.Services.ValaSymbolOutline : Scratch.Services.SymbolOutline
});
}

protected override void add_tooltips (Code.Widgets.SourceList.ExpandableItem root) {
foreach (var parent in root.children) {
add_tooltip ((Code.Widgets.SourceList.ExpandableItem) parent);
}
}

private void add_tooltip (Code.Widgets.SourceList.ExpandableItem parent) {
if (parent is ValaSymbolItem) {
var item = ((ValaSymbolItem)parent);
var symbol = item.symbol;
item.tooltip = "%s%s".printf (
doc.get_slice (
symbol.source_reference.begin.line,
symbol.source_reference.begin.column,
symbol.source_reference.end.line,
symbol.source_reference.end.column
),
symbol.comment != null ? "\n" + symbol.comment.content : ""
);
}

add_tooltips (parent);
}

private void destroy_all_children (Code.Widgets.SourceList.ExpandableItem parent) {
foreach (var child in parent.children) {
remove (child, parent);
Expand Down Expand Up @@ -177,7 +201,9 @@ public class Scratch.Services.ValaSymbolOutline : Scratch.Services.SymbolOutline
continue;

construct_child (symbol, new_root, cancellable);
Thread.yield ();
if (!cancellable.is_cancelled ()) {
Thread.yield ();
}
}

return new_root;
Expand All @@ -199,19 +225,10 @@ public class Scratch.Services.ValaSymbolOutline : Scratch.Services.SymbolOutline
parent = construct_child (symbol.scope.parent_scope.owner, given_parent, cancellable);
}

var tooltip = "%s%s".printf (
doc.get_slice (
symbol.source_reference.begin.line,
symbol.source_reference.begin.column,
symbol.source_reference.end.line,
symbol.source_reference.end.column
),
symbol.comment != null ? "\n" + symbol.comment.content : ""
);

var tree_child = new ValaSymbolItem (
symbol,
tooltip
""
);
parent.add (tree_child);
return tree_child;
Expand Down