Support showing file path as description for external jar files (microsoft#209)

Vigilans · testforstephen · commit 93823445b151 · 2019-12-05T15:58:20.000+08:00
* Support description of treeitem

* Fix: HierarchicalPacageNode should reuse DataNode's method to create treeitem

* Support showing file path as description for external jar files
diff --git a/src/java/hierarchicalPackageNodeData.ts b/src/java/hierarchicalPackageNodeData.ts
@@ -18,15 +18,15 @@ export class HierarchicalPackageNodeData implements INodeData {
     private nodeData: INodeData = null;
 
     public get uri() {
-        return this.nodeData.uri;
+        return this.nodeData && this.nodeData.uri;
     }
 
     public get moduleName() {
-        return this.nodeData.moduleName;
+        return this.nodeData && this.nodeData.moduleName;
     }
 
     public get path() {
-        return this.nodeData.path;
+        return this.nodeData && this.nodeData.path;
     }
 
     public get kind() {
diff --git a/src/views/dataNode.ts b/src/views/dataNode.ts
@@ -14,6 +14,7 @@ export abstract class DataNode extends ExplorerNode {
     public getTreeItem(): TreeItem | Promise<TreeItem> {
         if (this._nodeData) {
             const item = new TreeItem(this._nodeData.name, this.hasChildren() ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None);
+            item.description = this.description;
             item.iconPath = this.iconPath;
             item.command = this.command;
             item.contextValue = this.computeContextValue();
@@ -80,6 +81,10 @@ export abstract class DataNode extends ExplorerNode {
         return true;
     }
 
+    protected get description(): string | boolean {
+        return undefined;
+    }
+
     protected get contextValue(): string {
         return undefined;
     }
diff --git a/src/views/hierarchicalPackageNode.ts b/src/views/hierarchicalPackageNode.ts
@@ -21,9 +21,7 @@ export class HierarchicalPackageNode extends PackageNode {
         if (this._nodeData) {
             const item = new TreeItem(this.getHierarchicalNodeData().displayName,
                 this.hasChildren() ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None);
-            item.iconPath = this.iconPath;
-            item.command = this.command;
-            return item;
+            return { ...super.getTreeItem(), ...item };
         }
     }
 
diff --git a/src/views/packageRootNode.ts b/src/views/packageRootNode.ts
@@ -42,6 +42,15 @@ export class PackageRootNode extends DataNode {
         return result;
     }
 
+    protected get description(): string | boolean {
+        const data = <IPackageRootNodeData>this.nodeData;
+        if (data.entryKind === PackageRootKind.K_BINARY) {
+            return data.path;
+        } else {
+            return undefined;
+        }
+    }
+
     protected get contextValue(): string {
         const data = <IPackageRootNodeData>this.nodeData;
         if (data.entryKind === PackageRootKind.K_BINARY) {

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ export class HierarchicalPackageNodeData implements INodeData {`
`18`	`18`	`private nodeData: INodeData = null;`
`19`	`19`
`20`	`20`	`public get uri() {`
`21`		`- return this.nodeData.uri;`
	`21`	`+ return this.nodeData && this.nodeData.uri;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public get moduleName() {`
`25`		`- return this.nodeData.moduleName;`
	`25`	`+ return this.nodeData && this.nodeData.moduleName;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public get path() {`
`29`		`- return this.nodeData.path;`
	`29`	`+ return this.nodeData && this.nodeData.path;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public get kind() {`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,7 @@ export class HierarchicalPackageNode extends PackageNode {`
`21`	`21`	`if (this._nodeData) {`
`22`	`22`	`const item = new TreeItem(this.getHierarchicalNodeData().displayName,`
`23`	`23`	`this.hasChildren() ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None);`
`24`		`- item.iconPath = this.iconPath;`
`25`		`- item.command = this.command;`
`26`		`- return item;`
	`24`	`+ return { ...super.getTreeItem(), ...item };`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`