ATL-93: Added Support for .pde sketch file format.

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

Author: Akos Kitta

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

@@ -47,6 +47,7 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { OutputService } from '../common/protocol/output-service';
 import { ArduinoPreferences } from './arduino-preferences';
 import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './contributions/save-as-sketch';
 
 @injectable()
 export class ArduinoFrontendContribution implements FrontendApplicationContribution,
@@ -338,6 +339,14 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                 await this.ensureOpened(uri);
             }
             await this.ensureOpened(mainFileUri, true);
+            if (mainFileUri.endsWith('.pde')) {
+                const message = `The '${sketch.name}' still uses the old \`.pde\` format. Do you want to switch to the new \`.ino\` extension?`;
+                this.messageService.info(message, 'Later', 'Yes').then(async answer => {
+                    if (answer === 'Yes') {
+                        this.commandRegistry.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { execOnlyIfTemp: false, openAfterMove: true, wipeOriginal: false });
+                    }
+                });
+            }
         } catch (e) {
             console.error(e);
             const message = e instanceof Error ? e.message : JSON.stringify(e);

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

@@ -122,7 +122,7 @@ export class OpenSketch extends SketchContribution {
             filters: [
                 {
                     name: 'Sketch',
-                    extensions: ['ino']
+                    extensions: ['ino', 'pde']
                 }
             ]
         });
@@ -138,7 +138,7 @@ export class OpenSketch extends SketchContribution {
         if (sketch) {
             return sketch;
         }
-        if (sketchFileUri.endsWith('.ino')) {
+        if (Sketch.isSketchFile(sketchFileUri)) {
             const name = new URI(sketchFileUri).path.name;
             const nameWithExt = this.labelProvider.getName(new URI(sketchFileUri));
             const { response } = await remote.dialog.showMessageBox({

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

@@ -9,7 +9,7 @@ import { FocusTracker, Widget } from '@theia/core/lib/browser';
 import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 import { ConfigService } from '../../../common/protocol/config-service';
-import { SketchesService } from '../../../common/protocol/sketches-service';
+import { SketchesService, Sketch } from '../../../common/protocol/sketches-service';
 import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver';
 
 @injectable()
@@ -85,7 +85,7 @@ export class WorkspaceService extends TheiaWorkspaceService {
     protected onCurrentWidgetChange({ newValue }: FocusTracker.IChangedArgs<Widget>): void {
         if (newValue instanceof EditorWidget) {
             const { uri } = newValue.editor;
-            if (uri.toString().endsWith('.ino')) {
+            if (Sketch.isSketchFile(uri.toString())) {
                 this.updateTitle();
             } else {
                 const title = this.workspaceTitle;

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

@@ -81,4 +81,10 @@ export namespace Sketch {
         const { mainFileUri, otherSketchFileUris, additionalFileUris } = sketch;
         return [mainFileUri, ...otherSketchFileUris, ...additionalFileUris].indexOf(uri.toString()) !== -1;
     }
+    export function isSketchFile(arg: string | URI): boolean {
+        if (arg instanceof URI) {
+            return isSketchFile(arg.toString());
+        }
+        return Extensions.MAIN.some(ext => arg.endsWith(ext));
+    }
 }

arduino-ide-extension/src/node/arduino-ide-backend-module.ts

@@ -21,8 +21,6 @@ import { MonitorServiceImpl } from './monitor/monitor-service-impl';
 import { MonitorService, MonitorServicePath, MonitorServiceClient } from '../common/protocol/monitor-service';
 import { MonitorClientProvider } from './monitor/monitor-client-provider';
 import { ConfigServiceImpl } from './config-service-impl';
-import { HostedPluginReader } from './theia/plugin-ext/plugin-reader';
-import { HostedPluginReader as TheiaHostedPluginReader } from '@theia/plugin-ext/lib/hosted/node/plugin-reader';
 import { EnvVariablesServer as TheiaEnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { EnvVariablesServer } from './theia/env-variables/env-variables-server';
 import { NodeFileSystemExt } from './node-filesystem-ext';
@@ -106,9 +104,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(EnvVariablesServer).toSelf().inSingletonScope();
     rebind(TheiaEnvVariablesServer).toService(EnvVariablesServer);
 
-    bind(HostedPluginReader).toSelf().inSingletonScope();
-    rebind(TheiaHostedPluginReader).toService(HostedPluginReader);
-
     // #endregion Theia customizations
 
     // Monitor client provider per connected frontend.

arduino-ide-extension/src/node/core-client-provider.ts

@@ -57,7 +57,8 @@ export class CoreClientProvider extends GrpcClientProvider<CoreClientProvider.Cl
             throw new Error(`Could not retrieve instance from the initialize response.`);
         }
 
-        await this.updateIndexes({ instance, client });
+        // No `await`. The index update event comes later. This way we do not block app startup with index update when invalid proxy is given.
+        this.updateIndexes({ instance, client });
 
         return { instance, client };
     }

arduino-ide-extension/src/node/core-service-impl.ts

@@ -1,12 +1,12 @@
 import { FileUri } from '@theia/core/lib/node/file-uri';
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable } from 'inversify';
 import { dirname } from 'path';
 import { CoreService } from '../common/protocol/core-service';
 import { CompileReq, CompileResp } from './cli-protocol/commands/compile_pb';
 import { CoreClientProvider } from './core-client-provider';
 import { UploadReq, UploadResp, BurnBootloaderReq, BurnBootloaderResp, UploadUsingProgrammerReq, UploadUsingProgrammerResp } from './cli-protocol/commands/upload_pb';
 import { OutputService } from '../common/protocol/output-service';
-import { NotificationServiceServer, ConfigService } from '../common/protocol';
+import { NotificationServiceServer } from '../common/protocol';
 import { ClientReadableStream } from '@grpc/grpc-js';
 import { ArduinoCoreClient } from './cli-protocol/commands/commands_grpc_pb';
 import { firstToUpperCase, firstToLowerCase } from '../common/utils';
@@ -23,16 +23,6 @@ export class CoreServiceImpl implements CoreService {
     @inject(NotificationServiceServer)
     protected readonly notificationService: NotificationServiceServer;
 
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
-
-    @postConstruct()
-    protected init(): void {
-        this.coreClient().then(({ client, instance }) => {
-
-        });
-    }
-
     async compile(options: CoreService.Compile.Options): Promise<void> {
         this.outputService.append({ name: 'compile', chunk: 'Compile...\n' + JSON.stringify(options, null, 2) + '\n--------------------------\n' });
         const { sketchUri, fqbn } = options;