Skip to content

Add search field to Files tab in Avalonia version #951

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
KirillOsenkov merged 1 commit into from
May 11, 2026
+72 −7
Merged

Add search field to Files tab in Avalonia version #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/StructuredLogViewer.Avalonia/Controls/BuildControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</TabItem>

<TabItem Name="filesTab" Header="Files" IsVisible="false">
<TreeView Name="filesTree"></TreeView>
<local:SearchAndResultsControl Name="filesTree"></local:SearchAndResultsControl>
</TabItem>

<TabItem Name="findInFilesTab" Header="Find in Files" IsVisible="False">
Expand Down
77 changes: 71 additions & 6 deletions src/StructuredLogViewer.Avalonia/Controls/BuildControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public partial class BuildControl : UserControl
private TabItem filesTab;
private TabItem propertiesAndItemsTab;
private TabItem findInFilesTab;
private TreeView filesTree;
private SearchAndResultsControl filesTree;
private TabControl centralTabControl;
private ListBox breadCrumb;
private TabControl leftPaneTabControl;
Expand Down Expand Up @@ -255,8 +255,9 @@ Style GetTreeViewItemStyle()
filesTab.IsVisible = true;
findInFilesTab.IsVisible = true;
PopulateFilesTab();
filesTree.Styles.Add(GetTreeViewItemStyle());
RegisterTreeViewHandlers(filesTree);
filesTree.ResultsList.Styles.Add(GetTreeViewItemStyle());
RegisterTreeViewHandlers(filesTree.ResultsList);
filesTree.TextChanged += FilesTree_SearchTextChanged;

var text =
@"This log contains the full text of projects and imported files used during the build.
Expand Down Expand Up @@ -607,9 +608,73 @@ private void PopulateFilesTab()
CompressTree(subFolder);
}

filesTree.ItemsSource = root.Children;
filesTree.GotFocus += (s, a) => ActiveTreeView = filesTree;
filesTree.ContextMenu = sharedTreeContextMenu;
filesTree.DisplayItems(root.Children);
filesTree.ResultsList.GotFocus += (s, a) => ActiveTreeView = filesTree.ResultsList;
filesTree.ResultsList.ContextMenu = sharedTreeContextMenu;
}

private void FilesTree_SearchTextChanged(string text)
{
var list = filesTree.ResultsList.ItemsSource as IEnumerable<object>;
if (list != null)
{
UpdateFileVisibility(list.OfType<NamedNode>(), text);
}
}

private bool UpdateFileVisibility(IEnumerable<NamedNode> items, string text)
{
bool visible = false;

if (items == null)
{
return false;
}

foreach (var item in items)
{
if (item is Folder folder)
{
var subItems = folder.Children.OfType<NamedNode>();
var folderVisibility = UpdateFileVisibility(subItems, text);
folder.IsVisible = folderVisibility;
visible |= folderVisibility;
}
else if (item is SourceFile file)
{
if (string.IsNullOrEmpty(text) || file.SourceFilePath.IndexOf(text, StringComparison.OrdinalIgnoreCase) > -1)
{
visible = true;
file.IsVisible = true;
}
else
{
file.IsVisible = false;
}

var subItems = file.Children.OfType<NamedNode>();
var fileVisibility = UpdateFileVisibility(subItems, text);
file.IsVisible |= fileVisibility;
visible |= fileVisibility;
}
else if (item is Target || item is Task)
{
if (string.IsNullOrEmpty(text) ||
item.Name.IndexOf(text, StringComparison.OrdinalIgnoreCase) > -1 ||
(text == "$target" && item is Target) ||
(text == "$task" && item is Task))
{
visible = true;
item.IsVisible = true;
}
else
{
item.IsVisible = false;
}
}
}

return visible;
}

private void CompressTree(Folder parent)
Expand Down