Rename to folder/file items

Author: robertbrignull

extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts

@@ -1,8 +1,8 @@
 import { Event, EventEmitter, TreeDataProvider, TreeItem } from "vscode";
 import {
   QueryTreeViewItem,
-  createQueryTreeLeafItem,
-  createQueryTreeNodeItem,
+  createQueryTreeFileItem,
+  createQueryTreeFolderItem,
   createQueryTreeTextItem,
 } from "./query-tree-view-item";
 import { DisposableObject } from "../common/disposable-object";
@@ -53,13 +53,13 @@ export class QueryTreeDataProvider
     fileTreeDirectory: FileTreeNode<string>,
   ): QueryTreeViewItem {
     if (fileTreeDirectory.children.length === 0) {
-      return createQueryTreeLeafItem(
+      return createQueryTreeFileItem(
         fileTreeDirectory.name,
         fileTreeDirectory.path,
         fileTreeDirectory.data,
       );
     } else {
-      return createQueryTreeNodeItem(
+      return createQueryTreeFolderItem(
         fileTreeDirectory.name,
         fileTreeDirectory.path,
         fileTreeDirectory.children.map(this.convertFileTreeNode.bind(this)),

extensions/ql-vscode/src/queries-panel/query-tree-view-item.ts

@@ -10,7 +10,7 @@ export class QueryTreeViewItem extends vscode.TreeItem {
   }
 }
 
-export function createQueryTreeNodeItem(
+export function createQueryTreeFolderItem(
   name: string,
   path: string,
   children: QueryTreeViewItem[],
@@ -22,7 +22,7 @@ export function createQueryTreeNodeItem(
   return item;
 }
 
-export function createQueryTreeLeafItem(
+export function createQueryTreeFileItem(
   name: string,
   path: string,
   language: string | undefined,

extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-tree-data-provider.test.ts

@@ -5,8 +5,8 @@ import {
 } from "../../../../src/common/file-tree-nodes";
 import { QueryTreeDataProvider } from "../../../../src/queries-panel/query-tree-data-provider";
 import {
-  createQueryTreeLeafItem,
-  createQueryTreeNodeItem,
+  createQueryTreeFileItem,
+  createQueryTreeFolderItem,
   createQueryTreeTextItem,
 } from "../../../../src/queries-panel/query-tree-view-item";
 
@@ -59,14 +59,14 @@ describe("QueryTreeDataProvider", () => {
       });
 
       expect(dataProvider.getChildren()).toEqual([
-        createQueryTreeNodeItem("dir1", "dir1", [
-          createQueryTreeNodeItem("dir2", "dir1/dir2", [
-            createQueryTreeLeafItem("file1", "dir1/dir2/file1", "javascript"),
-            createQueryTreeLeafItem("file2", "dir1/dir2/file2", "javascript"),
+        createQueryTreeFolderItem("dir1", "dir1", [
+          createQueryTreeFolderItem("dir2", "dir1/dir2", [
+            createQueryTreeFileItem("file1", "dir1/dir2/file1", "javascript"),
+            createQueryTreeFileItem("file2", "dir1/dir2/file2", "javascript"),
           ]),
         ]),
-        createQueryTreeNodeItem("dir3", "dir3", [
-          createQueryTreeLeafItem("file3", "dir3/file3", "javascript"),
+        createQueryTreeFolderItem("dir3", "dir3", [
+          createQueryTreeFileItem("file3", "dir3/file3", "javascript"),
         ]),
       ]);
     });