diff --git a/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts b/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts
index 3914c061a..c403c4201 100644
--- a/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts
+++ b/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts
@@ -18,6 +18,7 @@ import {
CLOSE_PLOTTER_WINDOW,
SHOW_PLOTTER_WINDOW,
} from '../../../common/ipc-communication';
+import { nls } from '@theia/core/lib/common/nls';
const queryString = require('query-string');
@@ -107,7 +108,12 @@ export class PlotterFrontendContribution extends Contribution {
if (wsPort) {
this.open(wsPort);
} else {
- this.messageService.error(`Couldn't open serial plotter`);
+ this.messageService.error(
+ nls.localize(
+ 'arduino/contributions/plotter/couldNotOpen',
+ "Couldn't open serial plotter"
+ )
+ );
}
}
diff --git a/arduino-ide-extension/src/browser/style/list-widget.css b/arduino-ide-extension/src/browser/style/list-widget.css
index f60159e34..843be61f9 100644
--- a/arduino-ide-extension/src/browser/style/list-widget.css
+++ b/arduino-ide-extension/src/browser/style/list-widget.css
@@ -111,13 +111,15 @@
font-weight: bold;
max-height: calc(1em + 4px);
color: var(--theia-button-foreground);
- content: 'INSTALLED';
+ content: attr(install);
+ text-transform: uppercase;
}
.component-list-item .header .installed:hover:before {
background-color: var(--theia-button-foreground);
color: var(--theia-button-background);
- content: 'UNINSTALL';
+ content: attr(uninstall);
+ text-transform: uppercase;
}
.component-list-item[min-width~="170px"] .footer {
diff --git a/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-result-tree-widget.ts b/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-result-tree-widget.ts
deleted file mode 100644
index e831cd402..000000000
--- a/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-result-tree-widget.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import {
- SearchInWorkspaceFileNode,
- SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget,
-} from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
-import { MEMORY_TEXT } from '@theia/core/lib/common/resource';
-
-/**
- * Workaround for https://github.com/eclipse-theia/theia/pull/9192/.
- */
-@injectable()
-export class SearchInWorkspaceResultTreeWidget extends TheiaSearchInWorkspaceResultTreeWidget {
- protected override async createReplacePreview(
- node: SearchInWorkspaceFileNode
- ): Promise
{
- const fileUri = new URI(node.fileUri).withScheme('file');
- const openedEditor = this.editorManager.all.find(
- ({ editor }) => editor.uri.toString() === fileUri.toString()
- );
- let content: string;
- if (openedEditor) {
- content = openedEditor.editor.document.getText();
- } else {
- const resource = await this.fileResourceResolver.resolve(fileUri);
- content = await resource.readContents();
- }
-
- const lines = content.split('\n');
- node.children.map((l) => {
- const leftPositionedNodes = node.children.filter(
- (rl) => rl.line === l.line && rl.character < l.character
- );
- const diff =
- (this._replaceTerm.length - this.searchTerm.length) *
- leftPositionedNodes.length;
- const start = lines[l.line - 1].substr(0, l.character - 1 + diff);
- const end = lines[l.line - 1].substr(l.character - 1 + diff + l.length);
- lines[l.line - 1] = start + this._replaceTerm + end;
- });
-
- return fileUri.withScheme(MEMORY_TEXT).withQuery(lines.join('\n'));
- }
-}
diff --git a/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-widget.tsx b/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-widget.tsx
deleted file mode 100644
index cae633024..000000000
--- a/arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-widget.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { injectable, postConstruct } from '@theia/core/shared/inversify';
-import * as React from '@theia/core/shared/react';
-import { Key, KeyCode } from '@theia/core/lib/browser';
-import { SearchInWorkspaceWidget as TheiaSearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
-
-/**
- * Workaround for https://github.com/eclipse-theia/theia/pull/9183.
- */
-@injectable()
-export class SearchInWorkspaceWidget extends TheiaSearchInWorkspaceWidget {
- @postConstruct()
- protected override init(): void {
- super.init();
- this.title.iconClass = 'fa fa-arduino-search';
- }
-
- protected override renderGlobField(kind: 'include' | 'exclude'): React.ReactNode {
- const currentValue = this.searchInWorkspaceOptions[kind];
- const value = (currentValue && currentValue.join(', ')) || '';
- return (
-
-
{'files to ' + kind}
-
{
- if (e.target) {
- const targetValue = (e.target as HTMLInputElement).value || '';
- let shouldSearch =
- Key.ENTER.keyCode ===
- KeyCode.createKeyCode(e.nativeEvent).key?.keyCode;
- const currentOptions = (this.searchInWorkspaceOptions[kind] || [])
- .slice()
- .map((s) => s.trim())
- .sort();
- const candidateOptions = this.splitOnComma(targetValue)
- .map((s) => s.trim())
- .sort();
- const sameAs = (left: string[], right: string[]) => {
- if (left.length !== right.length) {
- return false;
- }
- for (let i = 0; i < left.length; i++) {
- if (left[i] !== right[i]) {
- return false;
- }
- }
- return true;
- };
- if (!sameAs(currentOptions, candidateOptions)) {
- this.searchInWorkspaceOptions[kind] =
- this.splitOnComma(targetValue);
- shouldSearch = true;
- }
- if (shouldSearch) {
- this.resultTreeWidget.search(
- this.searchTerm,
- this.searchInWorkspaceOptions
- );
- }
- }
- }}
- onFocus={
- kind === 'include'
- ? this.handleFocusIncludesInputBox
- : this.handleFocusExcludesInputBox
- }
- onBlur={
- kind === 'include'
- ? this.handleBlurIncludesInputBox
- : this.handleBlurExcludesInputBox
- }
- >
-
);
diff --git a/arduino-ide-extension/src/common/protocol/boards-service.ts b/arduino-ide-extension/src/common/protocol/boards-service.ts
index 7be49725e..763fc9bd6 100644
--- a/arduino-ide-extension/src/common/protocol/boards-service.ts
+++ b/arduino-ide-extension/src/common/protocol/boards-service.ts
@@ -285,6 +285,29 @@ export namespace Port {
return false;
};
}
+
+ export namespace Protocols {
+ export const KnownProtocolLiterals = ['serial', 'network'] as const;
+ export type KnownProtocol = typeof KnownProtocolLiterals[number];
+ export namespace KnownProtocol {
+ export function is(protocol: unknown): protocol is KnownProtocol {
+ return (
+ typeof protocol === 'string' &&
+ KnownProtocolLiterals.indexOf(protocol as KnownProtocol) >= 0
+ );
+ }
+ }
+ export const ProtocolLabels: Record