From eca192f108b7e9635ad12e4112906812acac5300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 08:41:28 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump @types/vscode from 1.95.0 to 1.134.0 Bumps [@types/vscode](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode) from 1.95.0 to 1.134.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode) --- updated-dependencies: - dependency-name: "@types/vscode" dependency-version: 1.134.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7eab5597..15222f42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "@types/mocha": "^9.1.1", "@types/node": "20.x", "@types/semver": "^7.8.0", - "@types/vscode": "1.95.0", + "@types/vscode": "1.134.0", "@vscode/test-electron": "^3.1.0", "copy-webpack-plugin": "^14.0.0", "glob": "^7.2.3", @@ -845,9 +845,9 @@ "license": "MIT" }, "node_modules/@types/vscode": { - "version": "1.95.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.95.0.tgz", - "integrity": "sha512-0LBD8TEiNbet3NvWsmn59zLzOFu/txSlGxnv5yAFHCrhG9WvAnR3IvfHzMOs2aeWqgvNjq9pO99IUw8d3n+unw==", + "version": "1.134.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.134.0.tgz", + "integrity": "sha512-NDEu0hg4sF7+vvFsADsktqUJ6f80LHSZvVK2Ovo1XiQ0/VHck1O3zst+ZZyVA/uvz6vo6LcuoqU2q48YMqOwWw==", "dev": true, "license": "MIT" }, @@ -4667,9 +4667,9 @@ "dev": true }, "@types/vscode": { - "version": "1.95.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.95.0.tgz", - "integrity": "sha512-0LBD8TEiNbet3NvWsmn59zLzOFu/txSlGxnv5yAFHCrhG9WvAnR3IvfHzMOs2aeWqgvNjq9pO99IUw8d3n+unw==", + "version": "1.134.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.134.0.tgz", + "integrity": "sha512-NDEu0hg4sF7+vvFsADsktqUJ6f80LHSZvVK2Ovo1XiQ0/VHck1O3zst+ZZyVA/uvz6vo6LcuoqU2q48YMqOwWw==", "dev": true }, "@vscode/extension-telemetry": { diff --git a/package.json b/package.json index 62d99312..cfc866fb 100644 --- a/package.json +++ b/package.json @@ -1205,7 +1205,7 @@ "@types/mocha": "^9.1.1", "@types/node": "20.x", "@types/semver": "^7.8.0", - "@types/vscode": "1.95.0", + "@types/vscode": "1.134.0", "@vscode/test-electron": "^3.1.0", "copy-webpack-plugin": "^14.0.0", "glob": "^7.2.3", From a04d98228b4b631e91963516e893c72819000432 Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Sun, 6 Sep 2026 07:53:32 +0000 Subject: [PATCH 2/3] fix: support updated VS Code API types Align the extension engine and minimum-version test with @types/vscode 1.134.0, and use the exported IconPath contract. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- src/views/PrimaryTypeNode.ts | 2 +- src/views/dataNode.ts | 4 ++-- test/index.ts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fa7104ad..9a416b2f 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ You can turn these reminders on or off at any time with the `java.dependency.ena ## Requirements -- VS Code (version 1.95.0+) +- VS Code (version 1.134.0+) - [Language Support for Java by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java) diff --git a/package-lock.json b/package-lock.json index 15222f42..a6ffe0fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "webpack-cli": "^7.2.2" }, "engines": { - "vscode": "^1.95.0" + "vscode": "^1.134.0" } }, "node_modules/@babel/code-frame": { diff --git a/package.json b/package.json index cfc866fb..8534af78 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "explorer" ], "engines": { - "vscode": "^1.95.0" + "vscode": "^1.134.0" }, "repository": { "type": "git", diff --git a/src/views/PrimaryTypeNode.ts b/src/views/PrimaryTypeNode.ts index 0d80bf8b..76832c40 100644 --- a/src/views/PrimaryTypeNode.ts +++ b/src/views/PrimaryTypeNode.ts @@ -67,7 +67,7 @@ export class PrimaryTypeNode extends DataNode { return result; } - protected get iconPath(): string | ThemeIcon { + protected get iconPath(): ThemeIcon { switch (this.nodeData.metaData?.[PrimaryTypeNode.K_TYPE_KIND]) { case TypeKind.Enum: return new ThemeIcon("symbol-enum"); diff --git a/src/views/dataNode.ts b/src/views/dataNode.ts index 200abf13..f38e598c 100644 --- a/src/views/dataNode.ts +++ b/src/views/dataNode.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import * as _ from "lodash"; -import { ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from "vscode"; +import { IconPath, TreeItem, TreeItemCollapsibleState, Uri } from "vscode"; import { INodeData, NodeKind } from "../java/nodeData"; import { explorerLock } from "../utils/Lock"; import { ExplorerNode } from "./explorerNode"; @@ -129,7 +129,7 @@ export abstract class DataNode extends ExplorerNode { return undefined; } - protected abstract get iconPath(): string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon; + protected abstract get iconPath(): IconPath; protected abstract loadData(): Promise; diff --git a/test/index.ts b/test/index.ts index a08d7358..6e759631 100644 --- a/test/index.ts +++ b/test/index.ts @@ -12,7 +12,7 @@ async function main(): Promise { // test fails in macOS since the limitation of path length // See: https://github.com/microsoft/vscode/issues/86382#issuecomment-593765388 const userDir = fs.mkdtempSync(path.join(os.tmpdir(), "vscode-user")); - const vscodeExecutablePath = await downloadAndUnzipVSCode(); + const vscodeExecutablePath = await downloadAndUnzipVSCode("1.134.0"); // Resolve redhat.java dependency const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath); From 145e1e4c0e3a4ad16fa5ac9df540416b3d1e6e5b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Sep 2026 06:13:00 +0000 Subject: [PATCH 3/3] Use latest VS Code in integration tests Co-authored-by: chagong <831821+chagong@users.noreply.github.com> --- test/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/index.ts b/test/index.ts index 6e759631..a08d7358 100644 --- a/test/index.ts +++ b/test/index.ts @@ -12,7 +12,7 @@ async function main(): Promise { // test fails in macOS since the limitation of path length // See: https://github.com/microsoft/vscode/issues/86382#issuecomment-593765388 const userDir = fs.mkdtempSync(path.join(os.tmpdir(), "vscode-user")); - const vscodeExecutablePath = await downloadAndUnzipVSCode("1.134.0"); + const vscodeExecutablePath = await downloadAndUnzipVSCode(); // Resolve redhat.java dependency const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);