development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename controller: don't throw on cancellation & more type-safety to avoid MessageController#showMessage throwing

Browse source
This commit is contained in:
Ulugbek Abdullaev 2024-02-23 16:46:47 +01:00
parent c6eed5d1b5
commit cdb1a962cc
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/editor/contrib/rename/browser/rename.ts
View file

@ -6,7 +6,8 @@
import { alert } from 'vs/base/browser/ui/aria/aria';
import { raceCancellation } from 'vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { onUnexpectedError } from 'vs/base/common/errors';
import { CancellationError, onUnexpectedError } from 'vs/base/common/errors';
import { isMarkdownString } from 'vs/base/common/htmlContent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { assertType } from 'vs/base/common/types';
@ -192,9 +193,15 @@ class RenameController implements IEditorContribution {
this._progressService.showWhile(resolveLocationOperation, 250);
loc = await resolveLocationOperation;
trace('resolved rename location');
} catch (e) {
trace('resolve rename location failed', JSON.stringify(e, null, '\t'));
} catch (e: unknown) {
if (e instanceof CancellationError) {
trace('resolve rename location cancelled', JSON.stringify(e, null, '\t'));
} else {
trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
if (typeof e === 'string' || isMarkdownString(e)) {
MessageController.get(this.editor)?.showMessage(e || nls.localize('resolveRenameLocationFailed', "An unknown error occurred while resolving rename location"), position);
}
}
return undefined;
} finally {