Update to new hierarchy APIs

Author: jacobdufault

package.json

@@ -25,26 +25,26 @@
     "views": {
       "explorer": [
         {
-          "id": "cquery.typeHierarchy",
-          "name": "Type Hierarchy",
-          "when": "extension.cquery.typeHierarchyVisible"
+          "id": "cquery.inheritanceHierarchy",
+          "name": "Inheritance Hierarchy",
+          "when": "extension.cquery.inheritanceHierarchyVisible"
         },
         {
-          "id": "cquery.callTree",
-          "name": "Call Tree",
-          "when": "extension.cquery.callTreeVisible"
+          "id": "cquery.callHierarchy",
+          "name": "Call Hierarchy",
+          "when": "extension.cquery.callHierarchyVisible"
         }
       ]
     },
     "menus": {
       "editor/context": [
         {
-          "command": "cquery.typeHierarchy",
+          "command": "cquery.inheritanceHierarchy",
           "when": "resourceLangId == cpp",
           "group": "[email protected]"
         },
         {
-          "command": "cquery.callTree",
+          "command": "cquery.callHierarchy",
           "when": "resourceLangId == cpp",
           "group": "[email protected]"
         },
@@ -66,13 +66,13 @@
       ],
       "view/title": [
         {
-          "command": "cquery.closeTypeHierarchy",
-          "when": "view == cquery.typeHierarchy",
+          "command": "cquery.closeinheritanceHierarchy",
+          "when": "view == cquery.inheritanceHierarchy",
           "group": "navigation"
         },
         {
-          "command": "cquery.closeCallTree",
-          "when": "view == cquery.callTree",
+          "command": "cquery.closecallHierarchy",
+          "when": "view == cquery.callHierarchy",
           "group": "navigation"
         }
       ],
@@ -84,11 +84,11 @@
       ],
       "commandPalette": [
         {
-          "command": "cquery.closeTypeHierarchy",
+          "command": "cquery.closeinheritanceHierarchy",
           "when": "false"
         },
         {
-          "command": "cquery.closeCallTree",
+          "command": "cquery.closecallHierarchy",
           "when": "false"
         },
         {
@@ -104,22 +104,22 @@
         "command": "cquery.freshenIndex"
       },
       {
-        "title": "Type Hierarchy",
+        "title": "Inheritance Hierarchy",
         "category": "cquery",
-        "command": "cquery.typeHierarchy"
+        "command": "cquery.inheritanceHierarchy"
       },
       {
         "title": "Close",
-        "command": "cquery.closeTypeHierarchy"
+        "command": "cquery.closeinheritanceHierarchy"
       },
       {
-        "title": "Call Tree",
+        "title": "Call Hierarchy",
         "category": "cquery",
-        "command": "cquery.callTree"
+        "command": "cquery.callHierarchy"
       },
       {
         "title": "Close",
-        "command": "cquery.closeCallTree"
+        "command": "cquery.closecallHierarchy"
       },
       {
         "title": "Show Variables",

src/callHierarchy.ts

@@ -0,0 +1,96 @@
+import { Event, EventEmitter, Location, TreeDataProvider, TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { LanguageClient } from 'vscode-languageclient/lib/main';
+import { parseUri } from './extension';
+
+
+enum CallType {
+  Normal = 0,
+  Base = 1,
+  Derived = 2,
+  All = 3 // Normal & Base & Derived
+}
+export class CallHierarchyNode {
+  // These properties come directly from the language server.
+  id: any
+  name: string
+  location: Location
+  callType: CallType
+
+  // If |numChildren| != |children.length|, then the node has not been expanded
+  // and is incomplete - we need to send a new request to expand it.
+  numChildren: number
+  children: CallHierarchyNode[]
+}
+
+export class CallHierarchyProvider implements TreeDataProvider<CallHierarchyNode> {
+  root: CallHierarchyNode;
+
+  constructor(
+    readonly languageClient: LanguageClient, readonly derivedDark: string,
+    readonly derivedLight: string, readonly baseDark: string,
+    readonly baseLight: string) { }
+
+  readonly onDidChangeEmitter: EventEmitter<any> = new EventEmitter<any>();
+  readonly onDidChangeTreeData: Event<any> = this.onDidChangeEmitter.event;
+
+  getTreeItem(element: CallHierarchyNode): TreeItem {
+    let collapseState = TreeItemCollapsibleState.None
+    if (element.numChildren > 0) {
+      if (element.children.length > 0)
+        collapseState = TreeItemCollapsibleState.Expanded;
+      else
+        collapseState = TreeItemCollapsibleState.Collapsed;
+    }
+
+    let light = '';
+    let dark = '';
+    if (element.callType == CallType.Base) {
+      light = this.baseLight;
+      dark = this.baseDark;
+    } else if (element.callType == CallType.Derived) {
+      light = this.derivedLight;
+      dark = this.derivedDark;
+    }
+
+    let label = element.name;
+    if (element.location) {
+      let path = parseUri(element.location.uri).path;
+      let name = path.substr(path.lastIndexOf('/') + 1);
+      label += ` (${name}:${element.location.range.start.line + 1})`;
+    }
+
+    return {
+      label: label,
+      collapsibleState: collapseState,
+      contextValue: 'cqueryGoto',
+      command: {
+        command: 'cquery.hackGotoForTreeView',
+        title: 'Goto',
+        arguments: [element, element.numChildren > 0]
+      },
+      iconPath: { light: light, dark: dark }
+    };
+  }
+
+  getChildren(element?: CallHierarchyNode): CallHierarchyNode[] | Thenable<CallHierarchyNode[]> {
+    if (!this.root)
+      return [];
+    if (!element)
+      return [this.root];
+    if (element.numChildren == element.children.length)
+      return element.children;
+
+    return this.languageClient
+      .sendRequest('$cquery/callHierarchy', {
+        id: element.id,
+        callee: false,
+        callType: CallType.All,
+        detailedName: false,
+        levels: 1
+      })
+      .then((result: CallHierarchyNode) => {
+        element.children = result.children;
+        return result.children;
+      });
+  }
+}