Merge remote-tracking branch 'upstream/main'

Author: github-actions

arduino-ide-extension/src/browser/serial/monitor/monitor-utils.ts

@@ -67,3 +67,7 @@ export function truncateLines(
   }
   return [lines, charCount];
 }
+
+export function joinLines(lines: Line[]): string {
+  return lines.map((line: Line) => line.message).join('');
+}

arduino-ide-extension/src/browser/serial/monitor/monitor-view-contribution.tsx

@@ -52,6 +52,9 @@ export namespace SerialMonitor {
       },
       'vscode/output.contribution/clearOutput.label'
     );
+    export const COPY_OUTPUT = {
+      id: 'serial-monitor-copy-output',
+    };
   }
 }
 
@@ -149,6 +152,12 @@ export class MonitorViewContribution
         'Clear Output'
       ),
     });
+    registry.registerItem({
+      id: SerialMonitor.Commands.COPY_OUTPUT.id,
+      command: SerialMonitor.Commands.COPY_OUTPUT.id,
+      icon: codicon('copy'),
+      tooltip: nls.localize('arduino/serial/copyOutput', 'Copy Output'),
+    });
   }
 
   override registerCommands(commands: CommandRegistry): void {
@@ -161,6 +170,15 @@ export class MonitorViewContribution
         }
       },
     });
+    commands.registerCommand(SerialMonitor.Commands.COPY_OUTPUT, {
+      isEnabled: (widget) => widget instanceof MonitorWidget,
+      isVisible: (widget) => widget instanceof MonitorWidget,
+      execute: (widget) => {
+        if (widget instanceof MonitorWidget) {
+          widget.copyOutput();
+        }
+      },
+    });
     if (this.toggleCommand) {
       commands.registerCommand(this.toggleCommand, {
         execute: () => this.toggle(),

arduino-ide-extension/src/browser/serial/monitor/monitor-widget.tsx

@@ -28,6 +28,7 @@ import {
 import { MonitorModel } from '../../monitor-model';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { serialMonitorWidgetLabel } from '../../../common/nls';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 
 @injectable()
 export class MonitorWidget extends ReactWidget {
@@ -47,6 +48,7 @@ export class MonitorWidget extends ReactWidget {
    */
   protected closing = false;
   protected readonly clearOutputEmitter = new Emitter<void>();
+  protected readonly copyOutputEmitter = new Emitter<void>();
 
   @inject(MonitorModel)
   private readonly monitorModel: MonitorModel;
@@ -56,6 +58,8 @@ export class MonitorWidget extends ReactWidget {
   private readonly boardsServiceProvider: BoardsServiceProvider;
   @inject(FrontendApplicationStateService)
   private readonly appStateService: FrontendApplicationStateService;
+  @inject(ClipboardService)
+  private readonly clipboardService: ClipboardService;
 
   private readonly toDisposeOnReset: DisposableCollection;
 
@@ -102,6 +106,10 @@ export class MonitorWidget extends ReactWidget {
     this.clearOutputEmitter.fire(undefined);
     this.update();
   }
+  
+  copyOutput(): void {
+    this.copyOutputEmitter.fire();
+  }
 
   override dispose(): void {
     this.toDisposeOnReset.dispose();
@@ -247,6 +255,8 @@ export class MonitorWidget extends ReactWidget {
             monitorModel={this.monitorModel}
             monitorManagerProxy={this.monitorManagerProxy}
             clearConsoleEvent={this.clearOutputEmitter.event}
+            copyOutputEvent={this.copyOutputEmitter.event}
+            clipboardService={this.clipboardService}
             height={Math.floor(this.widgetHeight - 50)}
           />
         </div>

arduino-ide-extension/src/browser/serial/monitor/serial-monitor-send-output.tsx

@@ -3,9 +3,10 @@ import { Event } from '@theia/core/lib/common/event';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { areEqual, FixedSizeList as List } from 'react-window';
 import dateFormat from 'dateformat';
-import { messagesToLines, truncateLines } from './monitor-utils';
+import { messagesToLines, truncateLines, joinLines } from './monitor-utils';
 import { MonitorManagerProxyClient } from '../../../common/protocol';
 import { MonitorModel } from '../../monitor-model';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 
 export type Line = { message: string; timestamp?: Date; lineLen: number };
 
@@ -74,6 +75,9 @@ export class SerialMonitorOutput extends React.Component<
       this.props.clearConsoleEvent(() =>
         this.setState({ lines: [], charCount: 0 })
       ),
+      this.props.copyOutputEvent(() => 
+        this.props.clipboardService.writeText(joinLines(this.state.lines))
+      ),
       this.props.monitorModel.onChange(({ property }) => {
         if (property === 'timestamp') {
           const { timestamp } = this.props.monitorModel;
@@ -130,6 +134,8 @@ export namespace SerialMonitorOutput {
     readonly monitorModel: MonitorModel;
     readonly monitorManagerProxy: MonitorManagerProxyClient;
     readonly clearConsoleEvent: Event<void>;
+    readonly copyOutputEvent: Event<void>;
+    readonly clipboardService: ClipboardService;
     readonly height: number;
   }
 

arduino-ide-extension/src/test/browser/monitor-utils.test.ts

@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import {
   messagesToLines,
   truncateLines,
+  joinLines,
 } from '../../browser/serial/monitor/monitor-utils';
 import { Line } from '../../browser/serial/monitor/serial-monitor-send-output';
 import { set, reset } from 'mockdate';
@@ -15,13 +16,15 @@ type TestLine = {
     charCount: number;
     maxCharacters?: number;
   };
+  expectedJoined?: string;
 };
 
 const date = new Date();
 const testLines: TestLine[] = [
   {
     messages: ['Hello'],
     expected: { lines: [{ message: 'Hello', lineLen: 5 }], charCount: 5 },
+    expectedJoined: 'Hello',
   },
   {
     messages: ['Hello', 'Dog!'],
@@ -36,6 +39,7 @@ const testLines: TestLine[] = [
       ],
       charCount: 10,
     },
+    expectedJoined: 'Hello\nDog!'
   },
   {
     messages: ['Dog!'],
@@ -67,6 +71,7 @@ const testLines: TestLine[] = [
         { message: "You're a good boy!", lineLen: 8 },
       ],
     },
+    expectedJoined: "Hello Dog!\n Who's a good boy?\nYou're a good boy!",
   },
   {
     messages: ['boy?\n', "You're a good boy!"],
@@ -116,6 +121,7 @@ const testLines: TestLine[] = [
         { message: 'Yo', lineLen: 2 },
       ],
     },
+    expectedJoined: "Hello Dog!\nWho's a good boy?\nYo",
   },
 ];
 
@@ -165,6 +171,10 @@ describe('Monitor Utils', () => {
           });
           expect(totalCharCount).to.equal(charCount);
         }
+        if (testLine.expectedJoined) {
+          const joined_str = joinLines(testLine.expected.lines);
+          expect(joined_str).to.equal(testLine.expectedJoined);
+        }
       });
     });
   });

docs/CONTRIBUTING.md

@@ -16,12 +16,12 @@ There are several ways you can get involved:
 | Monetary                                  | [Buy official products][store]                                   |
 
 [forum]: https://forum.arduino.cc
-[issues]: contributor-guide/issues.md#issue-report-guide
-[beta-testing]: contributor-guide/beta-testing.md#beta-testing-guide
-[translate]: contributor-guide/translation.md#translator-guide
-[prs]: contributor-guide/pull-requests.md#pull-request-guide
+[issues]: /docs/contributor-guide/issues.md#issue-report-guide
+[beta-testing]: /docs/contributor-guide/beta-testing.md#beta-testing-guide
+[translate]: /docs/contributor-guide/translation.md#translator-guide
+[prs]: /docs/contributor-guide/pull-requests.md#pull-request-guide
 [store]: https://store.arduino.cc
 
 ## Resources
 
-- [**Development Guide**](development.md#development-guide)
+- [**Development Guide**](/docs/development.md#development-guide)

docs/contributor-guide/translation.md

@@ -30,7 +30,9 @@ The text of the Arduino IDE application can be translated to the following langu
 
 ---
 
-⚠ Unfortunately the 3rd party localization system used by the Arduino IDE application imposes a technical limitation to that set of languages. For this reason, we are unable to add support to Arduino IDE for additional languages (see [`arduino/arduino-ide#1447`](https://github.com/arduino/arduino-ide/issues/1447) for details).
+⚠ Unfortunately the 3rd party localization framework used by the Arduino IDE application imposes a technical restriction to that set of languages. Unless a language is supported by that framework, it cannot be supported in the Arduino IDE. For this reason, we are currently unable to add support to Arduino IDE for additional languages (see [`arduino/arduino-ide#1447`](https://github.com/arduino/arduino-ide/issues/1447) for details).
+If a new language becomes available through the said framework, it will be added to the above list. When that happens, we may consider adding support for that language to Arduino IDE.
+Meanwhile we will continue to accept contributions for other languages, but be aware that we cannot say if and when those languages will become available in Arduino IDE.
 
 There is no technical limitation on the set of languages to which **Arduino CLI** can be translated. If you would like to contribute translations for a language not on the above list, you are welcome to [contribute to the **Arduino CLI** project](#arduino-cli-text).
 

i18n/en.json

@@ -435,6 +435,7 @@
       "autoscroll": "Autoscroll",
       "carriageReturn": "Carriage Return",
       "connecting": "Connecting to '{0}' on '{1}'...",
+      "copyOutput": "Copy Output",
       "message": "Message (Enter to send message to '{0}' on '{1}')",
       "newLine": "New Line",
       "newLineCarriageReturn": "Both NL & CR",