Skip to content

Remove gRPC error code from error notifications #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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();
Original file line number Diff line number Diff line change
@@ -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();
Original file line number Diff line number Diff line change
@@ -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 changes: 23 additions & 6 deletions arduino-ide-extension/src/node/core-service-impl.ts
Original file line number Diff line number Diff line change
@@ -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 changes: 9 additions & 0 deletions i18n/en.json
Original file line number Diff line number Diff line change
@@ -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": {