fixed save-as. added sketchload

Signed-off-by: Akos Kitta <kittaakos@typefox.io>

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -260,13 +260,11 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     }
 
     protected async openSketchFiles(uri: string): Promise<void> {
-        const uris = await this.sketchService.getSketchFiles(uri);
-        for (const uri of uris) {
+        const sketch = await this.sketchService.loadSketch(uri);
+        await this.editorManager.open(new URI(sketch.mainFileUri));
+        for (const uri of [...sketch.otherSketchFileUris, ...sketch.additionalFileUris]) {
             await this.editorManager.open(new URI(uri));
         }
-        if (uris.length) {
-            await this.editorManager.open(new URI(uris[0])); // Make sure the sketch file has the focus.
-        }
     }
 
     registerColors(colors: ColorRegistry): void {
@@ -313,6 +311,24 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                     hc: 'activityBar.inactiveForeground'
                 },
                 description: 'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.'
+            },
+            {
+                id: 'arduino.output.background',
+                defaults: {
+                    dark: 'editorWidget.background',
+                    light: 'editorWidget.background',
+                    hc: 'editorWidget.background'
+                },
+                description: 'Background color of the Output view.'
+            },
+            {
+                id: 'arduino.output.foreground',
+                defaults: {
+                    dark: 'editorWidget.foreground',
+                    light: 'editorWidget.foreground',
+                    hc: 'editorWidget.foreground'
+                },
+                description: 'Color of the text in the Output view.'
             }
         );
     }

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

@@ -15,6 +15,7 @@ import { ArduinoLanguageGrammarContribution } from './language/arduino-language-
 import { LibraryService, LibraryServicePath } from '../common/protocol/library-service';
 import { BoardsService, BoardsServicePath, BoardsServiceClient } from '../common/protocol/boards-service';
 import { SketchesService, SketchesServicePath } from '../common/protocol/sketches-service';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { CoreService, CoreServicePath, CoreServiceClient } from '../common/protocol/core-service';
 import { BoardsListWidget } from './boards/boards-list-widget';
 import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
@@ -151,6 +152,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     // Sketch list service
     bind(SketchesService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, SketchesServicePath)).inSingletonScope();
+    bind(SketchesServiceClientImpl).toSelf().inSingletonScope();
 
     // Config service
     bind(ConfigService).toDynamicValue(context => {

arduino-ide-extension/src/browser/contributions/close-sketch.ts

@@ -15,12 +15,12 @@ export class CloseSketch extends SketchContribution {
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(CloseSketch.Commands.CLOSE_SKETCH, {
             execute: async () => {
-                const sketch = await this.currentSketch();
+                const sketch = await this.sketchServiceClient.currentSketch();
                 if (!sketch) {
                     return;
                 }
                 const isTemp = await this.sketchService.isTemp(sketch);
-                const uri = await this.currentSketchFile();
+                const uri = await this.sketchServiceClient.currentSketchFile();
                 if (!uri) {
                     return;
                 }

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

@@ -1,7 +1,6 @@
 import { inject, injectable, interfaces } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
-import { notEmpty } from '@theia/core/lib/common/objects';
 import { FileSystem } from '@theia/filesystem/lib/common';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { MessageService } from '@theia/core/lib/common/message-service';
@@ -11,8 +10,9 @@ import { MenuModelRegistry, MenuContribution } from '@theia/core/lib/common/menu
 import { KeybindingRegistry, KeybindingContribution } from '@theia/core/lib/browser/keybinding';
 import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { Command, CommandRegistry, CommandContribution, CommandService } from '@theia/core/lib/common/command';
-import { SketchesService, ConfigService, FileSystemExt, Sketch } from '../../common/protocol';
 import { EditorMode } from '../editor-mode';
+import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
+import { SketchesService, ConfigService, FileSystemExt, Sketch } from '../../common/protocol';
 
 export { Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, URI, Sketch, open };
 
@@ -69,30 +69,8 @@ export abstract class SketchContribution extends Contribution {
     @inject(OpenerService)
     protected readonly openerService: OpenerService;
 
-    protected async currentSketch(): Promise<Sketch | undefined> {
-        const sketches = (await Promise.all(this.workspaceService.tryGetRoots().map(({ uri }) => this.sketchService.getSketchFolder(uri)))).filter(notEmpty);
-        if (!sketches.length) {
-            return;
-        }
-        if (sketches.length > 1) {
-            console.log(`Multiple sketch folders were found in the workspace. Falling back to the first one. Sketch folders: ${JSON.stringify(sketches)}`);
-        }
-        return sketches[0];
-    }
-
-    protected async currentSketchFile(): Promise<string | undefined> {
-        const sketch = await this.currentSketch();
-        if (sketch) {
-            const uri = new URI(sketch.uri).resolve(`${sketch.name}.ino`).toString();
-            const exists = await this.fileSystem.exists(uri);
-            if (!exists) {
-                this.messageService.warn(`Could not find sketch file: ${uri}`);
-                return undefined;
-            }
-            return uri;
-        }
-        return undefined;
-    }
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
 }
 

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

@@ -151,33 +151,29 @@ ${value}
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: EditContributions.Commands.COPY_FOR_FORUM.id,
-            keybinding: 'CtrlCmd+Shift+C'
+            keybinding: 'CtrlCmd+Shift+C',
+            when: 'editorFocus'
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.COPY_FOR_GITHUB.id,
-            keybinding: 'CtrlCmd+Alt+C'
+            keybinding: 'CtrlCmd+Alt+C',
+            when: 'editorFocus'
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.GO_TO_LINE.id,
-            keybinding: 'CtrlCmd+L'
+            keybinding: 'CtrlCmd+L',
+            when: 'editorFocus'
         });
 
         registry.registerKeybinding({
             command: EditContributions.Commands.TOGGLE_COMMENT.id,
-            keybinding: 'CtrlCmd+/'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.INDENT_LINES.id,
-            keybinding: 'Tab'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.OUTDENT_LINES.id,
-            keybinding: 'Shift+Tab'
+            keybinding: 'CtrlCmd+/',
+            when: 'editorFocus'
         });
 
         registry.registerKeybinding({
             command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-            keybinding: 'CtrlCmd+=' // TODO: compare with the Java IDE. It uses `⌘+`. There is no `+` on EN_US.
+            keybinding: 'CtrlCmd+='
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
@@ -213,8 +209,15 @@ ${value}
     }
 
     protected async currentValue(): Promise<string | undefined> {
-        const currentEditor = await this.current()
-        return currentEditor?.getValue();
+        const currentEditor = await this.current();
+        if (currentEditor) {
+            const selection = currentEditor.getSelection();
+            if (!selection || selection.isEmpty()) {
+                return currentEditor.getValue();
+            }
+            return currentEditor.getModel()?.getValueInRange(selection);
+        }
+        return undefined;
     }
 
     protected async run(commandId: string): Promise<any> {

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

@@ -28,7 +28,7 @@ export class OpenSketchExternal extends SketchContribution {
     }
 
     protected async openExternal(): Promise<void> {
-        const uri = await this.currentSketchFile();
+        const uri = await this.sketchServiceClient.currentSketchFile();
         if (uri) {
             const exists = this.fileSystem.exists(uri);
             if (exists) {

arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

@@ -32,7 +32,7 @@ export class SaveAsSketch extends SketchContribution {
      * Resolves `true` if the sketch was successfully saved as something.
      */
     async saveAs({ execOnlyIfTemp, openAfterMove }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT): Promise<boolean> {
-        const sketch = await this.currentSketch();
+        const sketch = await this.sketchServiceClient.currentSketch();
         if (!sketch) {
             return false;
         }

arduino-ide-extension/src/browser/contributions/sketch-control.ts

@@ -26,7 +26,7 @@ export class SketchControl extends SketchContribution {
             isVisible: widget => this.shell.getWidgets('main').indexOf(widget) !== -1,
             execute: async () => {
                 this.toDisposeBeforeCreateNewContextMenu.dispose();
-                const sketch = await this.currentSketch();
+                const sketch = await this.sketchServiceClient.currentSketch();
                 if (!sketch) {
                     return;
                 }
@@ -40,8 +40,8 @@ export class SketchControl extends SketchContribution {
                     return;
                 }
 
-                const uris = await this.sketchService.getSketchFiles(sketch.uri);
-                // TODO: order them! The Java IDE orders them by tab index. Use the shell and the editor manager to achieve it.
+                const { mainFileUri, otherSketchFileUris, additionalFileUris } = await this.sketchService.loadSketch(sketch.uri);
+                const uris = [mainFileUri, ...otherSketchFileUris, ...additionalFileUris];
                 for (let i = 0; i < uris.length; i++) {
                     const uri = new URI(uris[i]);
                     const command = { id: `arduino-focus-file--${uri.toString()}` };

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -73,7 +73,7 @@ export class UploadSketch extends SketchContribution {
     }
 
     async uploadSketch(usingProgrammer: boolean = false): Promise<void> {
-        const uri = await this.currentSketchFile();
+        const uri = await this.sketchServiceClient.currentSketchFile();
         if (!uri) {
             return;
         }

arduino-ide-extension/src/browser/contributions/verify-sketch.ts

@@ -57,7 +57,7 @@ export class VerifySketch extends SketchContribution {
     }
 
     async verifySketch(): Promise<void> {
-        const uri = await this.currentSketchFile();
+        const uri = await this.sketchServiceClient.currentSketchFile();
         if (!uri) {
             return;
         }

arduino-ide-extension/src/browser/data/arduino.color-theme.json

@@ -108,7 +108,9 @@
     "secondaryButton.hoverBackground": "#dae3e3",
     "arduino.branding.primary": "#00979d",
     "arduino.branding.secondary": "#b5c8c9",
-    "arduino.foreground": "#edf1f1"
+    "arduino.foreground": "#edf1f1",
+    "arduino.output.background": "#000000",
+    "arduino.output.foreground": "#ffffff"
   },
   "type": "light",
   "name": "Arduino"

arduino-ide-extension/src/browser/style/main.css

@@ -155,3 +155,12 @@
     border: 1px solid var(--theia-arduino-toolbar-background);
     padding: 2px 0px 2px 9px;
 }
+
+#outputView .monaco-editor .lines-content.monaco-editor-background {
+    background-color: var(--theia-arduino-output-background);
+}
+
+.monaco-editor {
+/* #outputView .monaco-editor .inputarea.ime-input { */
+    color: var(--theia-arduino-output-foreground);
+}

arduino-ide-extension/src/browser/theia/editor/editor-manager.ts

@@ -17,7 +17,9 @@ export class EditorManager extends TheiaEditorManager {
             const { editor } = widget;
             if (editor instanceof MonacoEditor) {
                 const codeEditor = editor.getControl();
-                codeEditor.updateOptions({ readOnly });
+                const lineNumbersMinChars = 2;
+                const overviewRulerLanes = 0;
+                codeEditor.updateOptions({ readOnly, lineNumbersMinChars, overviewRulerLanes });
             }
         }
         return widget;

arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts

@@ -7,7 +7,6 @@ import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
 import { FocusTracker, Widget } from '@theia/core/lib/browser';
 import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { EditorMode } from '../../editor-mode';
 import { ConfigService } from '../../../common/protocol/config-service';
 import { SketchesService } from '../../../common/protocol/sketches-service';
 import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver';
@@ -24,9 +23,6 @@ export class WorkspaceService extends TheiaWorkspaceService {
     @inject(LabelProvider)
     protected readonly labelProvider: LabelProvider;
 
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
     @inject(MessageService)
     protected readonly messageService: MessageService;
 
@@ -82,13 +78,7 @@ export class WorkspaceService extends TheiaWorkspaceService {
         if (!exists) {
             return false;
         }
-        // The workspace root location must exist. However, when opening a workspace root in pro-mode,
-        // the workspace root must not be a sketch folder. It can be the default sketch directory, or any other directories, for instance.
-        if (this.editorMode.proMode) {
-            return true;
-        }
-        const sketchFolder = await this.sketchService.isSketchFolder(uri);
-        return sketchFolder;
+        return this.sketchService.isSketchFolder(uri);
     }
 
     protected onCurrentWidgetChange({ newValue }: FocusTracker.IChangedArgs<Widget>): void {

arduino-ide-extension/src/browser/tool-output/client-service-impl.ts

@@ -12,7 +12,7 @@ export class ToolOutputServiceClientImpl implements ToolOutputServiceClient {
     onNewOutput(tool: string, text: string): void {
         const name = `Arduino: ${tool}`;
         // Zen-mode: we do not reveal the output for daemon messages.
-        const show = tool === 'daemon' ? Promise.resolve() : this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options: { preserveFocus: false } });
+        const show = tool === 'daemon22' ? Promise.resolve() : this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options: { preserveFocus: false } });
         show.then(() => this.commandService.executeCommand(OutputCommands.APPEND.id, { name, text }));
     }
 

arduino-ide-extension/src/common/protocol/sketches-service-client-impl.ts

@@ -0,0 +1,49 @@
+import { inject, injectable } from 'inversify';
+import URI from '@theia/core/lib/common/uri';
+import { notEmpty } from '@theia/core/lib/common/objects';
+import { FileSystem } from '@theia/filesystem/lib/common';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { Sketch, SketchesService } from '../../common/protocol';
+
+@injectable()
+export class SketchesServiceClientImpl {
+
+    @inject(FileSystem)
+    protected readonly fileSystem: FileSystem;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @inject(SketchesService)
+    protected readonly sketchService: SketchesService;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    async currentSketch(): Promise<Sketch | undefined> {
+        const sketches = (await Promise.all(this.workspaceService.tryGetRoots().map(({ uri }) => this.sketchService.getSketchFolder(uri)))).filter(notEmpty);
+        if (!sketches.length) {
+            return undefined;
+        }
+        if (sketches.length > 1) {
+            console.log(`Multiple sketch folders were found in the workspace. Falling back to the first one. Sketch folders: ${JSON.stringify(sketches)}`);
+        }
+        return sketches[0];
+    }
+
+    async currentSketchFile(): Promise<string | undefined> {
+        const sketch = await this.currentSketch();
+        if (sketch) {
+            const uri = new URI(sketch.uri).resolve(`${sketch.name}.ino`).toString();
+            const exists = await this.fileSystem.exists(uri);
+            if (!exists) {
+                this.messageService.warn(`Could not find sketch file: ${uri}`);
+                return undefined;
+            }
+            return uri;
+        }
+        return undefined;
+    }
+
+}

arduino-ide-extension/src/common/protocol/sketches-service.ts

@@ -8,7 +8,12 @@ export interface SketchesService {
      */
     getSketches(uri?: string): Promise<Sketch[]>;
 
-    getSketchFiles(uri: string): Promise<string[]>;
+    /**
+     * This is the TS implementation of `SketchLoad` from the CLI and should be replaced with a gRPC call eventually.
+     * See: https://github.com/arduino/arduino-cli/issues/837
+     * Based on: https://github.com/arduino/arduino-cli/blob/eef3705c4afcba4317ec38b803d9ffce5dd59a28/arduino/builder/sketch.go#L100-L215
+     */
+    loadSketch(uri: string): Promise<Sketch>;
 
     /**
      * Creates a new sketch folder in the temp location.
@@ -40,7 +45,10 @@ export interface SketchesService {
 
 export interface Sketch {
     readonly name: string;
-    readonly uri: string;
+    readonly uri: string; // `LocationPath`
+    readonly mainFileUri: string; // `MainFile`
+    readonly otherSketchFileUris: string[]; // `OtherSketchFiles`
+    readonly additionalFileUris: string[]; // `AdditionalFiles`
 }
 export namespace Sketch {
     export function is(arg: any): arg is Sketch {