Skip to content

Type hierarchy view improvements #875

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Type hierarchy view improvements #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fa2c96
Fix hierarchy view focusing: it can be located in any view-container
stephan-razin Sep 28, 2025
73a304f
Fix base-classes view hierarchy for class without children
stephan-razin Sep 28, 2025
e8b4291
Fix collapsible state evaluating for children classes
stephan-razin Sep 28, 2025
ad1d197
Add icons and details for type-hierarchy view
stephan-razin Sep 28, 2025
41fc05e
fix formatting
stephan-razin Sep 28, 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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,13 @@
"command": "clangd.typeHierarchy.viewParents",
"category": "clangd",
"title": "Types: Show Base Classes",
"icon": "$(triangle-up)"
"icon": "$(type-hierarchy-super)"
},
{
"command": "clangd.typeHierarchy.viewChildren",
"category": "clangd",
"title": "Types: Show Derived Classes",
"icon": "$(triangle-down)"
"icon": "$(type-hierarchy-sub)"
},
{
"command": "clangd.typeHierarchy.close",
Expand Down
24 changes: 16 additions & 8 deletions src/type-hierarchy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,14 @@ const dummyNode: TypeHierarchyItem = {
};

class TypeHierarchyTreeItem extends vscode.TreeItem {
constructor(item: TypeHierarchyItem) {
constructor(item: TypeHierarchyItem, direction: TypeHierarchyDirection) {
super(item.name);
if (item.children) {
if (item.children.length === 0) {
this.description = item.detail;
this.iconPath = new vscode.ThemeIcon('symbol-class');
let subItems = direction === TypeHierarchyDirection.Children ? item.children
: item.parents;
if (subItems) {
if (subItems.length === 0) {
this.collapsibleState = vscode.TreeItemCollapsibleState.None;
} else {
this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
Expand Down Expand Up @@ -224,7 +228,7 @@ class TypeHierarchyProvider implements
}

public getTreeItem(element: TypeHierarchyItem): vscode.TreeItem {
return new TypeHierarchyTreeItem(element);
return new TypeHierarchyTreeItem(element, this.direction);
}

public getParent(element: TypeHierarchyItem): TypeHierarchyItem|null {
Expand Down Expand Up @@ -257,9 +261,15 @@ class TypeHierarchyProvider implements
await this.client.sendRequest(ResolveTypeHierarchyRequest.type, {
item: element,
direction: TypeHierarchyDirection.Children,
resolve: 1
resolve: 2 // We need 2 levels to understand collapsible state
});
element.children = resolved?.children;
// Cut-of existing sub-children to resolve them later
element.children?.forEach(x => {
if (x.children?.length !== 0) {
x.children = undefined;
}
});
}
return element.children ?? [];
}
Expand Down Expand Up @@ -317,9 +327,7 @@ class TypeHierarchyProvider implements

this._onDidChangeTreeData.fire(null);

// This focuses the "explorer" view container which contains the
// type hierarchy view.
vscode.commands.executeCommand('workbench.view.explorer');
vscode.commands.executeCommand('clangd.typeHierarchyView.focus');

// This expands and focuses the type hierarchy view.
// Focus the item on which the operation was invoked, not the
Expand Down