diff --git a/build.xml b/build.xml
index d92bd7fe..29be2126 100644
--- a/build.xml
+++ b/build.xml
@@ -69,6 +69,7 @@
patches/8828.diff
patches/8829.diff
patches/8856-draft.diff
+ patches/8952-draft.diff
patches/disable-error-notification.diff
patches/mvn-sh.diff
patches/project-marker-jdk.diff
diff --git a/patches/8952-draft.diff b/patches/8952-draft.diff
new file mode 100644
index 00000000..5adab994
--- /dev/null
+++ b/patches/8952-draft.diff
@@ -0,0 +1,33 @@
+diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ui/ChangeMethodParameters.html b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ui/ChangeMethodParameters.html
+index 0f289cb1485f..bb4fea5e3551 100644
+--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ui/ChangeMethodParameters.html
++++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ui/ChangeMethodParameters.html
+@@ -26,7 +26,6 @@
+
+
+
+-
+ Refactor: Change Method Parameters...
+
+
+@@ -57,13 +56,16 @@
+
+
+
+-
+-
+-
++
++
++
+
+
++
+
+-
++
+
+
+
diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index b5d010ea..7fbaf3bf 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -22,7 +22,6 @@
"@types/node": "^18.19.64",
"@types/sinon": "^17.0.4",
"@types/vscode": "^1.84.0",
- "@vscode/codicons": "0.0.36",
"@vscode/test-electron": "^2.5.2",
"chai": "^4.5.0",
"esbuild": "^0.25.3",
@@ -80,6 +79,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.7.tgz",
"integrity": "sha512-BU2f9tlKQ5CAthiMIgpzAh4eDTLWo1mqi9jqE2OxMG0E/OM199VJt2q8BztTxpnSW0i1ymdwLXRJnYzvDM5r2w==",
"dev": true,
+ "peer": true,
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.27.1",
@@ -1024,6 +1024,7 @@
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.113.tgz",
"integrity": "sha512-TmSTE9vyebJ9vSEiU+P+0Sp4F5tMgjiEOZaQUW6wA3ODvi6uBgkHQ+EsIu0pbiKvf9QHEvyRCiaz03rV0b+IaA==",
"dev": true,
+ "peer": true,
"dependencies": {
"undici-types": "~5.26.4"
}
@@ -1050,12 +1051,6 @@
"integrity": "sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==",
"dev": true
},
- "node_modules/@vscode/codicons": {
- "version": "0.0.36",
- "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.36.tgz",
- "integrity": "sha512-wsNOvNMMJ2BY8rC2N2MNBG7yOowV3ov8KlvUE/AiVUlHKTfWsw3OgAOQduX7h0Un6GssKD3aoTVH+TF3DSQwKQ==",
- "dev": true
- },
"node_modules/@vscode/debugadapter": {
"version": "1.68.0",
"resolved": "https://registry.npmjs.org/@vscode/debugadapter/-/debugadapter-1.68.0.tgz",
@@ -1269,6 +1264,7 @@
"url": "https://github.com/sponsors/ai"
}
],
+ "peer": true,
"dependencies": {
"caniuse-lite": "^1.0.30001726",
"electron-to-chromium": "^1.5.173",
@@ -2621,6 +2617,7 @@
"resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz",
"integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==",
"dev": true,
+ "peer": true,
"dependencies": {
"@istanbuljs/load-nyc-config": "^1.0.0",
"@istanbuljs/schema": "^0.1.2",
@@ -3828,6 +3825,7 @@
"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
"dev": true,
"license": "Apache-2.0",
+ "peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
diff --git a/vscode/package.json b/vscode/package.json
index 6d80e89f..a9104344 100644
--- a/vscode/package.json
+++ b/vscode/package.json
@@ -923,7 +923,6 @@
"@types/node": "^18.19.64",
"@types/sinon": "^17.0.4",
"@types/vscode": "^1.84.0",
- "@vscode/codicons": "0.0.36",
"@vscode/test-electron": "^2.5.2",
"chai": "^4.5.0",
"esbuild": "^0.25.3",
diff --git a/vscode/src/webviews/nbWebviewHandler.ts b/vscode/src/webviews/nbWebviewHandler.ts
index f9397954..2080a32e 100644
--- a/vscode/src/webviews/nbWebviewHandler.ts
+++ b/vscode/src/webviews/nbWebviewHandler.ts
@@ -27,12 +27,10 @@ export const showHtmlPage = async (params: HtmlPageParams): Promise => {
const match = /(.*)<\/title>/i.exec(data);
const name = match && match.length > 1 ? match[1] : '';
const resourceDir = Uri.joinPath(extensionContext.getGlobalStorage(), params.id);
- // TODO: @vscode/codeicons is a devDependency not a prod dependency. So do we ever reach this code?
- const distPath = Uri.joinPath(extensionContext.getExtensionStorageUri(), 'node_modules', '@vscode/codicons', 'dist');
workspace.fs.createDirectory(resourceDir);
let view = window.createWebviewPanel('htmlView', name, ViewColumn.Beside, {
enableScripts: true,
- localResourceRoots: [resourceDir, distPath]
+ localResourceRoots: [resourceDir]
});
webviews.set(params.id, view.webview);
const resources = params.resources;
@@ -44,8 +42,7 @@ export const showHtmlPage = async (params: HtmlPageParams): Promise<void> => {
data = data.replace(`href="${resourceName}"`, `href="${view.webview.asWebviewUri(resourceUri)}"`);
}
}
- const codiconsUri = view.webview.asWebviewUri(Uri.joinPath(distPath, 'codicon.css'));
- view.webview.html = data.replace('href="codicon.css"', `href="${codiconsUri}"`);
+ view.webview.html = data;
view.webview.onDidReceiveMessage(message => {
switch (message.command) {
case 'dispose':