Skip to content
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.

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

Add symbol filter to outline pane #1253

Merged
merged 32 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e08786e
Search symbol pane, first attempt
Jan 23, 2023
526b702
Implement filter tool in symbol pane
Jan 23, 2023
de7678f
Extend range of symbol types, classify symbols
Jan 24, 2023
d1205d4
Throttle refilter; refilter on check toggled
Jan 24, 2023
b3904a3
Simplify filter; expand_all after filter
Jan 24, 2023
fed7470
Handle Namespace type; Add ActionBar
Jan 24, 2023
d99f0a0
Merge branch 'master' into search-symbols
Jan 24, 2023
3f0b813
Fix regression in search entry filtering
Jan 24, 2023
84c4f6e
Delete debug warning
Jan 24, 2023
d6f7313
Merge branch 'master' into search-symbols
Jan 24, 2023
53b9d9c
Merge branch 'master' into search-symbols
Mar 21, 2023
9b18404
Inline namespace
Mar 21, 2023
413fccb
Space out filters, add header
Mar 21, 2023
f00a36e
Reduce nesting in schedule refilter
Mar 21, 2023
cfcf24b
Simplify and flatten filter func
Mar 21, 2023
c7d8f80
Merge branch 'master' into search-symbols
zeebok Mar 22, 2023
906fb5a
Merge branch 'master' into search-symbols
danirabbit Mar 24, 2023
1024dd2
Merge branch 'master' into search-symbols
zeebok Mar 27, 2023
2075dde
Merge branch 'master' into search-symbols
zeebok May 12, 2023
f9ce70a
Merge branch 'master' into search-symbols
May 12, 2023
a2c88f6
Merge branch 'master' into search-symbols
Jun 17, 2023
43c0b79
Merge branch 'master' into search-symbols
zeebok Jul 6, 2023
245f362
Merge branch 'master' into search-symbols
Aug 2, 2023
c6f86fe
Merge branch 'master' into search-symbols
jeremypw Jul 17, 2024
9419e6d
Change stray Granite.Widget to Code.Widget
jeremypw Jul 17, 2024
f7ec4ed
Change another stray Granite.Widgets.SourceList
jeremypw Jul 17, 2024
611f662
Add filter icon, fix styles
danirabbit Jul 24, 2024
00b2ad2
Merge branch 'master' into search-symbols
jeremypw Jul 27, 2024
15ff6e4
Merge branch 'master' into search-symbols
jeremypw Jul 30, 2024
96c2a22
Merge branch 'master' into search-symbols
jeremypw Aug 1, 2024
da1d045
Jeremypw/use simple menu (#1459)
jeremypw Aug 1, 2024
54dae83
Fix lint
jeremypw Aug 1, 2024
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
8 changes: 8 additions & 0 deletions data/Application.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,11 @@ textview.scrubber {
.fuzzy-item.preselect-fuzzy label {
opacity: 0.7;
}

.symbol-outline > box.horizontal {
margin: 1em;
}

.symbol-outline .sidebar {
background: inherit;
}
282 changes: 282 additions & 0 deletions data/icons/filter-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions data/io.elementary.code.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@
<file alias="scalable/actions/panel-right-rtl-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/panel-right-rtl-symbolic.svg</file>
<file alias="scalable/actions/panel-right-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/panel-right-symbolic.svg</file>
</gresource>
<gresource prefix="/io/elementary/code/icons">
<file alias="scalable/actions/filter-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/filter-symbolic.svg</file>
</gresource>
</gresources>
19 changes: 17 additions & 2 deletions src/SymbolPane/C/CtagsSymbol.vala
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,25 @@

public class Scratch.Services.CtagsSymbol : Code.Widgets.SourceList.ExpandableItem {
public Scratch.Services.Document doc { get; construct set; }
public SymbolType symbol_type { get; set; default = SymbolType.OTHER; }
public int line { get; construct set; }

public CtagsSymbol (Scratch.Services.Document doc, string name, int line, Icon? _icon) {
Object (doc: doc, name: name, line: line);
public CtagsSymbol (
Scratch.Services.Document doc,
string name,
int line,
Icon? _icon,
SymbolType? s_type = null) {

Object (
doc: doc,
name: name,
line: line
);

icon = _icon;
if (s_type != null) {
symbol_type = s_type;
}
}
}
18 changes: 16 additions & 2 deletions src/SymbolPane/C/CtagsSymbolIter.vala
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,22 @@ public class Scratch.Services.CtagsSymbolIter : Object {
public string parent { get; construct set; }
public int line { get; construct set; }
public Icon? icon { get; construct set; }
public SymbolType? symbol_type;

public CtagsSymbolIter (string name, string parent, int line, Icon? icon) {
Object (name: name, parent: parent, line: line, icon: icon);
public CtagsSymbolIter (
string name,
string parent,
int line,
Icon? icon,
SymbolType? s_type = SymbolType.OTHER) {

Object (
name: name,
parent: parent,
line: line,
icon: icon
);

symbol_type = s_type;
}
}
Loading