diff --git a/images/symbols/Class_16x.svg b/images/symbols/Class_16x.svg deleted file mode 100644 index 5ef1c6f8..00000000 --- a/images/symbols/Class_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Class_inverse_16x.svg b/images/symbols/Class_inverse_16x.svg deleted file mode 100644 index c43aad29..00000000 --- a/images/symbols/Class_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Constant_16x.svg b/images/symbols/Constant_16x.svg deleted file mode 100644 index ed2a1751..00000000 --- a/images/symbols/Constant_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Constant_inverse_16x.svg b/images/symbols/Constant_inverse_16x.svg deleted file mode 100644 index 173e427f..00000000 --- a/images/symbols/Constant_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/EnumItem_16x.svg b/images/symbols/EnumItem_16x.svg deleted file mode 100644 index aa901ec1..00000000 --- a/images/symbols/EnumItem_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/EnumItem_inverse_16x.svg b/images/symbols/EnumItem_inverse_16x.svg deleted file mode 100644 index 79175909..00000000 --- a/images/symbols/EnumItem_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Enumerator_16x.svg b/images/symbols/Enumerator_16x.svg deleted file mode 100644 index e4a9551f..00000000 --- a/images/symbols/Enumerator_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Enumerator_inverse_16x.svg b/images/symbols/Enumerator_inverse_16x.svg deleted file mode 100644 index d8e9f4f1..00000000 --- a/images/symbols/Enumerator_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Field_16x.svg b/images/symbols/Field_16x.svg deleted file mode 100644 index c6cb5362..00000000 --- a/images/symbols/Field_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Field_inverse_16x.svg b/images/symbols/Field_inverse_16x.svg deleted file mode 100644 index 5fc48cef..00000000 --- a/images/symbols/Field_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Interface_16x.svg b/images/symbols/Interface_16x.svg deleted file mode 100644 index 4651b065..00000000 --- a/images/symbols/Interface_16x.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/images/symbols/Interface_inverse_16x.svg b/images/symbols/Interface_inverse_16x.svg deleted file mode 100644 index b87a5c6f..00000000 --- a/images/symbols/Interface_inverse_16x.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/images/symbols/LocalVariable_16x.svg b/images/symbols/LocalVariable_16x.svg deleted file mode 100644 index 76927541..00000000 --- a/images/symbols/LocalVariable_16x.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - diff --git a/images/symbols/LocalVariable_inverse_16x.svg b/images/symbols/LocalVariable_inverse_16x.svg deleted file mode 100644 index 36800278..00000000 --- a/images/symbols/LocalVariable_inverse_16x.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/images/symbols/Method_16x.svg b/images/symbols/Method_16x.svg deleted file mode 100644 index 2be9daa5..00000000 --- a/images/symbols/Method_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Method_inverse_16x.svg b/images/symbols/Method_inverse_16x.svg deleted file mode 100644 index d3c2c571..00000000 --- a/images/symbols/Method_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Namespace_16x.svg b/images/symbols/Namespace_16x.svg deleted file mode 100644 index dab07dd5..00000000 --- a/images/symbols/Namespace_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Namespace_inverse_16x.svg b/images/symbols/Namespace_inverse_16x.svg deleted file mode 100644 index 9b9a44c5..00000000 --- a/images/symbols/Namespace_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Property_16x.svg b/images/symbols/Property_16x.svg deleted file mode 100644 index fb1c74cf..00000000 --- a/images/symbols/Property_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/Property_inverse_16x.svg b/images/symbols/Property_inverse_16x.svg deleted file mode 100644 index f9078189..00000000 --- a/images/symbols/Property_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/String_16x.svg b/images/symbols/String_16x.svg deleted file mode 100644 index 35e744ce..00000000 --- a/images/symbols/String_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/symbols/String_inverse_16x.svg b/images/symbols/String_inverse_16x.svg deleted file mode 100644 index 1ac0cf99..00000000 --- a/images/symbols/String_inverse_16x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 350f4c79..a186562f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,9 +61,9 @@ "dev": true }, "@types/vscode": { - "version": "1.42.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.42.0.tgz", - "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==", + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.43.0.tgz", + "integrity": "sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==", "dev": true }, "@types/xml2js": { @@ -261,9 +261,9 @@ "dev": true }, "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", "dev": true }, "acorn-dynamic-import": { @@ -644,9 +644,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -1039,8 +1039,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -1967,9 +1966,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -2452,8 +2451,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -2843,9 +2841,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -4403,8 +4401,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true }, "liftoff": { @@ -5382,9 +5379,9 @@ }, "dependencies": { "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -5772,9 +5769,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -5891,9 +5888,9 @@ } }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -6172,9 +6169,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -7233,9 +7230,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -7739,8 +7736,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -8496,9 +8492,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -9331,9 +9327,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -9505,8 +9501,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true }, "lcid": { diff --git a/package.json b/package.json index 34e48b59..86ca3483 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "explorer" ], "engines": { - "vscode": "^1.42.0" + "vscode": "^1.43.0" }, "repository": { "type": "git", @@ -273,7 +273,7 @@ "@types/minimatch": "^3.0.3", "@types/mocha": "^5.2.5", "@types/node": "^8.10.36", - "@types/vscode": "1.42.0", + "@types/vscode": "1.43.0", "@types/xml2js": "^0.4.3", "cross-env": "^5.2.0", "glob": "^7.1.4", diff --git a/src/utility.ts b/src/utility.ts index d57f3286..8245819a 100644 --- a/src/utility.ts +++ b/src/utility.ts @@ -73,12 +73,11 @@ export class Utility { } public static getDefaultWorkspaceFolder(): WorkspaceFolder | undefined { - const workspaceFolders: WorkspaceFolder[] | undefined = workspace.workspaceFolders; - if (workspaceFolders === undefined) { + if (workspace.workspaceFolders === undefined) { return undefined; } - if (workspaceFolders.length === 1) { - return workspaceFolders[0]; + if (workspace.workspaceFolders.length === 1) { + return workspace.workspaceFolders[0]; } if (window.activeTextEditor) { const activeWorkspaceFolder: WorkspaceFolder | undefined = workspace.getWorkspaceFolder(window.activeTextEditor.document.uri); diff --git a/src/views/PrimaryTypeNode.ts b/src/views/PrimaryTypeNode.ts index ce202f1e..7f473c3e 100644 --- a/src/views/PrimaryTypeNode.ts +++ b/src/views/PrimaryTypeNode.ts @@ -5,7 +5,6 @@ import { Command, commands, DocumentSymbol, SymbolInformation, SymbolKind, TextD import { createUuid, sendOperationEnd, sendOperationStart } from "vscode-extension-telemetry-wrapper"; import { Commands } from "../commands"; import { INodeData, TypeKind } from "../java/nodeData"; -import { Services } from "../services"; import { Settings } from "../settings"; import { DataNode } from "./dataNode"; import { DocumentSymbolNode } from "./documentSymbolNode"; @@ -48,24 +47,14 @@ export class PrimaryTypeNode extends DataNode { return result; } - protected get iconPath(): any { - // TODO: Refactor to `ThemeIcon` after VS Code February released. + protected get iconPath(): string | ThemeIcon { switch (this.nodeData.metaData[PrimaryTypeNode.K_TYPE_KIND]) { case TypeKind.Enum: - return { - light: Services.context.asAbsolutePath(`./images/symbols/Enumerator_16x.svg`), - dark: Services.context.asAbsolutePath(`./images/symbols/Enumerator_inverse_16x.svg`), - }; + return new ThemeIcon("symbol-enum"); case TypeKind.Interface: - return { - light: Services.context.asAbsolutePath(`./images/symbols/Interface_16x.svg`), - dark: Services.context.asAbsolutePath(`./images/symbols/Interface_inverse_16x.svg`), - }; + return new ThemeIcon("symbol-interface"); default: - return { - light: Services.context.asAbsolutePath(`./images/symbols/Class_16x.svg`), - dark: Services.context.asAbsolutePath(`./images/symbols/Class_inverse_16x.svg`), - }; + return new ThemeIcon("symbol-class"); } } diff --git a/src/views/baseSymbolNode.ts b/src/views/baseSymbolNode.ts index 8a734dd0..3308bb8d 100644 --- a/src/views/baseSymbolNode.ts +++ b/src/views/baseSymbolNode.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -import { Command, DocumentSymbol, Range, SymbolInformation, SymbolKind } from "vscode"; +import { Command, DocumentSymbol, Range, SymbolInformation, SymbolKind, ThemeIcon } from "vscode"; import { Commands } from "../commands"; import { Services } from "../services"; import { ExplorerNode } from "./explorerNode"; @@ -10,33 +10,30 @@ import { PrimaryTypeNode } from "./PrimaryTypeNode"; export abstract class BaseSymbolNode extends ExplorerNode { private static _iconMap: Map = new Map([ - [SymbolKind.Package, "Namespace"], - [SymbolKind.Class, "Class"], - [SymbolKind.Interface, "Interface"], - [SymbolKind.Enum, "Enumerator"], - [SymbolKind.EnumMember, "EnumItem"], - [SymbolKind.Constant, "Constant"], - [SymbolKind.Method, "Method"], - [SymbolKind.Function, "Method"], - [SymbolKind.Constructor, "Method"], - [SymbolKind.Field, "Field"], - [SymbolKind.Property, "Property"], - [SymbolKind.Variable, "LocalVariable"], - [SymbolKind.Constant, "Constant"], + [SymbolKind.Package, "namespace"], + [SymbolKind.Class, "class"], + [SymbolKind.Interface, "interface"], + [SymbolKind.Enum, "enum"], + [SymbolKind.EnumMember, "enum-member"], + [SymbolKind.Constant, "constant"], + [SymbolKind.Method, "method"], + [SymbolKind.Function, "method"], + [SymbolKind.Constructor, "method"], + [SymbolKind.Field, "field"], + [SymbolKind.Property, "property"], + [SymbolKind.Variable, "variable"], ]); constructor(public readonly symbolInfo: SymbolInformation | DocumentSymbol, parent: PrimaryTypeNode) { super(parent); } - protected get iconPath(): any { + protected get iconPath(): ThemeIcon { if (BaseSymbolNode._iconMap.has(this.symbolInfo.kind)) { - const iconFileName = BaseSymbolNode._iconMap.get(this.symbolInfo.kind); - return { - light: Services.context.asAbsolutePath(`./images/symbols/${iconFileName}_16x.svg`), - dark: Services.context.asAbsolutePath(`./images/symbols/${iconFileName}_inverse_16x.svg`), - }; + const symbolKind = BaseSymbolNode._iconMap.get(this.symbolInfo.kind); + return new ThemeIcon(`symbol-${symbolKind}`); } + return new ThemeIcon("symbol-misc"); } protected get command(): Command {