do not show error notification on sketch restore

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -304,7 +304,6 @@ import { StartupTasks } from './widgets/sketchbook/startup-task';
 import { IndexesUpdateProgress } from './contributions/indexes-update-progress';
 import { Daemon } from './contributions/daemon';
 import { FirstStartupInstaller } from './contributions/first-startup-installer';
-import { Notifications } from './contributions/notifications';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { InoLanguage } from './contributions/ino-language';
 import { SelectedBoard } from './contributions/selected-board';
@@ -705,7 +704,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, Daemon);
   Contribution.configure(bind, FirstStartupInstaller);
   Contribution.configure(bind, StartupTasks);
-  Contribution.configure(bind, Notifications);
   Contribution.configure(bind, OpenSketchFiles);
   Contribution.configure(bind, InoLanguage);
   Contribution.configure(bind, SelectedBoard);

arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx

@@ -3,14 +3,13 @@ import * as ReactDOM from '@theia/core/shared/react-dom';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
-import { BoardsConfig } from './boards-config';
+import { OpenBoardsConfig } from '../contributions/open-boards-config';
 import {
   BoardsServiceProvider,
   AvailableBoard,
 } from './boards-service-provider';
 import { nls } from '@theia/core/lib/common';
 import classNames from 'classnames';
-import { OpenBoardsConfig } from '../contributions/open-boards-config';
 
 export interface BoardsDropDownListCoords {
   readonly top: number;
@@ -177,7 +176,7 @@ export class BoardsToolBarItem extends React.Component<
     this.toDispose.dispose();
   }
 
-  protected readonly show = (event: React.MouseEvent<HTMLElement>) => {
+  protected readonly show = (event: React.MouseEvent<HTMLElement>): void => {
     const { currentTarget: element } = event;
     if (element instanceof HTMLElement) {
       if (this.state.coords === 'hidden') {
@@ -200,23 +199,24 @@ export class BoardsToolBarItem extends React.Component<
 
   override render(): React.ReactNode {
     const { coords, availableBoards } = this.state;
-    const boardsConfig = this.props.boardsServiceProvider.boardsConfig;
-    const title = BoardsConfig.Config.toString(boardsConfig, {
-      default: nls.localize(
-        'arduino/common/noBoardSelected',
-        'No board selected'
-      ),
-    });
-    const decorator = (() => {
-      const selectedBoard = availableBoards.find(({ selected }) => selected);
-      if (!selectedBoard || !selectedBoard.port) {
-        return 'fa fa-times notAttached';
-      }
-      if (selectedBoard.state === AvailableBoard.State.guessed) {
-        return 'fa fa-exclamation-triangle guessed';
-      }
-      return '';
-    })();
+    const selectedBoard = availableBoards.find(({ selected }) => selected);
+
+    const boardLabel =
+      selectedBoard?.name ||
+      nls.localize('arduino/board/selectBoard', 'Select Board');
+    const selectedPortLabel = portLabel(selectedBoard?.port?.address);
+
+    const isConnected = Boolean(
+      selectedBoard && AvailableBoard.hasPort(selectedBoard)
+    );
+    const protocolIcon = isConnected
+      ? iconNameFromProtocol(selectedBoard?.port?.protocol || '')
+      : null;
+    const protocolIconClassNames = classNames(
+      'arduino-boards-toolbar-item--protocol',
+      'fa',
+      protocolIcon
+    );
 
     return (
       <React.Fragment>
@@ -225,7 +225,7 @@ export class BoardsToolBarItem extends React.Component<
           title={selectedPortLabel}
           onClick={this.show}
         >
-          {protocolIcon && <div className={procolIconClassNames} />}
+          {protocolIcon && <div className={protocolIconClassNames} />}
           <div
             className={classNames(
               'arduino-boards-toolbar-item--label',
@@ -264,11 +264,10 @@ export class BoardsToolBarItem extends React.Component<
     );
   }
 
-  protected openDialog = () => {
+  protected openDialog = (): void => {
     this.props.commands.executeCommand(
       OpenBoardsConfig.Commands.OPEN_DIALOG.id
     );
-    this.setState({ coords: 'hidden' });
   };
 }
 export namespace BoardsToolBarItem {

arduino-ide-extension/src/browser/contributions/notifications.ts

@@ -1,4 +1,3 @@
-import { ApplicationError } from '@theia/core/lib/common/application-error';
 import { nls } from '@theia/core/lib/common/nls';
 import { injectable } from '@theia/core/shared/inversify';
 import type { EditorOpenerOptions } from '@theia/editor/lib/browser/editor-manager';
@@ -9,7 +8,6 @@ import {
   SketchContribution,
   URI,
 } from './contribution';
-import { Notifications } from './notifications';
 import { SaveAsSketch } from './save-as-sketch';
 
 @injectable()
@@ -60,7 +58,7 @@ export class OpenSketchFiles extends SketchContribution {
       }
     } catch (err) {
       if (SketchesError.NotFound.is(err)) {
-        this.openFallbackSketch(err);
+        this.openFallbackSketch();
       } else {
         console.error(err);
         const message =
@@ -74,36 +72,9 @@ export class OpenSketchFiles extends SketchContribution {
     }
   }
 
-  private async openFallbackSketch(
-    err: ApplicationError<
-      number,
-      {
-        uri: string;
-      }
-    >
-  ): Promise<void> {
+  private async openFallbackSketch(): Promise<void> {
     const sketch = await this.sketchService.createNewSketch();
-    this.workspaceService.open(
-      new URI(sketch.uri),
-      Object.assign(
-        {
-          preserveWindow: true,
-        },
-        {
-          tasks: [
-            {
-              command: Notifications.Commands.NOTIFY.id,
-              args: [
-                {
-                  type: 'error',
-                  message: err.message,
-                },
-              ],
-            },
-          ],
-        }
-      )
-    );
+    this.workspaceService.open(new URI(sketch.uri), { preserveWindow: true });
   }
 
   private async ensureOpened(

arduino-ide-extension/src/browser/contributions/open-sketch-files.ts

@@ -17,7 +17,6 @@ import { ConfigService } from '../../../common/protocol/config-service';
 import {
   SketchesService,
   Sketch,
-  SketchesError,
 } from '../../../common/protocol/sketches-service';
 import { BoardsServiceProvider } from '../../boards/boards-service-provider';
 import { BoardsConfig } from '../../boards/boards-config';
@@ -70,30 +69,12 @@ export class WorkspaceService extends TheiaWorkspaceService {
   ): Promise<FileStat | undefined> {
     const stat = await super.toFileStat(uri);
     if (!stat) {
-      return this.toFileStatWithNewSketchFallback(uri);
+      const newSketchUri = await this.sketchService.createNewSketch();
+      return this.toFileStat(newSketchUri.uri);
     }
     return stat;
   }
 
-  private async toFileStatWithNewSketchFallback(
-    uri: string | URI | undefined
-  ): Promise<FileStat | undefined> {
-    if (!uri) {
-      return;
-    }
-    try {
-      await this.sketchService.loadSketch(
-        uri instanceof URI ? uri.toString() : uri
-      );
-    } catch (err) {
-      if (SketchesError.NotFound.is(err)) {
-        this.messageService.error(err.message);
-      }
-    }
-    const newSketchUri = await this.sketchService.createNewSketch();
-    return this.toFileStat(newSketchUri.uri);
-  }
-
   // Was copied from the Theia implementation.
   // Unlike the default behavior, IDE2 does not check the existence of the workspace before open.
   protected override async doGetDefaultWorkspaceUri(): Promise<