Skip to content

Remove unused codicons #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −13
Open

Remove unused codicons #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions patches/8952-draft.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 @@
<meta http-equiv="Content-Security-Policy" content="default-src http: 'unsafe-inline' 'unsafe-eval'">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="refactoring.css">
- <link rel="stylesheet" href="codicon.css">
<title>Refactor: Change Method Parameters...</title>
</head>

@@ -57,13 +56,16 @@
<div class="flex row">
<input type="text" data-bind="textInput: type" class="flex-grow">
<input type="text" data-bind="textInput: name" class="flex-grow">
- <button class="action-button codicon codicon-arrow-up" data-bind="click: $root.moveUpParameter"></button>
- <button class="action-button codicon codicon-arrow-down" data-bind="click: $root.moveDownParameter"></button>
- <button class="action-button codicon codicon-trash" data-bind="click: $root.removeParameter"></button>
+ <button class="action-button" title="Move up" data-bind="click: $root.moveUpParameter">&#9650;</button>
+ <button class="action-button" title="Move down" data-bind="click: $root.moveDownParameter">&#9660;</button>
+ <button class="action-button" title="Remove parameter" data-bind="click: $root.removeParameter">&#10006;</button>
</div>
</div>
+
<div class="add-param flex">
- <button id="addParam" class="silent-button codicon codicon-add full-width flex-grow" data-bind="click: addParameter"><span class="button-text vscode-font"> Add Parameter</span></button>
+ <button id="addParam" class="silent-button flex-grow" data-bind="click: addParameter">
+ &#10010; <span class="button-text vscode-font">Add Parameter</span>
+ </button>
</div>
<div class="section">
<label>Signature preview:</label>
12 changes: 5 additions & 7 deletions vscode/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 2 additions & 5 deletions vscode/src/webviews/nbWebviewHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ export const showHtmlPage = async (params: HtmlPageParams): Promise<void> => {
const match = /<title>(.*)<\/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;
Expand All @@ -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':
Expand Down