jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-09 20:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove gRPC error code from error notifications

Browse Source
This commit is contained in:
Silvano Cerza 2021-12-03 15:23:49 +01:00 committed by Silvano Cerza
parent f0d9894a16
commit 5ddab1ded7
5 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-ide-extension/src/browser/contributions/burn-bootloader.ts
View File

@ -79,7 +79,13 @@ export class BurnBootloader extends SketchContribution {
}
);
} catch (e) {
this.messageService.error(e.toString());
let errorMessage = "";
if (typeof e === "string") {
errorMessage = e;
} else {
errorMessage = e.toString();
}
this.messageService.error(errorMessage);
} finally {
if (this.serialConnection.isSerialOpen()) {
await this.serialConnection.connect();

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

@ -277,7 +277,13 @@ export class UploadSketch extends SketchContribution {
{ timeout: 3000 }
);
} catch (e) {
this.messageService.error(e.toString());
let errorMessage = "";
if (typeof e === "string") {
errorMessage = e;
} else {
errorMessage = e.toString();
}
this.messageService.error(errorMessage);
} finally {
this.uploadInProgress = false;
this.onDidChangeEmitter.fire();

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

@ -127,7 +127,13 @@ export class VerifySketch extends SketchContribution {
{ timeout: 3000 }
);
} catch (e) {
this.messageService.error(e.toString());
let errorMessage = "";
if (typeof e === "string") {
errorMessage = e;
} else {
errorMessage = e.toString();
}
this.messageService.error(errorMessage);
} finally {
this.verifyInProgress = false;
this.onDidChangeEmitter.fire();

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

@ -23,6 +23,7 @@ import { NotificationServiceServer } from '../common/protocol';
import { ArduinoCoreServiceClient } from './cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb';
import { firstToUpperCase, firstToLowerCase } from '../common/utils';
import { Port } from './cli-protocol/cc/arduino/cli/commands/v1/port_pb';
import { nls } from '@theia/core';
@injectable()
export class CoreServiceImpl extends CoreClientAware implements CoreService {
@ -85,11 +86,16 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
chunk: '\n--------------------------\nCompilation complete.\n',
});
} catch (e) {
const errorMessage = nls.localize(
'arduino/compile/error',
'Compilation error: {0}',
e.details
);
this.responseService.appendToOutput({
chunk: `Compilation error: ${e.details}\n`,
chunk: `${errorMessage}}\n`,
severity: 'error',
});
throw e;
throw new Error(errorMessage);
}
}
@ -180,11 +186,17 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
' complete.\n',
});
} catch (e) {
const errorMessage = nls.localize(
'arduino/upload/error',
'{0} error: {1}',
firstToUpperCase(task),
e.details,
);
this.responseService.appendToOutput({
chunk: `${firstToUpperCase(task)} error: ${e.details}\n`,
chunk: `${errorMessage}\n`,
severity: 'error',
});
throw e;
throw new Error(errorMessage);
} finally {
this.uploading = false;
}
@ -227,11 +239,16 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
result.on('end', () => resolve());
});
} catch (e) {
const errorMessage = nls.localize(
'arduino/burnBootloader/error',
'Error while burning the bootloader: {0}',
e.details,
);
this.responseService.appendToOutput({
chunk: `Error while burning the bootloader: ${e.details}\n`,
chunk: `${errorMessage}\n`,
severity: 'error',
});
throw e;
throw new Error(errorMessage);
}
}

9
i18n/en.json
View File

@ -288,6 +288,15 @@
"electron": {
"couldNotSave": "Could not save the sketch. Please copy your unsaved work into your favorite text editor, and restart the IDE.",
"unsavedChanges": "Any unsaved changes will not be saved."
},
"compile": {
"error": "Compilation error: {0}"
},
"upload": {
"error": "{0} error: {1}"
},
"burnBootloader": {
"error": "Error while burning the bootloader: {0}"
}
},
"theia": {