correct localise call, fallback to err if no err.message is available, protected message service against invalid items, fixes #5891

This commit is contained in:
Johannes Rieken
2016-04-27 14:33:42 +02:00
parent 4858b5910d
commit 73b97a0642
2 changed files with 4 additions and 2 deletions

View File

@@ -213,7 +213,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
electron.fork(modulePath, [], options, (err: any, childProcess: cp.ChildProcess) => {
if (err) {
this.lastError = err;
window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}'), err.message);
window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err));
this.logTelemetry('error', {message: err.message});
return;
}