Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 08:38:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #136937: Do not log extension activation canceled error if the extension host is going down

Browse Source
This commit is contained in:
Alex Dima
2021-11-19 00:45:14 +01:00
parent 5d0da7b953
commit 7fbe563c0a
4 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/workbench/api/common/extHostTextEditor.ts
View File

@@ -226,7 +226,7 @@ export class ExtHostTextEditorOptions {
// reflect the new tabSize value immediately
this._tabSize = tabSize;
}
this._warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError('setTabSize', this._proxy.$trySetOptions(this._id, {
tabSize: tabSize
}));
}
@@ -250,7 +250,7 @@ export class ExtHostTextEditorOptions {
// reflect the new insertSpaces value immediately
this._insertSpaces = insertSpaces;
}
this._warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError('setInsertSpaces', this._proxy.$trySetOptions(this._id, {
insertSpaces: insertSpaces
}));
}
@@ -263,7 +263,7 @@ export class ExtHostTextEditorOptions {
return;
}
this._cursorStyle = value;
this._warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError('setCursorStyle', this._proxy.$trySetOptions(this._id, {
cursorStyle: value
}));
}
@@ -276,7 +276,7 @@ export class ExtHostTextEditorOptions {
return;
}
this._lineNumbers = value;
this._warnOnError(this._proxy.$trySetOptions(this._id, {
this._warnOnError('setLineNumbers', this._proxy.$trySetOptions(this._id, {
lineNumbers: TypeConverters.TextEditorLineNumbersStyle.from(value)
}));
}
@@ -341,12 +341,15 @@ export class ExtHostTextEditorOptions {
}
if (hasUpdate) {
this._warnOnError(this._proxy.$trySetOptions(this._id, bulkConfigurationUpdate));
this._warnOnError('setOptions', this._proxy.$trySetOptions(this._id, bulkConfigurationUpdate));
}
}
private _warnOnError(promise: Promise<any>): void {
promise.catch(err => this._logService.warn(err));
private _warnOnError(action: string, promise: Promise<any>): void {
promise.catch(err => {
this._logService.warn(`ExtHostTextEditorOptions '${action}' failed:'`);
this._logService.warn(err);
});
}
}