From 4e46d87a77a8d7c690f79355202d3e731a81f368 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 19 May 2023 16:40:29 +0100 Subject: [PATCH] Use name from file tree instead of calculating from path --- .../src/queries-panel/query-tree-data-provider.ts | 1 + .../ql-vscode/src/queries-panel/query-tree-view-item.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts b/extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts index dd90e56e2..0b92b4338 100644 --- a/extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts +++ b/extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts @@ -39,6 +39,7 @@ export class QueryTreeDataProvider fileTreeDirectory: FileTreeNode, ): QueryTreeViewItem { return new QueryTreeViewItem( + fileTreeDirectory.name, fileTreeDirectory.path, fileTreeDirectory.children.map(this.convertFileTreeNode.bind(this)), ); diff --git a/extensions/ql-vscode/src/queries-panel/query-tree-view-item.ts b/extensions/ql-vscode/src/queries-panel/query-tree-view-item.ts index f9adc5c00..17caea32d 100644 --- a/extensions/ql-vscode/src/queries-panel/query-tree-view-item.ts +++ b/extensions/ql-vscode/src/queries-panel/query-tree-view-item.ts @@ -1,9 +1,12 @@ import * as vscode from "vscode"; -import { basename } from "path"; export class QueryTreeViewItem extends vscode.TreeItem { - constructor(path: string, public readonly children: QueryTreeViewItem[]) { - super(basename(path)); + constructor( + name: string, + path: string, + public readonly children: QueryTreeViewItem[], + ) { + super(name); this.tooltip = path; this.collapsibleState = this.children.length ? vscode.TreeItemCollapsibleState.Collapsed