Removed custom icons in favor of ThemeIcon references

Signed-off-by: Owen Farrell <[email protected]>

README.md

@@ -62,7 +62,7 @@ JSON data (or complex data structures, such as a map) is presented through the U
 
 ## Requirements
 
-Running this extension requires VisualStuido Code version 1.30.0 (November 2018) or later.
+Running this extension requires VisualStuido Code version 1.42.0 (January 2020) or later.
 
 ## Extension Settings
 

package.json

@@ -3,7 +3,7 @@
     "version": "2.2.3",
     "publisher": "owenfarrell",
     "engines": {
-        "vscode": "^1.30.0"
+        "vscode": "^1.42.0"
     },
     "license": "MIT",
     "displayName": "HashiCorp Vault",
@@ -58,19 +58,13 @@
                 "command": "vault.browse",
                 "title": "Browse Path",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/browse.svg",
-                    "dark": "resources/dark/command/browse.svg"
-                }
+                "icon": "$(search)"
             },
             {
                 "command": "vault.connect",
                 "title": "Connect to Server",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/connect.svg",
-                    "dark": "resources/dark/command/connect.svg"
-                }
+                "icon": "$(plus)"
             },
             {
                 "command": "vault.disconnect",
@@ -85,28 +79,19 @@
                 "command": "vault.delete",
                 "title": "Delete Secret",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/delete.svg",
-                    "dark": "resources/dark/command/delete.svg"
-                }
+                "icon": "$(close)"
             },
             {
                 "command": "vault.list",
                 "title": "Refresh",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/refresh.svg",
-                    "dark": "resources/dark/command/refresh.svg"
-                }
+                "icon": "$(refresh)"
             },
             {
                 "command": "vault.read",
                 "title": "Read Secret",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/read.svg",
-                    "dark": "resources/dark/command/read.svg"
-                }
+                "icon": "$(link-external)"
             },
             {
                 "command": "vault.reconnect",
@@ -130,10 +115,7 @@
                 "command": "vault.write",
                 "title": "Write Secret",
                 "category": "Vault",
-                "icon": {
-                    "light": "resources/light/command/edit.svg",
-                    "dark": "resources/dark/command/edit.svg"
-                }
+                "icon": "$(edit)"
             }
         ],
         "menus": {
@@ -265,7 +247,7 @@
         "@types/request": "^2.48.5",
         "@types/uuid": "^8.0.0",
         "@types/validator": "^13.0.0",
-        "@types/vscode": "1.30.0",
+        "@types/vscode": "1.42.0",
         "@typescript-eslint/eslint-plugin": "^2.34.0",
         "@typescript-eslint/parser": "^2.34.0",
         "ajv": "^6.12.4",

src/view/secret.ts

@@ -1,7 +1,6 @@
 'use strict';
 
 import * as commands from 'src/commands';
-import * as path from 'path';
 import * as vscode from 'vscode';
 
 import { VaultTreeItem } from './treeitem';
@@ -12,10 +11,7 @@ export class VaultSecretTreeItem extends VaultTreeItem {
     //#region Constructors
     constructor(label: string, parent: VaultTreeItem) {
         super(label, parent, vscode.TreeItemCollapsibleState.None);
-        this.iconPath = this._defaultIconPath = {
-            light: path.join(__dirname, '..', 'resources', 'light', 'tree', 'secret.svg'),
-            dark: path.join(__dirname, '..', 'resources', 'dark', 'tree', 'secret.svg')
-        };
+        this.iconPath = this._defaultIcon = vscode.ThemeIcon.File;
         this.path = parent.path + label;
     }
     //#endregion

src/view/server.ts

@@ -3,7 +3,6 @@
 import * as adaptors from 'src/adaptors';
 import * as model from 'src/model';
 import * as nv from 'node-vault';
-import * as path from 'path';
 import * as vscode from 'vscode';
 
 import { formatPath, OPTIONAL_TRAILING_SLASH, PATH_SEPARATOR, splitPath } from 'src/util';
@@ -22,10 +21,7 @@ export class VaultServerTreeItem extends VaultTreeItem {
         super(session.name);
         this.children = [];
         this.contextValue = VaultServerTreeItem.DISCONNECTED_CONTEXT;
-        this.iconPath = this._defaultIconPath = {
-            light: path.join(__dirname, '..', 'resources', 'light', 'tree', 'server.svg'),
-            dark: path.join(__dirname, '..', 'resources', 'dark', 'tree', 'server.svg')
-        };
+        this.iconPath = this._defaultIcon = new vscode.ThemeIcon('server');
         this.id = this.id.replace(OPTIONAL_TRAILING_SLASH, PATH_SEPARATOR);
         this.session = session;
         // TODO Re-add support for custom options

src/view/shell.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import * as path from 'path';
+import * as vscode from 'vscode';
 
 import { VaultTreeItem } from './treeitem';
 
@@ -10,10 +10,7 @@ export class VaultShellTreeItem extends VaultTreeItem {
     //#region Constructors
     constructor(label: string, parent: VaultTreeItem) {
         super(label, parent);
-        this.iconPath = this._defaultIconPath = {
-            light: path.join(__dirname, '..', 'resources', 'light', 'tree', 'folder.svg'),
-            dark: path.join(__dirname, '..', 'resources', 'dark', 'tree', 'folder.svg')
-        };
+        this.iconPath = this._defaultIcon = new vscode.ThemeIcon('folder-opened');
         this.path = parent.path + label;
     }
     //#endregion

src/view/treeitem.ts

@@ -1,7 +1,6 @@
 'use strict';
 
 import * as nv from 'node-vault';
-import * as path from 'path';
 import * as vscode from 'vscode';
 
 import { PATH_SEPARATOR } from 'src/util';
@@ -12,14 +11,10 @@ export interface TreeItemIconPath {
 }
 
 export abstract class VaultTreeItem extends vscode.TreeItem {
-    protected static readonly WARNING_ICON: TreeItemIconPath = {
-        light: path.join(__dirname, '..', 'resources', 'light', 'tree', 'warning.svg'),
-        dark: path.join(__dirname, '..', 'resources', 'dark', 'tree', 'warning.svg')
-    };
-
+    protected static readonly WARNING_ICON = new vscode.ThemeIcon('warning');
     //#region Attributes
     private _children: VaultTreeItem[];
-    protected _defaultIconPath : TreeItemIconPath;
+    protected _defaultIcon : vscode.ThemeIcon;
     readonly parent: VaultTreeItem;
     path: string = '';
     //#endregion
@@ -82,7 +77,7 @@ export abstract class VaultTreeItem extends vscode.TreeItem {
         }
         else {
             // Update the icon to use the default icon
-            this.iconPath = this._defaultIconPath;
+            this.iconPath = this._defaultIcon;
             // If the specified value is empty
             if (this._children.length === 0) {
                 // Update the collapsable state