From 36c2e09f9311e38849d8e809eaf338175bd0ff44 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Fri, 17 Jan 2020 12:51:02 +0800 Subject: [PATCH 1/5] bugfix: Can only modify the referenced libraries in invisible project --- .../src/com/microsoft/jdtls/ext/core/PackageCommand.java | 7 ++++--- .../com/microsoft/jdtls/ext/core/model/PackageNode.java | 3 +++ package.json | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java index 88b96f78..2d8b573a 100644 --- a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java +++ b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/PackageCommand.java @@ -247,8 +247,11 @@ private static List getContainers(PackageParams query, IProgressMon .collect(Collectors.toList()); boolean isReferencedLibrariesExist = Arrays.stream(references) .anyMatch(entry -> entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY || entry.getEntryKind() == IClasspathEntry.CPE_VARIABLE); - if (isReferencedLibrariesExist || !ProjectUtils.isVisibleProject(javaProject.getProject())) { + // Invisble project will always have the referenced libraries entry + if (!ProjectUtils.isVisibleProject(javaProject.getProject())) { result.add(PackageNode.REFERENCED_LIBRARIES_CONTAINER); + } else if (isReferencedLibrariesExist) { + result.add(PackageNode.IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER); } return result; } catch (CoreException e) { @@ -258,8 +261,6 @@ private static List getContainers(PackageParams query, IProgressMon return Collections.emptyList(); } - - private static List getPackageFragmentRoots(PackageParams query, IProgressMonitor pm) { ArrayList children = new ArrayList<>(); IJavaProject javaProject = getJavaProject(query.getProjectUri()); diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java index 2a363f7f..fd1c52fe 100644 --- a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java +++ b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/model/PackageNode.java @@ -40,11 +40,14 @@ */ public class PackageNode { private static final String REFERENCED_LIBRARIES_CONTAINER_NAME = "Referenced Libraries"; + private static final String IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER_NAME = "Referenced Libraries (Read-only)"; public static final String REFERENCED_LIBRARIES_PATH = "REFERENCED_LIBRARIES_PATH"; public static final String DEFAULT_PACKAGE_DISPLAYNAME = "(default package)"; public static final ContainerNode REFERENCED_LIBRARIES_CONTAINER = new ContainerNode(REFERENCED_LIBRARIES_CONTAINER_NAME, REFERENCED_LIBRARIES_PATH, NodeKind.CONTAINER, IClasspathEntry.CPE_CONTAINER); + public static final ContainerNode IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER = new ContainerNode(IMMUTABLE_REFERENCED_LIBRARIES_CONTAINER_NAME, REFERENCED_LIBRARIES_PATH, + NodeKind.CONTAINER, IClasspathEntry.CPE_CONTAINER); /** * The name of the PackageNode diff --git a/package.json b/package.json index 62026a23..4f3dc3f0 100644 --- a/package.json +++ b/package.json @@ -230,17 +230,17 @@ }, { "command": "java.project.addLibraries", - "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries/", + "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/", "group": "inline@0" }, { "command": "java.project.removeLibrary", - "when": "view == javaDependencyExplorer && viewItem =~ /java:jar\/referenced-libraries/", + "when": "view == javaDependencyExplorer && viewItem =~ /java:jar\/referenced-libraries\\+uri$/", "group": "inline" }, { "command": "java.project.refreshLibraries", - "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries/", + "when": "view == javaDependencyExplorer && viewItem =~ /java:container\/referenced-libraries$/", "group": "inline@1" } ] From 98f5cdfff118b113c0f76490750543d0f7936a43 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Fri, 13 Mar 2020 13:08:20 +0800 Subject: [PATCH 2/5] Migrate icons to codicon in dependency explorer --- images/dark/classfile.svg | 19 --------- images/dark/folder-open.svg | 13 ------- images/dark/folder.svg | 29 -------------- images/dark/jar.svg | 58 ---------------------------- images/dark/library.svg | 22 ----------- images/dark/package.svg | 18 --------- images/dark/packagefolder-open.svg | 25 ------------ images/dark/packagefolder.svg | 19 --------- images/dark/project-open.svg | 21 ---------- images/dark/project.svg | 39 ------------------- images/file-type-java.svg | 1 - images/jar_src.png | Bin 716 -> 0 bytes images/light/classfile.svg | 19 --------- images/light/folder-open.svg | 13 ------- images/light/folder.svg | 29 -------------- images/light/jar.svg | 57 --------------------------- images/light/library.svg | 23 ----------- images/light/package.svg | 18 --------- images/light/packagefolder-open.svg | 25 ------------ images/light/packagefolder.svg | 19 --------- images/light/project-open.svg | 21 ---------- images/light/project.svg | 39 ------------------- images/root-folder.svg | 1 - src/views/containerNode.ts | 6 +-- src/views/explorerNode.ts | 8 ---- src/views/folderNode.ts | 2 +- src/views/packageNode.ts | 5 ++- src/views/packageRootNode.ts | 7 ++-- src/views/projectNode.ts | 5 ++- src/views/workspaceNode.ts | 5 ++- 30 files changed, 17 insertions(+), 549 deletions(-) delete mode 100644 images/dark/classfile.svg delete mode 100644 images/dark/folder-open.svg delete mode 100644 images/dark/folder.svg delete mode 100644 images/dark/jar.svg delete mode 100644 images/dark/library.svg delete mode 100644 images/dark/package.svg delete mode 100644 images/dark/packagefolder-open.svg delete mode 100644 images/dark/packagefolder.svg delete mode 100644 images/dark/project-open.svg delete mode 100644 images/dark/project.svg delete mode 100644 images/file-type-java.svg delete mode 100644 images/jar_src.png delete mode 100644 images/light/classfile.svg delete mode 100644 images/light/folder-open.svg delete mode 100644 images/light/folder.svg delete mode 100644 images/light/jar.svg delete mode 100644 images/light/library.svg delete mode 100644 images/light/package.svg delete mode 100644 images/light/packagefolder-open.svg delete mode 100644 images/light/packagefolder.svg delete mode 100644 images/light/project-open.svg delete mode 100644 images/light/project.svg delete mode 100644 images/root-folder.svg diff --git a/images/dark/classfile.svg b/images/dark/classfile.svg deleted file mode 100644 index f391ced7..00000000 --- a/images/dark/classfile.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - diff --git a/images/dark/folder-open.svg b/images/dark/folder-open.svg deleted file mode 100644 index 6365721e..00000000 --- a/images/dark/folder-open.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/images/dark/folder.svg b/images/dark/folder.svg deleted file mode 100644 index e63998df..00000000 --- a/images/dark/folder.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/dark/jar.svg b/images/dark/jar.svg deleted file mode 100644 index 3451f7fe..00000000 --- a/images/dark/jar.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/dark/library.svg b/images/dark/library.svg deleted file mode 100644 index 0994dfae..00000000 --- a/images/dark/library.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/images/dark/package.svg b/images/dark/package.svg deleted file mode 100644 index 144fb8fa..00000000 --- a/images/dark/package.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/dark/packagefolder-open.svg b/images/dark/packagefolder-open.svg deleted file mode 100644 index 9ebfac44..00000000 --- a/images/dark/packagefolder-open.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/images/dark/packagefolder.svg b/images/dark/packagefolder.svg deleted file mode 100644 index 83c15f01..00000000 --- a/images/dark/packagefolder.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/dark/project-open.svg b/images/dark/project-open.svg deleted file mode 100644 index aeffcdd2..00000000 --- a/images/dark/project-open.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - diff --git a/images/dark/project.svg b/images/dark/project.svg deleted file mode 100644 index 9c002c4b..00000000 --- a/images/dark/project.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/file-type-java.svg b/images/file-type-java.svg deleted file mode 100644 index 14121c58..00000000 --- a/images/file-type-java.svg +++ /dev/null @@ -1 +0,0 @@ -file_type_java \ No newline at end of file diff --git a/images/jar_src.png b/images/jar_src.png deleted file mode 100644 index c4b8c12bac398ac810fb511b2270dbd5b449ee4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 716 zcmV;-0yF)IP)iHg%VhM6{mf7H zF|@k$7bS$f3_ZLjL_aG%EGZVGF_~g*NU>I=A|?nS9R$A`yhj1vB}c+?9iNAG3q=KH zhNbmJRe9DhD1||Fh;Wclj;Vn%!T}hbmZWD?C9(uV9f2rd zC({CCax{?!Cu9)jQt&YXmV7K`?Hd@_sPCf81I#Vx^o+IRu@=4 zjmuZBA)d@YZ=6L1^H9AUM@@qq$`L)NC+`XZea*+fu-_0MOY)LU zi*FIJ?pjY`CCHPLa%4J}TQKcp&@*Bx2y`_bM=+Mb1aY7w4qAsl<#Mquo^y#bisxJO zvLugzwyr{{nO)8c$m=SI)eKhF$s~UQwlyx7i*>s%O!5dEJ_aj+AS@0$dS1Qf8Wg&^ yyg+01Nfe{z;rJgk^=g-EyEW%1%CJN7KjH^^6hmeD7bL|10000 - - - - - - - - - - diff --git a/images/light/folder-open.svg b/images/light/folder-open.svg deleted file mode 100644 index d95bc063..00000000 --- a/images/light/folder-open.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/images/light/folder.svg b/images/light/folder.svg deleted file mode 100644 index 4ab8c359..00000000 --- a/images/light/folder.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/light/jar.svg b/images/light/jar.svg deleted file mode 100644 index 6ef32768..00000000 --- a/images/light/jar.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/light/library.svg b/images/light/library.svg deleted file mode 100644 index decac049..00000000 --- a/images/light/library.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/images/light/package.svg b/images/light/package.svg deleted file mode 100644 index ef5c5d1c..00000000 --- a/images/light/package.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/light/packagefolder-open.svg b/images/light/packagefolder-open.svg deleted file mode 100644 index 56654a9c..00000000 --- a/images/light/packagefolder-open.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/images/light/packagefolder.svg b/images/light/packagefolder.svg deleted file mode 100644 index 3b7e8e12..00000000 --- a/images/light/packagefolder.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/light/project-open.svg b/images/light/project-open.svg deleted file mode 100644 index 7fcab644..00000000 --- a/images/light/project-open.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - diff --git a/images/light/project.svg b/images/light/project.svg deleted file mode 100644 index f620fba6..00000000 --- a/images/light/project.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/root-folder.svg b/images/root-folder.svg deleted file mode 100644 index 0c5b2d53..00000000 --- a/images/root-folder.svg +++ /dev/null @@ -1 +0,0 @@ -default_root_folder \ No newline at end of file diff --git a/src/views/containerNode.ts b/src/views/containerNode.ts index 27839527..b547638a 100644 --- a/src/views/containerNode.ts +++ b/src/views/containerNode.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -import { Uri } from "vscode"; +import { ThemeIcon, Uri } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { DataNode } from "./dataNode"; @@ -36,7 +36,7 @@ export class ContainerNode extends DataNode { return `container/${this.name}`; } - protected get iconPath(): { light: string, dark: string } { - return ExplorerNode.resolveIconPath("library"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("inbox"); } } diff --git a/src/views/explorerNode.ts b/src/views/explorerNode.ts index da849ab5..a1187d48 100644 --- a/src/views/explorerNode.ts +++ b/src/views/explorerNode.ts @@ -2,17 +2,9 @@ // Licensed under the MIT license. import { Command, ProviderResult, TreeItem } from "vscode"; -import { Services } from "../services"; export abstract class ExplorerNode { - public static resolveIconPath(fileName: string): { light: string; dark: string } { - return { - light: Services.context.asAbsolutePath(`./images/light/${fileName}.svg`), - dark: Services.context.asAbsolutePath(`./images/dark/${fileName}.svg`), - }; - } - constructor(private _parent: ExplorerNode) { } diff --git a/src/views/folderNode.ts b/src/views/folderNode.ts index 504ec533..12605bf1 100644 --- a/src/views/folderNode.ts +++ b/src/views/folderNode.ts @@ -33,6 +33,6 @@ export class FolderNode extends DataNode { } protected get iconPath(): ThemeIcon { - return ExplorerNode.resolveIconPath("folder"); + return new ThemeIcon("folder"); } } diff --git a/src/views/packageNode.ts b/src/views/packageNode.ts index 5d549658..e08f250d 100644 --- a/src/views/packageNode.ts +++ b/src/views/packageNode.ts @@ -7,6 +7,7 @@ import { DataNode } from "./dataNode"; import { ExplorerNode } from "./explorerNode"; import { FileNode } from "./fileNode"; import { PrimaryTypeNode } from "./PrimaryTypeNode"; +import { ThemeIcon } from "vscode"; export class PackageNode extends DataNode { constructor(nodeData: INodeData, parent: DataNode, protected _project: DataNode, protected _rootNode: DataNode) { @@ -39,7 +40,7 @@ export class PackageNode extends DataNode { return result; } - protected get iconPath(): { light: string; dark: string } { - return ExplorerNode.resolveIconPath("package"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("symbol-namespace"); } } diff --git a/src/views/packageRootNode.ts b/src/views/packageRootNode.ts index 36f6d847..7b97f07e 100644 --- a/src/views/packageRootNode.ts +++ b/src/views/packageRootNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { IPackageRootNodeData, PackageRootKind } from "../java/packageRootNodeData"; @@ -63,12 +64,12 @@ export class PackageRootNode extends DataNode { } } - protected get iconPath(): { light: string; dark: string } { + protected get iconPath(): ThemeIcon { const data = this.nodeData; if (data.entryKind === PackageRootKind.K_BINARY) { - return ExplorerNode.resolveIconPath("jar"); + return new ThemeIcon("archive"); } else { - return ExplorerNode.resolveIconPath("packagefolder"); + return new ThemeIcon("file-submodule"); } } } diff --git a/src/views/projectNode.ts b/src/views/projectNode.ts index 01298b0e..4511d133 100644 --- a/src/views/projectNode.ts +++ b/src/views/projectNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { ContainerEntryKind, IContainerNodeData } from "../java/containerNodeData"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; @@ -65,7 +66,7 @@ export class ProjectNode extends DataNode { return result; } - protected get iconPath(): { light: string; dark: string } { - return ExplorerNode.resolveIconPath("project"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("project"); } } diff --git a/src/views/workspaceNode.ts b/src/views/workspaceNode.ts index 40a9f191..c9ab7f73 100644 --- a/src/views/workspaceNode.ts +++ b/src/views/workspaceNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData } from "../java/nodeData"; import { Services } from "../services"; @@ -27,7 +28,7 @@ export class WorkspaceNode extends DataNode { return result; } - protected get iconPath(): string { - return Services.context.asAbsolutePath("./images/root-folder.svg"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("root-folder"); } } From aa5857065dcb24eb7a66f8b77f1ae0cc4becfe34 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Fri, 13 Mar 2020 13:31:08 +0800 Subject: [PATCH 3/5] Fix lint error --- src/views/packageNode.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/packageNode.ts b/src/views/packageNode.ts index e08f250d..8fd004e7 100644 --- a/src/views/packageNode.ts +++ b/src/views/packageNode.ts @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { DataNode } from "./dataNode"; import { ExplorerNode } from "./explorerNode"; import { FileNode } from "./fileNode"; import { PrimaryTypeNode } from "./PrimaryTypeNode"; -import { ThemeIcon } from "vscode"; export class PackageNode extends DataNode { constructor(nodeData: INodeData, parent: DataNode, protected _project: DataNode, protected _rootNode: DataNode) { From ab57a6547f1b9b34038374f97edba9affec70957 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Fri, 13 Mar 2020 17:59:00 +0800 Subject: [PATCH 4/5] Address comments --- src/views/baseSymbolNode.ts | 2 +- src/views/containerNode.ts | 2 +- src/views/packageNode.ts | 2 +- src/views/packageRootNode.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/baseSymbolNode.ts b/src/views/baseSymbolNode.ts index 3308bb8d..78b49b04 100644 --- a/src/views/baseSymbolNode.ts +++ b/src/views/baseSymbolNode.ts @@ -10,7 +10,7 @@ import { PrimaryTypeNode } from "./PrimaryTypeNode"; export abstract class BaseSymbolNode extends ExplorerNode { private static _iconMap: Map = new Map([ - [SymbolKind.Package, "namespace"], + [SymbolKind.Package, "package"], [SymbolKind.Class, "class"], [SymbolKind.Interface, "interface"], [SymbolKind.Enum, "enum"], diff --git a/src/views/containerNode.ts b/src/views/containerNode.ts index b547638a..75a8da8d 100644 --- a/src/views/containerNode.ts +++ b/src/views/containerNode.ts @@ -37,6 +37,6 @@ export class ContainerNode extends DataNode { } protected get iconPath(): ThemeIcon { - return new ThemeIcon("inbox"); + return new ThemeIcon("files"); } } diff --git a/src/views/packageNode.ts b/src/views/packageNode.ts index 8fd004e7..978cf65f 100644 --- a/src/views/packageNode.ts +++ b/src/views/packageNode.ts @@ -41,6 +41,6 @@ export class PackageNode extends DataNode { } protected get iconPath(): ThemeIcon { - return new ThemeIcon("symbol-namespace"); + return new ThemeIcon("symbol-package"); } } diff --git a/src/views/packageRootNode.ts b/src/views/packageRootNode.ts index 7b97f07e..6823faea 100644 --- a/src/views/packageRootNode.ts +++ b/src/views/packageRootNode.ts @@ -67,7 +67,7 @@ export class PackageRootNode extends DataNode { protected get iconPath(): ThemeIcon { const data = this.nodeData; if (data.entryKind === PackageRootKind.K_BINARY) { - return new ThemeIcon("archive"); + return new ThemeIcon("file-zip"); } else { return new ThemeIcon("file-submodule"); } From 8be2d5789ce41f897400780cebf0714b412c1202 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Mon, 16 Mar 2020 12:38:48 +0800 Subject: [PATCH 5/5] Remove unused class: services --- package-lock.json | 15 ++++++++++----- src/extension.ts | 3 --- src/services.ts | 16 ---------------- src/views/baseSymbolNode.ts | 1 - src/views/workspaceNode.ts | 1 - 5 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 src/services.ts diff --git a/package-lock.json b/package-lock.json index a186562f..e7ff7d31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1039,7 +1039,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -2451,7 +2452,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -4401,7 +4403,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, "liftoff": { @@ -7736,7 +7739,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -9501,7 +9505,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, "lcid": { diff --git a/src/extension.ts b/src/extension.ts index 250b4c13..6e5ae1fc 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -3,10 +3,8 @@ import { commands, Extension, ExtensionContext, extensions } from "vscode"; import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation } from "vscode-extension-telemetry-wrapper"; -import { Commands } from "./commands"; import { LibraryController } from "./controllers/libraryController"; import { ProjectController } from "./controllers/projectController"; -import { Services } from "./services"; import { Settings } from "./settings"; import { DependencyExplorer } from "./views/dependencyExplorer"; @@ -18,7 +16,6 @@ export async function activate(context: ExtensionContext): Promise { function activateExtension(operationId: string, context: ExtensionContext) { commands.executeCommand("setContext", "extensionActivated", true); - Services.initialize(context); Settings.initialize(context); setMavenEnabledContext(); diff --git a/src/services.ts b/src/services.ts deleted file mode 100644 index b79c5745..00000000 --- a/src/services.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. - -import { ExtensionContext } from "vscode"; - -export class Services { - public static initialize(context: ExtensionContext) { - this._context = context; - } - - private static _context: ExtensionContext; - - static get context() { - return this._context; - } -} diff --git a/src/views/baseSymbolNode.ts b/src/views/baseSymbolNode.ts index 78b49b04..8ee30451 100644 --- a/src/views/baseSymbolNode.ts +++ b/src/views/baseSymbolNode.ts @@ -3,7 +3,6 @@ import { Command, DocumentSymbol, Range, SymbolInformation, SymbolKind, ThemeIcon } from "vscode"; import { Commands } from "../commands"; -import { Services } from "../services"; import { ExplorerNode } from "./explorerNode"; import { PrimaryTypeNode } from "./PrimaryTypeNode"; diff --git a/src/views/workspaceNode.ts b/src/views/workspaceNode.ts index c9ab7f73..78fd1085 100644 --- a/src/views/workspaceNode.ts +++ b/src/views/workspaceNode.ts @@ -4,7 +4,6 @@ import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData } from "../java/nodeData"; -import { Services } from "../services"; import { DataNode } from "./dataNode"; import { ExplorerNode } from "./explorerNode"; import { ProjectNode } from "./projectNode";