louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`assertIsDefined` vs `assertDefined` (fix #248362) (#250844)

This commit is contained in:
Benjamin Pasero 2025-06-06 16:08:12 +02:00 committed by GitHub
parent af623e09a1
commit 65bb1d66dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
72 changed files with 266 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/base/common/types.ts
View File

@ -105,7 +105,7 @@ export function assertType(condition: unknown, type?: string): asserts condition
*
* @see {@link assertDefined} for a similar utility that leverages TS assertion functions to narrow down the type of `arg` to be non-nullable.
*/
export function assertIsDefined<T>(arg: T | null | undefined): NonNullable<T> {
export function assertReturnsDefined<T>(arg: T | null | undefined): NonNullable<T> {
assert(
arg !== null && arg !== undefined,
'Argument is `undefined` or `null`.',
@ -137,7 +137,7 @@ export function assertIsDefined<T>(arg: T | null | undefined): NonNullable<T> {
* console.log(someValue.length); // now type of `someValue` is `string`
* ```
*
* @see {@link assertIsDefined} for a similar utility but without assertion.
* @see {@link assertReturnsDefined} for a similar utility but without assertion.
* @see {@link https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#assertion-functions typescript-3-7.html#assertion-functions}
*/
export function assertDefined<T>(value: T, error: string | NonNullable<Error>): asserts value is NonNullable<T> {
@ -151,10 +151,10 @@ export function assertDefined<T>(value: T, error: string | NonNullable<Error>):
/**
* Asserts that each argument passed in is neither undefined nor null.
*/
export function assertAllDefined<T1, T2>(t1: T1 | null | undefined, t2: T2 | null | undefined): [T1, T2];
export function assertAllDefined<T1, T2, T3>(t1: T1 | null | undefined, t2: T2 | null | undefined, t3: T3 | null | undefined): [T1, T2, T3];
export function assertAllDefined<T1, T2, T3, T4>(t1: T1 | null | undefined, t2: T2 | null | undefined, t3: T3 | null | undefined, t4: T4 | null | undefined): [T1, T2, T3, T4];
export function assertAllDefined(...args: (unknown | null | undefined)[]): unknown[] {
export function assertReturnsAllDefined<T1, T2>(t1: T1 | null | undefined, t2: T2 | null | undefined): [T1, T2];
export function assertReturnsAllDefined<T1, T2, T3>(t1: T1 | null | undefined, t2: T2 | null | undefined, t3: T3 | null | undefined): [T1, T2, T3];
export function assertReturnsAllDefined<T1, T2, T3, T4>(t1: T1 | null | undefined, t2: T2 | null | undefined, t3: T3 | null | undefined, t4: T4 | null | undefined): [T1, T2, T3, T4];
export function assertReturnsAllDefined(...args: (unknown | null | undefined)[]): unknown[] {
const result = [];
for (let i = 0; i < args.length; i++) {

6
src/vs/base/node/zip.ts
View File

@ -8,7 +8,7 @@ import { Readable } from 'stream';
import { createCancelablePromise, Sequencer } from '../common/async.js';
import { CancellationToken } from '../common/cancellation.js';
import * as path from '../common/path.js';
import { assertIsDefined } from '../common/types.js';
import { assertReturnsDefined } from '../common/types.js';
import { Promises } from './pfs.js';
import * as nls from '../../nls.js';
import type { Entry, ZipFile } from 'yauzl';
@ -168,7 +168,7 @@ async function openZip(zipFile: string, lazy: boolean = false): Promise<ZipFile>
if (error) {
reject(toExtractError(error));
} else {
resolve(assertIsDefined(zipfile));
resolve(assertReturnsDefined(zipfile));
}
});
});
@ -180,7 +180,7 @@ function openZipStream(zipFile: ZipFile, entry: Entry): Promise<Readable> {
if (error) {
reject(toExtractError(error));
} else {
resolve(assertIsDefined(stream));
resolve(assertReturnsDefined(stream));
}
});
});

20
src/vs/base/test/common/types.test.ts
View File

@ -158,18 +158,18 @@ suite('Types', () => {
});
test('assertIsDefined / assertAreDefined', () => {
assert.throws(() => types.assertIsDefined(undefined));
assert.throws(() => types.assertIsDefined(null));
assert.throws(() => types.assertAllDefined(null, undefined));
assert.throws(() => types.assertAllDefined(true, undefined));
assert.throws(() => types.assertAllDefined(undefined, false));
assert.throws(() => types.assertReturnsDefined(undefined));
assert.throws(() => types.assertReturnsDefined(null));
assert.throws(() => types.assertReturnsAllDefined(null, undefined));
assert.throws(() => types.assertReturnsAllDefined(true, undefined));
assert.throws(() => types.assertReturnsAllDefined(undefined, false));
assert.strictEqual(types.assertIsDefined(true), true);
assert.strictEqual(types.assertIsDefined(false), false);
assert.strictEqual(types.assertIsDefined('Hello'), 'Hello');
assert.strictEqual(types.assertIsDefined(''), '');
assert.strictEqual(types.assertReturnsDefined(true), true);
assert.strictEqual(types.assertReturnsDefined(false), false);
assert.strictEqual(types.assertReturnsDefined('Hello'), 'Hello');
assert.strictEqual(types.assertReturnsDefined(''), '');
const res = types.assertAllDefined(1, true, 'Hello');
const res = types.assertReturnsAllDefined(1, true, 'Hello');
assert.strictEqual(res[0], 1);
assert.strictEqual(res[1], true);
assert.strictEqual(res[2], 'Hello');

4
src/vs/editor/browser/view/domLineBreaksComputer.ts
View File

@ -6,7 +6,7 @@
import { createTrustedTypesPolicy } from '../../../base/browser/trustedTypes.js';
import { CharCode } from '../../../base/common/charCode.js';
import * as strings from '../../../base/common/strings.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { applyFontInfo } from '../config/domFontInfo.js';
import { WrappingIndent } from '../../common/config/editorOptions.js';
import { FontInfo } from '../../common/config/fontInfo.js';
@ -35,7 +35,7 @@ export class DOMLineBreaksComputerFactory implements ILineBreaksComputerFactory
injectedTexts.push(injectedText);
},
finalize: () => {
return createLineBreaks(assertIsDefined(this.targetWindow.deref()), requests, fontInfo, tabSize, wrappingColumn, wrappingIndent, wordBreak, injectedTexts);
return createLineBreaks(assertReturnsDefined(this.targetWindow.deref()), requests, fontInfo, tabSize, wrappingColumn, wrappingIndent, wordBreak, injectedTexts);
}
};
}

4
src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
View File

@ -10,7 +10,7 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
import { IObservable, autorun, derived, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
import { ThemeIcon } from '../../../../../../base/common/themables.js';
import { assertIsDefined } from '../../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../../base/common/types.js';
import { applyFontInfo } from '../../../../config/domFontInfo.js';
import { CodeEditorWidget } from '../../../codeEditor/codeEditorWidget.js';
import { diffDeleteDecoration, diffRemoveIcon } from '../../registrations.contribution.js';
@ -239,7 +239,7 @@ export class DiffEditorViewZones extends Disposable {
let zoneId: string | undefined = undefined;
alignmentViewZonesDisposables.add(
new InlineDiffDeletedCodeMargin(
() => assertIsDefined(zoneId),
() => assertReturnsDefined(zoneId),
marginDomNode,
this._editors.modified,
a.diff,

6
src/vs/editor/contrib/find/browser/findWidget.ts
View File

@ -38,7 +38,7 @@ import { registerIcon, widgetClose } from '../../../../platform/theme/common/ico
import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { isHighContrast } from '../../../../platform/theme/common/theme.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { Selection } from '../../../common/core/selection.js';
import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
@ -1008,7 +1008,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
icon: findPreviousMatchIcon,
hoverDelegate,
onTrigger: () => {
assertIsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(undefined, onUnexpectedError);
assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(undefined, onUnexpectedError);
}
}, this._hoverService));
@ -1018,7 +1018,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
icon: findNextMatchIcon,
hoverDelegate,
onTrigger: () => {
assertIsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(undefined, onUnexpectedError);
assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(undefined, onUnexpectedError);
}
}, this._hoverService));

10
src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
View File

@ -11,7 +11,7 @@ import { Event } from '../../../../base/common/event.js';
import { IMarkdownString } from '../../../../base/common/htmlContent.js';
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import './parameterHints.css';
import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../browser/editorBrowser.js';
import { EDITOR_FONT_DEFAULTS, EditorOption } from '../../../common/config/editorOptions.js';
@ -282,16 +282,16 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
}
private hasDocs(signature: languages.SignatureInformation, activeParameter: languages.ParameterInformation | undefined): boolean {
if (activeParameter && typeof activeParameter.documentation === 'string' && assertIsDefined(activeParameter.documentation).length > 0) {
if (activeParameter && typeof activeParameter.documentation === 'string' && assertReturnsDefined(activeParameter.documentation).length > 0) {
return true;
}
if (activeParameter && typeof activeParameter.documentation === 'object' && assertIsDefined(activeParameter.documentation).value.length > 0) {
if (activeParameter && typeof activeParameter.documentation === 'object' && assertReturnsDefined(activeParameter.documentation).value.length > 0) {
return true;
}
if (signature.documentation && typeof signature.documentation === 'string' && assertIsDefined(signature.documentation).length > 0) {
if (signature.documentation && typeof signature.documentation === 'string' && assertReturnsDefined(signature.documentation).length > 0) {
return true;
}
if (signature.documentation && typeof signature.documentation === 'object' && assertIsDefined(signature.documentation.value).length > 0) {
if (signature.documentation && typeof signature.documentation === 'object' && assertReturnsDefined(signature.documentation.value).length > 0) {
return true;
}
return false;

4
src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
View File

@ -13,7 +13,7 @@ import { ICodeWindow } from '../../window/electron-main/window.js';
import { getAllWindowsExcludingOffscreen, IWindowsMainService } from '../../windows/electron-main/windows.js';
import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from '../../workspace/common/workspace.js';
import { IWorkspacesManagementMainService } from '../../workspaces/electron-main/workspacesManagementMainService.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { ILogService } from '../../log/common/log.js';
import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
@ -106,7 +106,7 @@ export class DiagnosticsMainService implements IDiagnosticsMainService {
private async codeWindowToInfo(window: ICodeWindow): Promise<IWindowDiagnostics> {
const folderURIs = await this.getFolderURIs(window);
const win = assertIsDefined(window.win);
const win = assertReturnsDefined(window.win);
return this.browserWindowToInfo(win, folderURIs, window.remoteAuthority);
}

6
src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
View File

@ -10,7 +10,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
import { isMacintosh, isWindows } from '../../../base/common/platform.js';
import { cwd } from '../../../base/common/process.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { NativeParsedArgs } from '../../environment/common/argv.js';
import { createDecorator } from '../../instantiation/common/instantiation.js';
import { ILogService } from '../../log/common/log.js';
@ -428,7 +428,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
windowListeners.add(window.onWillLoad(e => this._onWillLoadWindow.fire({ window, workspace: e.workspace, reason: e.reason })));
// Window Before Closing: Main -> Renderer
const win = assertIsDefined(window.win);
const win = assertReturnsDefined(window.win);
windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'close')(e => {
// The window already acknowledged to be closed
@ -478,7 +478,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
}
registerAuxWindow(auxWindow: IAuxiliaryWindow): void {
const win = assertIsDefined(auxWindow.win);
const win = assertReturnsDefined(auxWindow.win);
const windowListeners = new DisposableStore();
windowListeners.add(Event.fromNodeEventEmitter<electron.Event>(win, 'close')(e => {

4
src/vs/platform/sharedProcess/electron-main/sharedProcess.ts
View File

@ -17,7 +17,7 @@ import { ILoggerMainService } from '../../log/electron-main/loggerService.js';
import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
import { NullTelemetryService } from '../../telemetry/common/telemetryUtils.js';
import { parseSharedProcessDebugPort } from '../../environment/node/environmentService.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { SharedProcessChannelConnection, SharedProcessRawConnection, SharedProcessLifecycle } from '../common/sharedProcess.js';
import { Emitter } from '../../../base/common/event.js';
@ -202,7 +202,7 @@ export class SharedProcess extends Disposable {
await this.whenIpcReady;
// Connect and return message port
const utilityProcess = assertIsDefined(this.utilityProcess);
const utilityProcess = assertReturnsDefined(this.utilityProcess);
return utilityProcess.connect(payload);
}
}

20
src/vs/platform/userDataSync/common/extensionsMerge.ts
View File

@ -6,7 +6,7 @@
import { IStringDictionary } from '../../../base/common/collections.js';
import { deepClone, equals } from '../../../base/common/objects.js';
import * as semver from '../../../base/common/semver/semver.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { IExtensionIdentifier } from '../../extensions/common/extensions.js';
import { ILocalSyncExtension, IRemoteSyncExtension, ISyncExtension } from './userDataSync.js';
@ -118,7 +118,7 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
continue;
}
const baseExtension = assertIsDefined(lastSyncExtensionsMap?.get(key));
const baseExtension = assertReturnsDefined(lastSyncExtensionsMap?.get(key));
const wasAnInstalledExtensionDuringLastSync = lastSyncBuiltinExtensionsSet && !lastSyncBuiltinExtensionsSet.has(key) && baseExtension.installed;
if (localExtension.installed && wasAnInstalledExtensionDuringLastSync /* It is an installed extension now and during last sync */) {
// Installed extension is removed from remote. Remove it from local.
@ -132,7 +132,7 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
// Remotely added extension => does not exist in base and exist in remote
for (const key of baseToRemote.added.values()) {
const remoteExtension = assertIsDefined(remoteExtensionsMap.get(key));
const remoteExtension = assertReturnsDefined(remoteExtensionsMap.get(key));
const localExtension = localExtensionsMap.get(key);
// Also exist in local
@ -156,8 +156,8 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
// Remotely updated extension => exist in base and remote
for (const key of baseToRemote.updated.values()) {
const remoteExtension = assertIsDefined(remoteExtensionsMap.get(key));
const baseExtension = assertIsDefined(lastSyncExtensionsMap?.get(key));
const remoteExtension = assertReturnsDefined(remoteExtensionsMap.get(key));
const baseExtension = assertReturnsDefined(lastSyncExtensionsMap?.get(key));
const localExtension = localExtensionsMap.get(key);
// Also exist in local
@ -186,7 +186,7 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
if (baseToRemote.added.has(key)) {
continue;
}
newRemoteExtensionsMap.set(key, assertIsDefined(localExtensionsMap.get(key)));
newRemoteExtensionsMap.set(key, assertReturnsDefined(localExtensionsMap.get(key)));
}
// Locally updated extension => exist in base and local
@ -199,8 +199,8 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
if (baseToRemote.updated.has(key)) {
continue;
}
const localExtension = assertIsDefined(localExtensionsMap.get(key));
const remoteExtension = assertIsDefined(remoteExtensionsMap.get(key));
const localExtension = assertReturnsDefined(localExtensionsMap.get(key));
const remoteExtension = assertReturnsDefined(remoteExtensionsMap.get(key));
// Update remotely
newRemoteExtensionsMap.set(key, merge(key, localExtension, remoteExtension, localExtension));
}
@ -220,7 +220,7 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
continue;
}
// Skip if it is a builtin extension
if (!assertIsDefined(remoteExtensionsMap.get(key)).installed) {
if (!assertReturnsDefined(remoteExtensionsMap.get(key)).installed) {
continue;
}
// Skip if last sync builtin extensions set is not available
@ -228,7 +228,7 @@ export function merge(localExtensions: ILocalSyncExtension[], remoteExtensions:
continue;
}
// Skip if it was a builtin extension during last sync
if (lastSyncBuiltinExtensionsSet.has(key) || !assertIsDefined(lastSyncExtensionsMap?.get(key)).installed) {
if (lastSyncBuiltinExtensionsSet.has(key) || !assertReturnsDefined(lastSyncExtensionsMap?.get(key)).installed) {
continue;
}
newRemoteExtensionsMap.delete(key);

4
src/vs/platform/windows/electron-main/windowsMainService.ts
View File

@ -20,7 +20,7 @@ import { getMarks, mark } from '../../../base/common/performance.js';
import { IProcessEnvironment, isMacintosh, isWindows, OS } from '../../../base/common/platform.js';
import { cwd } from '../../../base/common/process.js';
import { extUriBiasedIgnorePathCase, isEqualAuthority, normalizePath, originalFSPath, removeTrailingPathSeparator } from '../../../base/common/resources.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { URI } from '../../../base/common/uri.js';
import { getNLSLanguage, getNLSMessages, localize } from '../../../nls.js';
import { IBackupMainService } from '../../backup/electron-main/backup.js';
@ -1555,7 +1555,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
disposables.add(createdWindow.onDidLeaveFullScreen(() => this._onDidChangeFullScreen.fire({ window: createdWindow, fullscreen: false })));
disposables.add(createdWindow.onDidTriggerSystemContextMenu(({ x, y }) => this._onDidTriggerSystemContextMenu.fire({ window: createdWindow, x, y })));
const webContents = assertIsDefined(createdWindow.win?.webContents);
const webContents = assertReturnsDefined(createdWindow.win?.webContents);
webContents.removeAllListeners('devtools-reload-page'); // remove built in listener so we can handle this on our own
disposables.add(Event.fromNodeEventEmitter(webContents, 'devtools-reload-page')(() => this.lifecycleMainService.reload(createdWindow)));

4
src/vs/workbench/api/common/extHostDocuments.ts
View File

@ -12,7 +12,7 @@ import { ExtHostDocumentData, setWordDefinitionFor } from './extHostDocumentData
import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
import * as TypeConverters from './extHostTypeConverters.js';
import type * as vscode from 'vscode';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { deepFreeze } from '../../../base/common/objects.js';
import { TextDocumentChangeReason } from './extHostTypes.js';
@ -88,7 +88,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
promise = this._proxy.$tryOpenDocument(uri, options).then(uriData => {
this._documentLoader.delete(uri.toString());
const canonicalUri = URI.revive(uriData);
return assertIsDefined(this._documentsAndEditors.getDocument(canonicalUri));
return assertReturnsDefined(this._documentsAndEditors.getDocument(canonicalUri));
}, err => {
this._documentLoader.delete(uri.toString());
return Promise.reject(err);

6
src/vs/workbench/api/common/extHostEditorTabs.ts
View File

@ -5,7 +5,7 @@
import { diffSets } from '../../../base/common/collections.js';
import { Emitter } from '../../../base/common/event.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { URI } from '../../../base/common/uri.js';
import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
import { IEditorTabDto, IEditorTabGroupDto, IExtHostEditorTabsShape, MainContext, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TabOperation } from './extHost.protocol.js';
@ -248,7 +248,7 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
},
get activeTabGroup() {
const activeTabGroupId = that._activeGroupId;
const activeTabGroup = assertIsDefined(that._extHostTabGroups.find(candidate => candidate.groupId === activeTabGroupId)?.apiObject);
const activeTabGroup = assertReturnsDefined(that._extHostTabGroups.find(candidate => candidate.groupId === activeTabGroupId)?.apiObject);
return activeTabGroup;
},
close: async (tabOrTabGroup: vscode.Tab | readonly vscode.Tab[] | vscode.TabGroup | readonly vscode.TabGroup[], preserveFocus?: boolean) => {
@ -300,7 +300,7 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
});
// Set the active tab group id
const activeTabGroupId = assertIsDefined(tabGroups.find(group => group.isActive === true)?.groupId);
const activeTabGroupId = assertReturnsDefined(tabGroups.find(group => group.isActive === true)?.groupId);
if (activeTabGroupId !== undefined && this._activeGroupId !== activeTabGroupId) {
this._activeGroupId = activeTabGroupId;
}

4
src/vs/workbench/api/common/extHostNotebook.ts
View File

@ -12,7 +12,7 @@ import { DisposableStore, IDisposable, toDisposable } from '../../../base/common
import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
import { MarshalledId } from '../../../base/common/marshallingIds.js';
import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { URI, UriComponents } from '../../../base/common/uri.js';
import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
import * as files from '../../../platform/files/common/files.js';
@ -200,7 +200,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
}
const canonicalUri = await this._notebookDocumentsProxy.$tryOpenNotebook(uri);
const document = this._documents.get(URI.revive(canonicalUri));
return assertIsDefined(document?.apiNotebook);
return assertReturnsDefined(document?.apiNotebook);
}
async showNotebookDocument(notebook: vscode.NotebookDocument, options?: vscode.NotebookDocumentShowOptions): Promise<vscode.NotebookEditor> {

4
src/vs/workbench/browser/composite.ts
View File

@ -13,7 +13,7 @@ import { IConstructorSignature, IInstantiationService } from '../../platform/ins
import { trackFocus, Dimension, IDomPosition } from '../../base/browser/dom.js';
import { IStorageService } from '../../platform/storage/common/storage.js';
import { Disposable } from '../../base/common/lifecycle.js';
import { assertIsDefined } from '../../base/common/types.js';
import { assertReturnsDefined } from '../../base/common/types.js';
import { IActionViewItem } from '../../base/browser/ui/actionbar/actionbar.js';
import { MenuId } from '../../platform/actions/common/actions.js';
import { IBoundarySashes } from '../../base/browser/ui/sash/sash.js';
@ -60,7 +60,7 @@ export abstract class Composite extends Component implements IComposite {
}
private registerFocusTrackEvents(): { onDidFocus: Emitter<void>; onDidBlur: Emitter<void> } {
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
const focusTracker = this._register(trackFocus(container));
const onDidFocus = this._onDidFocus = this._register(new Emitter<void>());

10
src/vs/workbench/browser/layout.ts
View File

@ -30,7 +30,7 @@ import { IStatusbarService } from '../services/statusbar/browser/statusbar.js';
import { IFileService } from '../../platform/files/common/files.js';
import { isCodeEditor } from '../../editor/browser/editorBrowser.js';
import { coalesce } from '../../base/common/arrays.js';
import { assertIsDefined } from '../../base/common/types.js';
import { assertReturnsDefined } from '../../base/common/types.js';
import { INotificationService, NotificationsFilter } from '../../platform/notification/common/notification.js';
import { IThemeService } from '../../platform/theme/common/themeService.js';
import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from '../common/theme.js';
@ -556,9 +556,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON, position);
// Adjust CSS
const activityBarContainer = assertIsDefined(activityBar.getContainer());
const sideBarContainer = assertIsDefined(sideBar.getContainer());
const auxiliaryBarContainer = assertIsDefined(auxiliaryBar.getContainer());
const activityBarContainer = assertReturnsDefined(activityBar.getContainer());
const sideBarContainer = assertReturnsDefined(sideBar.getContainer());
const auxiliaryBarContainer = assertReturnsDefined(auxiliaryBar.getContainer());
activityBarContainer.classList.remove(oldPositionValue);
sideBarContainer.classList.remove(oldPositionValue);
activityBarContainer.classList.add(newPositionValue);
@ -2137,7 +2137,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
const newPositionValue = positionToString(position);
// Adjust CSS
const panelContainer = assertIsDefined(panelPart.getContainer());
const panelContainer = assertReturnsDefined(panelPart.getContainer());
panelContainer.classList.remove(oldPositionValue);
panelContainer.classList.add(newPositionValue);

4
src/vs/workbench/browser/part.ts
View File

@ -11,7 +11,7 @@ import { IStorageService } from '../../platform/storage/common/storage.js';
import { ISerializableView, IViewSize } from '../../base/browser/ui/grid/grid.js';
import { Event, Emitter } from '../../base/common/event.js';
import { IWorkbenchLayoutService } from '../services/layout/browser/layoutService.js';
import { assertIsDefined } from '../../base/common/types.js';
import { assertReturnsDefined } from '../../base/common/types.js';
import { IDisposable, toDisposable } from '../../base/common/lifecycle.js';
export interface IPartOptions {
@ -194,7 +194,7 @@ export abstract class Part extends Component implements ISerializableView {
* Layout title and content area in the given dimension.
*/
protected layoutContents(width: number, height: number): ILayoutContentResult {
const partLayout = assertIsDefined(this.partLayout);
const partLayout = assertReturnsDefined(this.partLayout);
return partLayout.layout(width, height);
}

6
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
View File

@ -16,7 +16,7 @@ import { IThemeService, IColorTheme, registerThemingParticipant } from '../../..
import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from '../../../common/theme.js';
import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
import { addDisposableListener, append, EventType, isAncestor, $, clearNode } from '../../../../base/browser/dom.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { CustomMenubarControl } from '../titlebar/menubarControl.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { getMenuBarVisibility, MenuSettings } from '../../../../platform/window/common/window.js';
@ -129,7 +129,7 @@ export class ActivitybarPart extends Part {
override updateStyles(): void {
super.updateStyles();
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
const background = this.getColor(ACTIVITY_BAR_BACKGROUND) || '';
container.style.backgroundColor = background;
@ -281,7 +281,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
this.menuBarContainer = $('.menubar');
const content = assertIsDefined(this.element);
const content = assertReturnsDefined(this.element);
content.prepend(this.menuBarContainer);
// Menubar: install a custom menu bar depending on configuration

4
src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
View File

@ -21,7 +21,7 @@ import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Po
import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
import { IAction, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
import { ToggleAuxiliaryBarAction } from './auxiliaryBarActions.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { LayoutPriority } from '../../../../base/browser/ui/splitview/splitview.js';
import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
import { ICommandService } from '../../../../platform/commands/common/commands.js';
@ -159,7 +159,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
override updateStyles(): void {
super.updateStyles();
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
const borderColor = this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder);
const isPositionLeft = this.layoutService.getSideBarPosition() === Position.RIGHT;

12
src/vs/workbench/browser/parts/compositePart.ts
View File

@ -26,7 +26,7 @@ import { IThemeService } from '../../../platform/theme/common/themeService.js';
import { INotificationService } from '../../../platform/notification/common/notification.js';
import { Dimension, append, $, hide, show } from '../../../base/browser/dom.js';
import { AnchorAlignment } from '../../../base/browser/ui/contextview/contextview.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { createActionViewItem } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
import { AbstractProgressScope, ScopedProgressIndicator } from '../../services/progress/browser/progressIndicator.js';
import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
@ -181,7 +181,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
const compositeDescriptor = this.registry.getComposite(id);
if (compositeDescriptor) {
const that = this;
const compositeProgressIndicator = new ScopedProgressIndicator(assertIsDefined(this.progressBar), new class extends AbstractProgressScope {
const compositeProgressIndicator = new ScopedProgressIndicator(assertReturnsDefined(this.progressBar), new class extends AbstractProgressScope {
constructor() {
super(compositeDescriptor!.id, !!isActive);
this._register(that.onDidCompositeOpen.event(e => this.onScopeOpened(e.composite.getId())));
@ -252,7 +252,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
show(compositeContainer);
// Setup action runner
const toolBar = assertIsDefined(this.toolBar);
const toolBar = assertReturnsDefined(this.toolBar);
toolBar.actionRunner = composite.getActionRunner();
// Update title with composite title if it differs from descriptor
@ -333,7 +333,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
const toolBar = assertIsDefined(this.toolBar);
const toolBar = assertReturnsDefined(this.toolBar);
toolBar.setAriaLabel(localize('ariaCompositeToolbarLabel', "{0} actions", compositeTitle));
}
@ -345,7 +345,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
const secondaryActions: IAction[] = composite?.getSecondaryActions().slice(0) || [];
// Update context
const toolBar = assertIsDefined(this.toolBar);
const toolBar = assertReturnsDefined(this.toolBar);
toolBar.context = this.actionsContextProvider();
// Return fn to set into toolbar
@ -455,7 +455,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
super.updateStyles();
// Forward to title label
const titleLabel = assertIsDefined(this.titleLabel);
const titleLabel = assertReturnsDefined(this.titleLabel);
titleLabel.updateStyles();
}

10
src/vs/workbench/browser/parts/editor/editorDropTarget.ts
View File

@ -10,7 +10,7 @@ import { renderFormattedText } from '../../../../base/browser/formattedTextRende
import { RunOnceScheduler } from '../../../../base/common/async.js';
import { toDisposable } from '../../../../base/common/lifecycle.js';
import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsAllDefined, assertReturnsDefined } from '../../../../base/common/types.js';
import { localize } from '../../../../nls.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@ -113,7 +113,7 @@ class DropOverlay extends Themable {
}
override updateStyles(): void {
const overlay = assertIsDefined(this.overlay);
const overlay = assertReturnsDefined(this.overlay);
// Overlay drop background
overlay.style.backgroundColor = this.getColor(EDITOR_DRAG_AND_DROP_BACKGROUND) || '';
@ -492,7 +492,7 @@ class DropOverlay extends Themable {
}
// Make sure the overlay is visible now
const overlay = assertIsDefined(this.overlay);
const overlay = assertReturnsDefined(this.overlay);
overlay.style.opacity = '1';
// Enable transition after a timeout to prevent initial animation
@ -503,7 +503,7 @@ class DropOverlay extends Themable {
}
private doPositionOverlay(options: { top: string; left: string; width: string; height: string }): void {
const [container, overlay] = assertAllDefined(this.container, this.overlay);
const [container, overlay] = assertReturnsAllDefined(this.container, this.overlay);
// Container
const offsetHeight = this.getOverlayOffsetHeight();
@ -532,7 +532,7 @@ class DropOverlay extends Themable {
}
private hideOverlay(): void {
const overlay = assertIsDefined(this.overlay);
const overlay = assertReturnsDefined(this.overlay);
// Reset overlay
this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '100%' });

6
src/vs/workbench/browser/parts/editor/editorPanes.ts
View File

@ -18,7 +18,7 @@ import { EditorPane } from './editorPane.js';
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
import { IEditorProgressService, LongRunningOperation } from '../../../../platform/progress/common/progress.js';
import { IEditorGroupView, DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS, IInternalEditorOpenOptions } from './editor.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
import { ErrorPlaceholderEditor, IErrorEditorPlaceholderOptions, WorkspaceTrustRequiredPlaceholderEditor } from './editorPlaceholder.js';
import { EditorOpenSource, IEditorOptions } from '../../../../platform/editor/common/editor.js';
@ -317,7 +317,7 @@ export class EditorPanes extends Disposable {
return WorkspaceTrustRequiredPlaceholderEditor.DESCRIPTOR;
}
return assertIsDefined(this.editorPanesRegistry.getEditorPane(editor));
return assertReturnsDefined(this.editorPanesRegistry.getEditorPane(editor));
}
private doShowEditorPane(descriptor: IEditorPaneDescriptor): EditorPane {
@ -337,7 +337,7 @@ export class EditorPanes extends Disposable {
this.doSetActiveEditorPane(editorPane);
// Show editor
const container = assertIsDefined(editorPane.getContainer());
const container = assertReturnsDefined(editorPane.getContainer());
this.editorPanesParent.appendChild(container);
show(container);

6
src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
View File

@ -18,7 +18,7 @@ import { Dimension, size, clearNode, $, EventHelper } from '../../../../base/bro
import { CancellationToken } from '../../../../base/common/cancellation.js';
import { DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
import { IStorageService } from '../../../../platform/storage/common/storage.js';
import { assertAllDefined } from '../../../../base/common/types.js';
import { assertReturnsAllDefined } from '../../../../base/common/types.js';
import { ICommandService } from '../../../../platform/commands/common/commands.js';
import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
import { EditorOpenSource, IEditorOptions } from '../../../../platform/editor/common/editor.js';
@ -90,7 +90,7 @@ export abstract class EditorPlaceholder extends EditorPane {
}
private async renderInput(input: EditorInput, options: IEditorOptions | undefined): Promise<IDisposable> {
const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar);
const [container, scrollbar] = assertReturnsAllDefined(this.container, this.scrollbar);
// Reset any previous contents
clearNode(container);
@ -155,7 +155,7 @@ export abstract class EditorPlaceholder extends EditorPane {
}
layout(dimension: Dimension): void {
const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar);
const [container, scrollbar] = assertReturnsAllDefined(this.container, this.scrollbar);
// Pass on to Container
size(container, dimension.width, dimension.height);

16
src/vs/workbench/browser/parts/editor/editorStatus.ts
View File

@ -8,7 +8,7 @@ import { localize, localize2 } from '../../../../nls.js';
import { getWindowById, runAtThisOrScheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
import { format, compare, splitLines } from '../../../../base/common/strings.js';
import { extname, basename, isEqual } from '../../../../base/common/resources.js';
import { areFunctions, assertIsDefined } from '../../../../base/common/types.js';
import { areFunctions, assertReturnsDefined } from '../../../../base/common/types.js';
import { URI } from '../../../../base/common/uri.js';
import { Action } from '../../../../base/common/actions.js';
import { Language } from '../../../../base/common/platform.js';
@ -412,13 +412,13 @@ class EditorStatus extends Disposable {
}
const picks: QuickPickInput<IQuickPickItem & { run(): void }>[] = [
assertIsDefined(activeTextEditorControl.getAction(IndentUsingSpaces.ID)),
assertIsDefined(activeTextEditorControl.getAction(IndentUsingTabs.ID)),
assertIsDefined(activeTextEditorControl.getAction(ChangeTabDisplaySize.ID)),
assertIsDefined(activeTextEditorControl.getAction(DetectIndentation.ID)),
assertIsDefined(activeTextEditorControl.getAction(IndentationToSpacesAction.ID)),
assertIsDefined(activeTextEditorControl.getAction(IndentationToTabsAction.ID)),
assertIsDefined(activeTextEditorControl.getAction(TrimTrailingWhitespaceAction.ID))
assertReturnsDefined(activeTextEditorControl.getAction(IndentUsingSpaces.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(IndentUsingTabs.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(ChangeTabDisplaySize.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(DetectIndentation.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(IndentationToSpacesAction.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(IndentationToTabsAction.ID)),
assertReturnsDefined(activeTextEditorControl.getAction(TrimTrailingWhitespaceAction.ID))
].map((a: IEditorAction) => {
return {
id: a.id,

6
src/vs/workbench/browser/parts/editor/editorTabsControl.ts
View File

@ -28,7 +28,7 @@ import { IEditorCommandsContext, EditorResourceAccessor, IEditorPartOptions, Sid
import { EditorInput } from '../../../common/editor/editorInput.js';
import { ResourceContextKey, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorFirstInGroupContext, ActiveEditorAvailableEditorIdsContext, applyAvailableEditorIds, ActiveEditorLastInGroupContext } from '../../../common/contextkeys.js';
import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { isFirefox } from '../../../../base/browser/browser.js';
import { isCancellationError } from '../../../../base/common/errors.js';
import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
@ -260,7 +260,7 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
const editorActions = this.groupView.createEditorActions(this.editorActionsDisposables);
this.editorActionsDisposables.add(editorActions.onDidChange(() => this.updateEditorActionsToolbar()));
const editorActionsToolbar = assertIsDefined(this.editorActionsToolbar);
const editorActionsToolbar = assertReturnsDefined(this.editorActionsToolbar);
const { primary, secondary } = this.prepareEditorActions(editorActions.actions);
editorActionsToolbar.setActions(prepareActions(primary), prepareActions(secondary));
}
@ -275,7 +275,7 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
return;
}
const editorActionsToolbar = assertIsDefined(this.editorActionsToolbar);
const editorActionsToolbar = assertReturnsDefined(this.editorActionsToolbar);
editorActionsToolbar.setActions([], []);
}

26
src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
View File

@ -36,7 +36,7 @@ import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNex
import { localize } from '../../../../nls.js';
import { IEditorGroupsView, EditorServiceImpl, IEditorGroupView, IInternalEditorOpenOptions, IEditorPartsView, prepareMoveCopyEditors } from './editor.js';
import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsAllDefined, assertReturnsDefined } from '../../../../base/common/types.js';
import { IEditorService } from '../../../services/editor/common/editorService.js';
import { basenameOrAuthority } from '../../../../base/common/resources.js';
import { RunOnceScheduler } from '../../../../base/common/async.js';
@ -224,7 +224,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
}
private updateTabSizing(fromEvent: boolean): void {
const [tabsContainer, tabSizingFixedDisposables] = assertAllDefined(this.tabsContainer, this.tabSizingFixedDisposables);
const [tabsContainer, tabSizingFixedDisposables] = assertReturnsAllDefined(this.tabsContainer, this.tabSizingFixedDisposables);
tabSizingFixedDisposables.clear();
@ -505,7 +505,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
this.updateTabsControlVisibility();
// Create tabs as needed
const [tabsContainer, tabsScrollbar] = assertAllDefined(this.tabsContainer, this.tabsScrollbar);
const [tabsContainer, tabsScrollbar] = assertReturnsAllDefined(this.tabsContainer, this.tabsScrollbar);
for (let i = tabsContainer.children.length; i < this.tabsModel.count; i++) {
tabsContainer.appendChild(this.createTab(i, tabsContainer, tabsScrollbar));
}
@ -592,7 +592,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
if (this.tabsModel.count) {
// Remove tabs that got closed
const tabsContainer = assertIsDefined(this.tabsContainer);
const tabsContainer = assertReturnsDefined(this.tabsContainer);
while (tabsContainer.children.length > this.tabsModel.count) {
// Remove one tab from container (must be the last to keep indexes in order!)
@ -788,7 +788,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
}
private doWithTab(tabIndex: number, editor: EditorInput, fn: (editor: EditorInput, tabIndex: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar) => void): void {
const tabsContainer = assertIsDefined(this.tabsContainer);
const tabsContainer = assertReturnsDefined(this.tabsContainer);
const tabContainer = tabsContainer.children[tabIndex] as HTMLElement;
const tabResourceLabel = this.tabResourceLabels.get(tabIndex);
const tabLabel = this.tabLabels[tabIndex];
@ -857,7 +857,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
// Given a `tabIndex` that is relative to the tabs model
// returns the `editorIndex` relative to the entire group
const editor = assertIsDefined(this.tabsModel.getEditorByIndex(tabIndex));
const editor = assertReturnsDefined(this.tabsModel.getEditorByIndex(tabIndex));
return this.groupView.getIndexOfEditor(editor);
}
@ -891,7 +891,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
anchor = this.lastSingleSelectSelectedEditor;
} else {
// The active editor is the anchor
const activeEditor = assertIsDefined(this.groupView.activeEditor);
const activeEditor = assertReturnsDefined(this.groupView.activeEditor);
this.lastSingleSelectSelectedEditor = activeEditor;
anchor = activeEditor;
}
@ -1331,7 +1331,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
return;
}
let newActiveEditor = assertIsDefined(this.groupView.activeEditor);
let newActiveEditor = assertReturnsDefined(this.groupView.activeEditor);
// If active editor is bing unselected then find the most recently opened selected editor
// that is not the editor being unselected
@ -1352,7 +1352,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
private async unselectAllEditors(): Promise<void> {
if (this.groupView.selectedEditors.length > 1) {
const activeEditor = assertIsDefined(this.groupView.activeEditor);
const activeEditor = assertReturnsDefined(this.groupView.activeEditor);
await this.groupView.setSelection(activeEditor, []);
}
}
@ -1845,7 +1845,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
}
private doLayoutTabsWrapping(dimensions: IEditorTitleControlDimensions): boolean {
const [tabsAndActionsContainer, tabsContainer, editorToolbarContainer, tabsScrollbar] = assertAllDefined(this.tabsAndActionsContainer, this.tabsContainer, this.editorActionsToolbarContainer, this.tabsScrollbar);
const [tabsAndActionsContainer, tabsContainer, editorToolbarContainer, tabsScrollbar] = assertReturnsAllDefined(this.tabsAndActionsContainer, this.tabsContainer, this.editorActionsToolbarContainer, this.tabsScrollbar);
// Handle wrapping tabs according to setting:
// - enabled: only add class if tabs wrap and don't exceed available dimensions
@ -1979,7 +1979,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
}
private doLayoutTabsNonWrapping(options?: IMultiEditorTabsControlLayoutOptions): void {
const [tabsContainer, tabsScrollbar] = assertAllDefined(this.tabsContainer, this.tabsScrollbar);
const [tabsContainer, tabsScrollbar] = assertReturnsAllDefined(this.tabsContainer, this.tabsScrollbar);
//
// Synopsis
@ -2123,7 +2123,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
}
private updateTabsControlVisibility(): void {
const tabsAndActionsContainer = assertIsDefined(this.tabsAndActionsContainer);
const tabsAndActionsContainer = assertReturnsDefined(this.tabsAndActionsContainer);
tabsAndActionsContainer.classList.toggle('empty', !this.visible);
// Reset dimensions if hidden
@ -2148,7 +2148,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
private getTabAtIndex(tabIndex: number): HTMLElement | undefined {
if (tabIndex >= 0) {
const tabsContainer = assertIsDefined(this.tabsContainer);
const tabsContainer = assertReturnsDefined(this.tabsContainer);
return tabsContainer.children[tabIndex] as HTMLElement | undefined;
}

14
src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
View File

@ -20,7 +20,7 @@ import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/com
import { SplitView, Sizing, Orientation } from '../../../../base/browser/ui/splitview/splitview.js';
import { Event, Relay, Emitter } from '../../../../base/common/event.js';
import { IStorageService } from '../../../../platform/storage/common/storage.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
import { IConfigurationChangeEvent, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { DEFAULT_EDITOR_MIN_DIMENSIONS } from './editor.js';
@ -157,7 +157,7 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
}
private recreateSplitview(): void {
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
// Clear old (if any) but remember ratio
const ratio = this.getSplitViewRatio();
@ -228,7 +228,7 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
}
// Secondary (left)
const secondaryEditorContainer = assertIsDefined(this.secondaryEditorContainer);
const secondaryEditorContainer = assertReturnsDefined(this.secondaryEditorContainer);
this.splitview.addView({
element: secondaryEditorContainer,
layout: size => this.layoutPane(this.secondaryEditorPane, size),
@ -238,7 +238,7 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
}, leftSizing);
// Primary (right)
const primaryEditorContainer = assertIsDefined(this.primaryEditorContainer);
const primaryEditorContainer = assertReturnsDefined(this.primaryEditorContainer);
this.splitview.addView({
element: primaryEditorContainer,
layout: size => this.layoutPane(this.primaryEditorPane, size),
@ -328,8 +328,8 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
private createEditors(newInput: SideBySideEditorInput): void {
// Create editors
this.secondaryEditorPane = this.doCreateEditor(newInput.secondary, assertIsDefined(this.secondaryEditorContainer));
this.primaryEditorPane = this.doCreateEditor(newInput.primary, assertIsDefined(this.primaryEditorContainer));
this.secondaryEditorPane = this.doCreateEditor(newInput.secondary, assertReturnsDefined(this.secondaryEditorContainer));
this.primaryEditorPane = this.doCreateEditor(newInput.primary, assertReturnsDefined(this.primaryEditorContainer));
// Layout
this.layout(this.dimension);
@ -437,7 +437,7 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
layout(dimension: Dimension): void {
this.dimension = dimension;
const splitview = assertIsDefined(this.splitview);
const splitview = assertReturnsDefined(this.splitview);
splitview.layout(this.orientation === Orientation.HORIZONTAL ? dimension.width : dimension.height);
}

8
src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
View File

@ -13,7 +13,7 @@ import { EventType as TouchEventType, GestureEvent, Gesture } from '../../../../
import { addDisposableListener, EventType, EventHelper, Dimension, isAncestor, DragAndDropObserver, isHTMLElement, $ } from '../../../../base/browser/dom.js';
import { CLOSE_EDITOR_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID } from './editorCommands.js';
import { Color } from '../../../../base/common/color.js';
import { assertIsDefined, assertAllDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined, assertReturnsAllDefined } from '../../../../base/common/types.js';
import { equals } from '../../../../base/common/objects.js';
import { toDisposable } from '../../../../base/common/lifecycle.js';
import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
@ -197,7 +197,7 @@ export class SingleEditorTabsControl extends EditorTabsControl {
updateEditorDirty(editor: EditorInput): void {
this.ifEditorIsActive(editor, () => {
const titleContainer = assertIsDefined(this.titleContainer);
const titleContainer = assertReturnsDefined(this.titleContainer);
// Signal dirty (unless saving)
if (editor.isDirty() && !editor.isSaving()) {
@ -224,7 +224,7 @@ export class SingleEditorTabsControl extends EditorTabsControl {
}
protected handleBreadcrumbsEnablementChange(): void {
const titleContainer = assertIsDefined(this.titleContainer);
const titleContainer = assertReturnsDefined(this.titleContainer);
titleContainer.classList.toggle('breadcrumbs', Boolean(this.breadcrumbsControl));
this.redraw();
@ -280,7 +280,7 @@ export class SingleEditorTabsControl extends EditorTabsControl {
}
// Clear if there is no editor
const [titleContainer, editorLabel] = assertAllDefined(this.titleContainer, this.editorLabel);
const [titleContainer, editorLabel] = assertReturnsAllDefined(this.titleContainer, this.editorLabel);
if (!editor) {
titleContainer.classList.remove('dirty');
editorLabel.clear();

4
src/vs/workbench/browser/parts/editor/textCodeEditor.ts
View File

@ -5,7 +5,7 @@
import { localize } from '../../../../nls.js';
import { URI } from '../../../../base/common/uri.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { ITextEditorPane } from '../../../common/editor.js';
import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@ -83,7 +83,7 @@ export abstract class AbstractTextCodeEditor<T extends IEditorViewState> extends
super.setOptions(options);
if (options) {
applyTextEditorOptions(options, assertIsDefined(this.editorControl), ScrollType.Smooth);
applyTextEditorOptions(options, assertReturnsDefined(this.editorControl), ScrollType.Smooth);
}
}

6
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
View File

@ -5,7 +5,7 @@
import { localize } from '../../../../nls.js';
import { deepClone } from '../../../../base/common/objects.js';
import { isObject, assertIsDefined } from '../../../../base/common/types.js';
import { isObject, assertReturnsDefined } from '../../../../base/common/types.js';
import { ICodeEditor, IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from '../../../../editor/common/config/editorOptions.js';
import { AbstractTextEditor, IEditorConfiguration } from './textEditor.js';
@ -121,7 +121,7 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp
}
// Set Editor Model
const control = assertIsDefined(this.diffEditorControl);
const control = assertReturnsDefined(this.diffEditorControl);
const resolvedDiffEditorModel = resolvedModel as TextDiffEditorModel;
const vm = resolvedDiffEditorModel.textDiffEditorModel ? control.createViewModel(resolvedDiffEditorModel.textDiffEditorModel) : null;
@ -243,7 +243,7 @@ export class TextDiffEditor extends AbstractTextEditor<IDiffEditorViewState> imp
super.setOptions(options);
if (options) {
applyTextEditorOptions(options, assertIsDefined(this.diffEditorControl), ScrollType.Smooth);
applyTextEditorOptions(options, assertReturnsDefined(this.diffEditorControl), ScrollType.Smooth);
}
}

4
src/vs/workbench/browser/parts/editor/textEditor.ts
View File

@ -7,7 +7,7 @@ import { localize } from '../../../../nls.js';
import { URI } from '../../../../base/common/uri.js';
import { distinct, deepClone } from '../../../../base/common/objects.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { isObject, assertIsDefined } from '../../../../base/common/types.js';
import { isObject, assertReturnsDefined } from '../../../../base/common/types.js';
import { MutableDisposable } from '../../../../base/common/lifecycle.js';
import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
import { IEditorOpenContext, IEditorPaneSelection, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason, IEditorPaneWithSelection, IEditorPaneSelectionChangeEvent, IEditorPaneScrollPosition, IEditorPaneWithScrolling } from '../../../common/editor.js';
@ -248,7 +248,7 @@ export abstract class AbstractTextEditor<T extends IEditorViewState> extends Abs
this.updateEditorConfiguration();
// Update aria label on editor
const editorContainer = assertIsDefined(this.editorContainer);
const editorContainer = assertReturnsDefined(this.editorContainer);
editorContainer.setAttribute('aria-label', this.computeAriaLabel());
}

4
src/vs/workbench/browser/parts/editor/textResourceEditor.ts
View File

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { ICodeEditor, IPasteEvent } from '../../../../editor/browser/editorBrowser.js';
import { IEditorOpenContext, isTextEditorViewState } from '../../../common/editor.js';
import { EditorInput } from '../../../common/editor/editorInput.js';
@ -67,7 +67,7 @@ export abstract class AbstractTextResourceEditor extends AbstractTextCodeEditor<
}
// Set Editor Model
const control = assertIsDefined(this.editorControl);
const control = assertReturnsDefined(this.editorControl);
const textEditorModel = resolvedModel.textEditorModel;
control.setModel(textEditorModel);

12
src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
View File

@ -22,7 +22,7 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
import { ClearAllNotificationsAction, ConfigureDoNotDisturbAction, ToggleDoNotDisturbBySourceAction, HideNotificationsCenterAction, ToggleDoNotDisturbAction } from './notificationsActions.js';
import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsAllDefined, assertReturnsDefined } from '../../../../base/common/types.js';
import { NotificationsCenterVisibleContext } from '../../../common/contextkeys.js';
import { INotificationService, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
import { mainWindow } from '../../../../base/browser/window.js';
@ -87,7 +87,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
show(): void {
if (this._isVisible) {
const notificationsList = assertIsDefined(this.notificationsList);
const notificationsList = assertReturnsDefined(this.notificationsList);
// Make visible
notificationsList.show();
@ -107,7 +107,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
this.updateTitle();
// Make visible
const [notificationsList, notificationsCenterContainer] = assertAllDefined(this.notificationsList, this.notificationsCenterContainer);
const [notificationsList, notificationsCenterContainer] = assertReturnsAllDefined(this.notificationsList, this.notificationsCenterContainer);
this._isVisible = true;
notificationsCenterContainer.classList.add('visible');
notificationsList.show();
@ -135,7 +135,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
}
private updateTitle(): void {
const [notificationsCenterTitle, clearAllAction] = assertAllDefined(this.notificationsCenterTitle, this.clearAllAction);
const [notificationsCenterTitle, clearAllAction] = assertReturnsAllDefined(this.notificationsCenterTitle, this.clearAllAction);
if (this.model.notifications.length === 0) {
notificationsCenterTitle.textContent = localize('notificationsEmpty', "No new notifications");
@ -245,7 +245,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
let focusEditor = false;
// Update notifications list based on event kind
const [notificationsList, notificationsCenterContainer] = assertAllDefined(this.notificationsList, this.notificationsCenterContainer);
const [notificationsList, notificationsCenterContainer] = assertReturnsAllDefined(this.notificationsList, this.notificationsCenterContainer);
switch (e.kind) {
case NotificationChangeType.ADD:
notificationsList.updateNotificationsList(e.index, 0, [e.item]);
@ -365,7 +365,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
}
// Apply to list
const notificationsList = assertIsDefined(this.notificationsList);
const notificationsList = assertReturnsDefined(this.notificationsList);
notificationsList.layout(Math.min(maxWidth, availableWidth), Math.min(maxHeight, availableHeight));
}
}

6
src/vs/workbench/browser/parts/notifications/notificationsList.ts
View File

@ -14,7 +14,7 @@ import { INotificationViewItem } from '../../../common/notifications.js';
import { NotificationsListDelegate, NotificationRenderer } from './notificationsViewer.js';
import { CopyNotificationMessageAction } from './notificationsActions.js';
import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
import { assertAllDefined } from '../../../../base/common/types.js';
import { assertReturnsAllDefined } from '../../../../base/common/types.js';
import { NotificationFocusedContext } from '../../../common/contextkeys.js';
import { Disposable } from '../../../../base/common/lifecycle.js';
import { AriaRole } from '../../../../base/browser/ui/aria/aria.js';
@ -131,7 +131,7 @@ export class NotificationsList extends Disposable {
}
updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
const [list, listContainer] = assertAllDefined(this.list, this.listContainer);
const [list, listContainer] = assertReturnsAllDefined(this.list, this.listContainer);
const listHasDOMFocus = isAncestorOfActiveElement(listContainer);
// Remember focus and relative top of that item
@ -188,7 +188,7 @@ export class NotificationsList extends Disposable {
return;
}
const [list, listDelegate] = assertAllDefined(this.list, this.listDelegate);
const [list, listDelegate] = assertReturnsAllDefined(this.list, this.listDelegate);
list.updateElementHeight(index, listDelegate.getHeight(item));
list.layout();
}

4
src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
View File

@ -23,7 +23,7 @@ import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
import { IHostService } from '../../../services/host/browser/host.js';
import { IntervalCounter } from '../../../../base/common/async.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
import { mainWindow } from '../../../../base/browser/window.js';
@ -608,7 +608,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
}
// Update visibility in DOM
const notificationsToastsContainer = assertIsDefined(this.notificationsToastsContainer);
const notificationsToastsContainer = assertReturnsDefined(this.notificationsToastsContainer);
if (visible) {
notificationsToastsContainer.appendChild(toast.container);
} else {

4
src/vs/workbench/browser/parts/paneCompositePartService.ts
View File

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { Event } from '../../../base/common/event.js';
import { assertIsDefined } from '../../../base/common/types.js';
import { assertReturnsDefined } from '../../../base/common/types.js';
import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
import { IProgressIndicator } from '../../../platform/progress/common/progress.js';
@ -86,7 +86,7 @@ export class PaneCompositePartService extends Disposable implements IPaneComposi
}
private getPartByLocation(viewContainerLocation: ViewContainerLocation): IPaneCompositePart {
return assertIsDefined(this.paneCompositeParts.get(viewContainerLocation));
return assertReturnsDefined(this.paneCompositeParts.get(viewContainerLocation));
}
}

4
src/vs/workbench/browser/parts/panel/panelPart.ts
View File

@ -20,7 +20,7 @@ import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.
import { INotificationService } from '../../../../platform/notification/common/notification.js';
import { Dimension } from '../../../../base/browser/dom.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IExtensionService } from '../../../services/extensions/common/extensions.js';
import { IViewDescriptorService } from '../../../common/views.js';
import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
@ -116,7 +116,7 @@ export class PanelPart extends AbstractPaneCompositePart {
override updateStyles(): void {
super.updateStyles();
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
container.style.backgroundColor = this.getColor(PANEL_BACKGROUND) || '';
const borderColor = this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || '';
container.style.borderLeftColor = borderColor;

4
src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
View File

@ -19,7 +19,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
import { IExtensionService } from '../../../services/extensions/common/extensions.js';
import { LayoutPriority } from '../../../../base/browser/ui/grid/grid.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IViewDescriptorService } from '../../../common/views.js';
import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
import { ActivityBarCompositeBar, ActivitybarPart } from '../activitybar/activitybarPart.js';
@ -135,7 +135,7 @@ export class SidebarPart extends AbstractPaneCompositePart {
override updateStyles(): void {
super.updateStyles();
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';

4
src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
View File

@ -15,7 +15,7 @@ import { ThemeColor } from '../../../../base/common/themables.js';
import { isThemeColor } from '../../../../editor/common/editorCommon.js';
import { addDisposableListener, EventType, hide, show, append, EventHelper, $ } from '../../../../base/browser/dom.js';
import { INotificationService } from '../../../../platform/notification/common/notification.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { Command } from '../../../../editor/common/languages.js';
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
import { KeyCode } from '../../../../base/common/keyCodes.js';
@ -46,7 +46,7 @@ export class StatusbarEntryItem extends Disposable {
readonly beakContainer: HTMLElement;
get name(): string {
return assertIsDefined(this.entry).name;
return assertReturnsDefined(this.entry).name;
}
get hasCommand(): boolean {

10
src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
View File

@ -24,7 +24,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
import { equals } from '../../../../base/common/arrays.js';
import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
import { ToggleStatusbarVisibilityAction } from '../../actions/layoutActions.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
import { isHighContrast } from '../../../../platform/theme/common/theme.js';
import { hash } from '../../../../base/common/hash.js';
@ -445,8 +445,8 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
}
private appendStatusbarEntries(): void {
const leftItemsContainer = assertIsDefined(this.leftItemsContainer);
const rightItemsContainer = assertIsDefined(this.rightItemsContainer);
const leftItemsContainer = assertReturnsDefined(this.leftItemsContainer);
const rightItemsContainer = assertReturnsDefined(this.rightItemsContainer);
// Clear containers
clearNode(leftItemsContainer);
@ -473,7 +473,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
entries.reverse(); // reversing due to flex: row-reverse
}
const target = assertIsDefined(entry.alignment === StatusbarAlignment.LEFT ? this.leftItemsContainer : this.rightItemsContainer);
const target = assertReturnsDefined(entry.alignment === StatusbarAlignment.LEFT ? this.leftItemsContainer : this.rightItemsContainer);
const index = entries.indexOf(entry);
if (index + 1 === entries.length) {
@ -635,7 +635,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
override updateStyles(): void {
super.updateStyles();
const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
const styleOverride: IStatusbarStyleOverride | undefined = [...this.styleOverrides].sort((a, b) => a.priority - b.priority)[0];
// Background / foreground colors

4
src/vs/workbench/browser/parts/views/viewPane.ts
View File

@ -23,7 +23,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
import { Extensions as ViewContainerExtensions, IView, IViewDescriptorService, ViewContainerLocation, IViewsRegistry, IViewContentDescriptor, defaultViewIcon, ViewContainerLocationToString } from '../../../common/views.js';
import { IViewsService } from '../../../services/views/common/viewsService.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
import { assertIsDefined, PartialExcept } from '../../../../base/common/types.js';
import { assertReturnsDefined, PartialExcept } from '../../../../base/common/types.js';
import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
import { MenuId, Action2, IAction2Options, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@ -641,7 +641,7 @@ export abstract class ViewPane extends Pane implements IView {
if (this.progressIndicator === undefined) {
const that = this;
this.progressIndicator = this._register(new ScopedProgressIndicator(assertIsDefined(this.progressBar), new class extends AbstractProgressScope {
this.progressIndicator = this._register(new ScopedProgressIndicator(assertReturnsDefined(this.progressBar), new class extends AbstractProgressScope {
constructor() {
super(that.id, that.isBodyVisible());
this._register(that.onDidChangeBodyVisibility(isVisible => isVisible ? this.onScopeOpened(that.id) : this.onScopeClosed(that.id)));

14
src/vs/workbench/browser/parts/views/viewPaneContainer.ts
View File

@ -14,7 +14,7 @@ import { RunOnceScheduler } from '../../../../base/common/async.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import './media/paneviewlet.css';
import * as nls from '../../../../nls.js';
import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@ -347,7 +347,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
readonly onDidBlurView = this._onDidBlurView.event;
get onDidSashChange(): Event<number> {
return assertIsDefined(this.paneview).onDidSashChange;
return assertReturnsDefined(this.paneview).onDidSashChange;
}
get panes(): ViewPane[] {
@ -887,7 +887,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
const paneItem: IViewPaneItem = { pane, disposable: store };
this.paneItems.splice(index, 0, paneItem);
assertIsDefined(this.paneview).addPane(pane, size, index);
assertReturnsDefined(this.paneview).addPane(pane, size, index);
let overlay: ViewPaneDropOverlay | undefined;
@ -1041,7 +1041,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
this.lastFocusedPane = undefined;
}
assertIsDefined(this.paneview).removePane(pane);
assertReturnsDefined(this.paneview).removePane(pane);
const [paneItem] = this.paneItems.splice(index, 1);
paneItem.disposable.dispose();
@ -1065,7 +1065,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
const [paneItem] = this.paneItems.splice(fromIndex, 1);
this.paneItems.splice(toIndex, 0, paneItem);
assertIsDefined(this.paneview).movePane(from, to);
assertReturnsDefined(this.paneview).movePane(from, to);
this.viewContainerModel.move(fromViewDescriptor.id, toViewDescriptor.id);
@ -1073,11 +1073,11 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
}
resizePane(pane: ViewPane, size: number): void {
assertIsDefined(this.paneview).resizePane(pane, size);
assertReturnsDefined(this.paneview).resizePane(pane, size);
}
getPaneSize(pane: ViewPane): number {
return assertIsDefined(this.paneview).getPaneSize(pane);
return assertReturnsDefined(this.paneview).getPaneSize(pane);
}
private updateViewHeaders(): void {

4
src/vs/workbench/browser/web.main.ts
View File

@ -5,7 +5,7 @@
import { mark } from '../../base/common/performance.js';
import { domContentLoaded, detectFullscreen, getCookieValue, getWindow } from '../../base/browser/dom.js';
import { assertIsDefined } from '../../base/common/types.js';
import { assertReturnsDefined } from '../../base/common/types.js';
import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js';
import { ILogService, ConsoleLogger, getLogLevel, ILoggerService, ILogger } from '../../platform/log/common/log.js';
import { ConsoleLogInAutomationLogger } from '../../platform/log/browser/log.js';
@ -209,7 +209,7 @@ export class BrowserMain extends Disposable {
await remoteAuthorityResolverService.resolveAuthority(this.configuration.remoteAuthority);
},
openTunnel: async tunnelOptions => {
const tunnel = assertIsDefined(await remoteExplorerService.forward({
const tunnel = assertReturnsDefined(await remoteExplorerService.forward({
remote: tunnelOptions.remoteAddress,
local: tunnelOptions.localAddressPort,
name: tunnelOptions.label,

4
src/vs/workbench/common/editor.ts
View File

@ -5,7 +5,7 @@
import { localize } from '../../nls.js';
import { Event } from '../../base/common/event.js';
import { DeepRequiredNonNullable, assertIsDefined } from '../../base/common/types.js';
import { DeepRequiredNonNullable, assertReturnsDefined } from '../../base/common/types.js';
import { URI } from '../../base/common/uri.js';
import { Disposable, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
import { ICodeEditorViewState, IDiffEditor, IDiffEditorViewState, IEditor, IEditorViewState } from '../../editor/common/editorCommon.js';
@ -1558,7 +1558,7 @@ class EditorFactoryRegistry implements IEditorFactoryRegistry {
}
getFileEditorFactory(): IFileEditorFactory {
return assertIsDefined(this.fileEditorFactory);
return assertReturnsDefined(this.fileEditorFactory);
}
registerEditorSerializer(editorTypeId: string, ctor: IConstructorSignature<IEditorSerializer>): IDisposable {

4
src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
View File

@ -25,7 +25,7 @@ import { Selection } from '../../../../../editor/common/core/selection.js';
import { Position } from '../../../../../editor/common/core/position.js';
import { Range } from '../../../../../editor/common/core/range.js';
import { registerAction2 } from '../../../../../platform/actions/common/actions.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
import { toAction } from '../../../../../base/common/actions.js';
import { ThemeIcon } from '../../../../../base/common/themables.js';
@ -225,7 +225,7 @@ export class EditorDictation extends Disposable implements IEditorContribution {
let lastReplaceTextLength = 0;
const replaceText = (text: string, isPreview: boolean) => {
if (!previewStart) {
previewStart = assertIsDefined(this.editor.getPosition());
previewStart = assertReturnsDefined(this.editor.getPosition());
}
const endPosition = new Position(previewStart.lineNumber, previewStart.column + text.length);

8
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
View File

@ -12,7 +12,7 @@ import { IReference } from '../../../../base/common/lifecycle.js';
import { Schemas } from '../../../../base/common/network.js';
import { basename } from '../../../../base/common/path.js';
import { dirname, isEqual } from '../../../../base/common/resources.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { URI } from '../../../../base/common/uri.js';
import { localize } from '../../../../nls.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@ -338,7 +338,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
if (!this._modelRef) {
const oldCapabilities = this.capabilities;
this._modelRef = this._register(assertIsDefined(await this.customEditorService.models.tryRetain(this.resource, this.viewType)));
this._modelRef = this._register(assertReturnsDefined(await this.customEditorService.models.tryRetain(this.resource, this.viewType)));
this._register(this._modelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
this._register(this._modelRef.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
// If we're loading untitled file data we should ensure it's dirty
@ -362,12 +362,12 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
}
public undo(): void | Promise<void> {
assertIsDefined(this._modelRef);
assertReturnsDefined(this._modelRef);
return this.undoRedoService.undo(this.resource);
}
public redo(): void | Promise<void> {
assertIsDefined(this._modelRef);
assertReturnsDefined(this._modelRef);
return this.undoRedoService.redo(this.resource);
}

6
src/vs/workbench/contrib/customEditor/browser/customEditors.ts
View File

@ -9,7 +9,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
import { Schemas } from '../../../../base/common/network.js';
import { extname, isEqual } from '../../../../base/common/resources.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { URI } from '../../../../base/common/uri.js';
import { RedoCommand, UndoCommand } from '../../../../editor/browser/editorExtensions.js';
import { IResourceEditorInput } from '../../../../platform/editor/common/editor.js';
@ -157,8 +157,8 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
editorID: string,
group: IEditorGroup
): DiffEditorInput {
const modifiedOverride = CustomEditorInput.create(this.instantiationService, assertIsDefined(editor.modified.resource), editorID, group.id, { customClasses: 'modified' });
const originalOverride = CustomEditorInput.create(this.instantiationService, assertIsDefined(editor.original.resource), editorID, group.id, { customClasses: 'original' });
const modifiedOverride = CustomEditorInput.create(this.instantiationService, assertReturnsDefined(editor.modified.resource), editorID, group.id, { customClasses: 'modified' });
const originalOverride = CustomEditorInput.create(this.instantiationService, assertReturnsDefined(editor.original.resource), editorID, group.id, { customClasses: 'original' });
return this.instantiationService.createInstance(DiffEditorInput, editor.label, editor.description, originalOverride, modifiedOverride, true);
}

4
src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
View File

@ -5,7 +5,7 @@
import { localize } from '../../../../../nls.js';
import { mark } from '../../../../../base/common/performance.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
import { IPathService } from '../../../../services/path/common/pathService.js';
import { IAction, toAction } from '../../../../../base/common/actions.js';
import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from '../../common/files.js';
@ -125,7 +125,7 @@ export class TextFileEditor extends AbstractTextCodeEditor<ICodeEditorViewState>
const textFileModel = resolvedModel;
// Editor
const control = assertIsDefined(this.editorControl);
const control = assertReturnsDefined(this.editorControl);
control.setModel(textFileModel.textEditorModel);
// Restore view state (unless provided by options)

4
src/vs/workbench/contrib/files/common/explorerModel.ts
View File

@ -19,7 +19,7 @@ import { IFilesConfiguration, SortOrder } from './files.js';
import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
import { ExplorerFileNestingTrie } from './explorerFileNestingTrie.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
import { IMarkdownString } from '../../../../base/common/htmlContent.js';
@ -355,7 +355,7 @@ export class ExplorerItem {
if (nestedItems !== undefined) {
fileEntryItem.nestedChildren = [];
for (const name of nestedItems.keys()) {
const child = assertIsDefined(this.children.get(name));
const child = assertReturnsDefined(this.children.get(name));
fileEntryItem.nestedChildren.push(child);
child.nestedParent = fileEntryItem;
}

4
src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
View File

@ -17,7 +17,7 @@ import { ResourceMap } from '../../../../base/common/map.js';
import { FileWorkingCopyManager, IFileWorkingCopyManager } from '../../../services/workingCopy/common/fileWorkingCopyManager.js';
import { Schemas } from '../../../../base/common/network.js';
import { NotebookProviderInfo } from './notebookProvider.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { CancellationToken } from '../../../../base/common/cancellation.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { IFileReadLimits } from '../../../../platform/files/common/files.js';
@ -188,7 +188,7 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
}
private createUntitledUri(notebookType: string) {
const info = this._notebookService.getContributedNotebookType(assertIsDefined(notebookType));
const info = this._notebookService.getContributedNotebookType(assertReturnsDefined(notebookType));
if (!info) {
throw new Error('UNKNOWN notebook type: ' + notebookType);
}

6
src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
View File

@ -22,7 +22,7 @@ import { ThemeColor } from '../../../../base/common/themables.js';
import { overviewRulerInfo, overviewRulerError } from '../../../../editor/common/core/editorColorRegistry.js';
import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness, OverviewRulerLane } from '../../../../editor/common/model.js';
import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { isEqual } from '../../../../base/common/resources.js';
import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution } from '../../../services/preferences/common/preferences.js';
@ -100,7 +100,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
this._updateDecorations = this._register(new RunOnceScheduler(() => this._updateDecorationsNow(), 500));
const model = assertIsDefined(this._editor.getModel());
const model = assertReturnsDefined(this._editor.getModel());
this._register(model.onDidChangeContent(() => this._updateDecorations.schedule()));
this._register(this._keybindingService.onDidUpdateKeybindings(() => this._updateDecorations.schedule()));
this._register({
@ -113,7 +113,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
}
private _updateDecorationsNow(): void {
const model = assertIsDefined(this._editor.getModel());
const model = assertReturnsDefined(this._editor.getModel());
const newDecorations: IModelDeltaDecoration[] = [];

4
src/vs/workbench/contrib/search/browser/searchActionsNav.ts
View File

@ -16,7 +16,7 @@ import { SearchEditor } from '../../searchEditor/browser/searchEditor.js';
import { SearchEditorInput } from '../../searchEditor/browser/searchEditorInput.js';
import { IEditorService } from '../../../services/editor/common/editorService.js';
import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
@ -46,7 +46,7 @@ registerAction2(class ToggleQueryDetailsAction extends Action2 {
(accessor.get(IEditorService).activeEditorPane as SearchEditor).toggleQueryDetails(args[0]?.show);
} else if (contextService.getValue(Constants.SearchContext.SearchViewFocusedKey.serialize())) {
const searchView = getSearchView(accessor.get(IViewsService));
assertIsDefined(searchView).toggleQueryDetails(undefined, args[0]?.show);
assertReturnsDefined(searchView).toggleQueryDetails(undefined, args[0]?.show);
}
}
});

4
src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
View File

@ -10,7 +10,7 @@ import { Delayer } from '../../../../base/common/async.js';
import { CancellationToken } from '../../../../base/common/cancellation.js';
import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
import { DisposableStore } from '../../../../base/common/lifecycle.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { URI } from '../../../../base/common/uri.js';
import './media/searchEditor.css';
import { ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
@ -137,7 +137,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
super.createEditor(searchResultContainer);
this.registerEditorListeners();
const scopedContextKeyService = assertIsDefined(this.scopedContextKeyService);
const scopedContextKeyService = assertReturnsDefined(this.scopedContextKeyService);
InSearchEditor.bindTo(scopedContextKeyService).set(true);
this.createQueryEditor(

4
src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
View File

@ -11,7 +11,7 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
import { parseSavedSearchEditor, parseSerializedSearchEditor } from './searchEditorSerialization.js';
import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
import { SearchConfiguration, SearchEditorWorkingCopyTypeId } from './constants.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
import { Emitter } from '../../../../base/common/event.js';
import { ResourceMap } from '../../../../base/common/map.js';
@ -33,7 +33,7 @@ export class SearchEditorModel {
) { }
async resolve(): Promise<SearchEditorData> {
return assertIsDefined(searchEditorModelFactory.models.get(this.resource)).resolve();
return assertReturnsDefined(searchEditorModelFactory.models.get(this.resource)).resolve();
}
}

12
src/vs/workbench/contrib/splash/browser/partsSplash.ts
View File

@ -17,7 +17,7 @@ import { IWorkbenchEnvironmentService } from '../../../services/environment/comm
import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import * as perf from '../../../../base/common/performance.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { ISplashStorageService } from './splash.js';
import { mainWindow } from '../../../../base/browser/window.js';
import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
@ -92,11 +92,11 @@ export class PartsSplash {
layoutInfo: !this._shouldSaveLayoutInfo() ? undefined : {
sideBarSide: this._layoutService.getSideBarPosition() === Position.RIGHT ? 'right' : 'left',
editorPartMinWidth: DEFAULT_EDITOR_MIN_DIMENSIONS.width,
titleBarHeight: this._layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow) ? dom.getTotalHeight(assertIsDefined(this._layoutService.getContainer(mainWindow, Parts.TITLEBAR_PART))) : 0,
activityBarWidth: this._layoutService.isVisible(Parts.ACTIVITYBAR_PART) ? dom.getTotalWidth(assertIsDefined(this._layoutService.getContainer(mainWindow, Parts.ACTIVITYBAR_PART))) : 0,
sideBarWidth: this._layoutService.isVisible(Parts.SIDEBAR_PART) ? dom.getTotalWidth(assertIsDefined(this._layoutService.getContainer(mainWindow, Parts.SIDEBAR_PART))) : 0,
auxiliarySideBarWidth: this._layoutService.isVisible(Parts.AUXILIARYBAR_PART) ? dom.getTotalWidth(assertIsDefined(this._layoutService.getContainer(mainWindow, Parts.AUXILIARYBAR_PART))) : 0,
statusBarHeight: this._layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow) ? dom.getTotalHeight(assertIsDefined(this._layoutService.getContainer(mainWindow, Parts.STATUSBAR_PART))) : 0,
titleBarHeight: this._layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow) ? dom.getTotalHeight(assertReturnsDefined(this._layoutService.getContainer(mainWindow, Parts.TITLEBAR_PART))) : 0,
activityBarWidth: this._layoutService.isVisible(Parts.ACTIVITYBAR_PART) ? dom.getTotalWidth(assertReturnsDefined(this._layoutService.getContainer(mainWindow, Parts.ACTIVITYBAR_PART))) : 0,
sideBarWidth: this._layoutService.isVisible(Parts.SIDEBAR_PART) ? dom.getTotalWidth(assertReturnsDefined(this._layoutService.getContainer(mainWindow, Parts.SIDEBAR_PART))) : 0,
auxiliarySideBarWidth: this._layoutService.isVisible(Parts.AUXILIARYBAR_PART) ? dom.getTotalWidth(assertReturnsDefined(this._layoutService.getContainer(mainWindow, Parts.AUXILIARYBAR_PART))) : 0,
statusBarHeight: this._layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow) ? dom.getTotalHeight(assertReturnsDefined(this._layoutService.getContainer(mainWindow, Parts.STATUSBAR_PART))) : 0,
windowBorder: this._layoutService.hasMainWindowBorder(),
windowBorderRadius: this._layoutService.getMainWindowBorderRadius()
}

4
src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.ts
View File

@ -12,7 +12,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
import { IWorkbenchContribution } from '../../../common/contributions.js';
import { VSBuffer } from '../../../../base/common/buffer.js';
import { readTrustedDomains, TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, TRUSTED_DOMAINS_STORAGE_KEY } from './trustedDomains.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
const TRUSTED_DOMAINS_SCHEMA = 'trustedDomains';
@ -109,7 +109,7 @@ export class TrustedDomainsFileSystemProvider implements IFileSystemProviderWith
trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_PRE) === -1 ||
trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_AFTER) === -1 ||
trustedDomainsContent.indexOf(configuring ?? '') === -1 ||
[...defaultTrustedDomains, ...trustedDomains].some(d => !assertIsDefined(trustedDomainsContent).includes(d))
[...defaultTrustedDomains, ...trustedDomains].some(d => !assertReturnsDefined(trustedDomainsContent).includes(d))
) {
trustedDomainsContent = computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, configuring);
}

16
src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
View File

@ -23,7 +23,7 @@ import { parse } from '../../../../base/common/marshalling.js';
import { Schemas, matchesScheme } from '../../../../base/common/network.js';
import { OS } from '../../../../base/common/platform.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { URI } from '../../../../base/common/uri.js';
import { generateUuid } from '../../../../base/common/uuid.js';
import './media/gettingStarted.css';
@ -276,7 +276,7 @@ export class GettingStartedPage extends EditorPane {
ourStep.done = step.done;
if (category.id === this.currentWalkthrough?.id) {
const badgeelements = assertIsDefined(this.window.document.querySelectorAll(`[data-done-step-id="${step.id}"]`));
const badgeelements = assertReturnsDefined(this.window.document.querySelectorAll(`[data-done-step-id="${step.id}"]`));
badgeelements.forEach(badgeelement => {
if (step.done) {
badgeelement.setAttribute('aria-checked', 'true');
@ -490,7 +490,7 @@ export class GettingStartedPage extends EditorPane {
}
private toggleStepCompletion(argument: string) {
const stepToggle = assertIsDefined(this.currentWalkthrough?.steps.find(step => step.id === argument));
const stepToggle = assertReturnsDefined(this.currentWalkthrough?.steps.find(step => step.id === argument));
if (stepToggle.done) {
this.gettingStartedService.deprogressStep(argument);
} else {
@ -530,7 +530,7 @@ export class GettingStartedPage extends EditorPane {
if (!this.currentWalkthrough) {
throw Error('no walkthrough selected');
}
const stepToExpand = assertIsDefined(this.currentWalkthrough.steps.find(step => step.id === stepId));
const stepToExpand = assertReturnsDefined(this.currentWalkthrough.steps.find(step => step.id === stepId));
if (!forceRebuild && this.currentMediaComponent === stepId) { return; }
this.currentMediaComponent = stepId;
@ -774,7 +774,7 @@ export class GettingStartedPage extends EditorPane {
// No steps around... just ignore.
return;
}
id = assertIsDefined(stepElement.getAttribute('data-step-id'));
id = assertReturnsDefined(stepElement.getAttribute('data-step-id'));
}
stepElement.parentElement?.querySelectorAll<HTMLElement>('.expanded').forEach(node => {
if (node.getAttribute('data-step-id') !== id) {
@ -1215,7 +1215,7 @@ export class GettingStartedPage extends EditorPane {
const stats = this.getWalkthroughCompletionStats(category);
const bar = assertIsDefined(element.querySelector('.progress-bar-inner')) as HTMLDivElement;
const bar = assertReturnsDefined(element.querySelector('.progress-bar-inner')) as HTMLDivElement;
bar.setAttribute('aria-valuemin', '0');
bar.setAttribute('aria-valuenow', '' + stats.stepsComplete);
bar.setAttribute('aria-valuemax', '' + stats.stepsTotal);
@ -1272,7 +1272,7 @@ export class GettingStartedPage extends EditorPane {
const gettingStartedSize = Math.floor(fullSize.width / 2);
const gettingStartedGroup = this.groupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => (group.activeEditor instanceof GettingStartedInput));
this.groupsService.setSize(assertIsDefined(gettingStartedGroup), { width: gettingStartedSize, height: fullSize.height });
this.groupsService.setSize(assertReturnsDefined(gettingStartedGroup), { width: gettingStartedSize, height: fullSize.height });
}
const nonGettingStartedGroup = this.groupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => !(group.activeEditor instanceof GettingStartedInput));
@ -2079,7 +2079,7 @@ export class GettingStartedPage extends EditorPane {
}
private setSlide(toEnable: 'details' | 'categories', firstLaunch: boolean = false) {
const slideManager = assertIsDefined(this.container.querySelector('.gettingStarted'));
const slideManager = assertReturnsDefined(this.container.querySelector('.gettingStarted'));
if (toEnable === 'categories') {
slideManager.classList.remove('showDetails');
slideManager.classList.add('showCategories');

6
src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
View File

@ -10,7 +10,7 @@ import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/
import { URI } from '../../../../base/common/uri.js';
import { language } from '../../../../base/common/platform.js';
import { joinPath } from '../../../../base/common/resources.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { asWebviewUri } from '../../webview/common/webview.js';
import { ResourceMap } from '../../../../base/common/map.js';
import { IFileService } from '../../../../platform/files/common/files.js';
@ -230,7 +230,7 @@ export class GettingStartedDetailsRenderer {
const contents = await this.readContentsOfPath(path, false);
this.svgCache.set(path, contents);
}
return assertIsDefined(this.svgCache.get(path));
return assertReturnsDefined(this.svgCache.get(path));
}
private async readAndCacheStepMarkdown(path: URI, base: URI): Promise<string> {
@ -239,7 +239,7 @@ export class GettingStartedDetailsRenderer {
const markdownContents = await renderMarkdownDocument(transformUris(contents, base), this.extensionService, this.languageService, { allowUnknownProtocols: true });
this.mdCache.set(path, markdownContents);
}
return assertIsDefined(this.mdCache.get(path));
return assertReturnsDefined(this.mdCache.get(path));
}
private async readContentsOfPath(path: URI, useModuleId = true): Promise<string> {

4
src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
View File

@ -6,7 +6,7 @@
import { promiseWithResolvers } from '../../../../base/common/async.js';
import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { localize, localize2 } from '../../../../nls.js';
import { ILocalizedString } from '../../../../platform/action/common/action.js';
import { Action2, IMenuService, MenuId, registerAction2, IMenu, MenuRegistry, MenuItemAction } from '../../../../platform/actions/common/actions.js';
@ -43,7 +43,7 @@ registerAction2(class extends Action2 {
}
async run(accessor: ServicesAccessor): Promise<boolean> {
return assertIsDefined(NewFileTemplatesManager.Instance).run();
return assertReturnsDefined(NewFileTemplatesManager.Instance).run();
}
});

4
src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
View File

@ -13,7 +13,7 @@ import * as marked from '../../../../base/common/marked/marked.js';
import { Schemas } from '../../../../base/common/network.js';
import { Range } from '../../../../editor/common/core/range.js';
import { createTextBufferFactory } from '../../../../editor/common/model/textModel.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
interface IWalkThroughContentProvider {
@ -100,6 +100,6 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
marked.marked(markdown, { renderer });
}
return assertIsDefined(codeEditorModel);
return assertReturnsDefined(codeEditorModel);
}
}

4
src/vs/workbench/services/search/common/queryBuilder.ts
View File

@ -12,7 +12,7 @@ import { Schemas } from '../../../../base/common/network.js';
import * as path from '../../../../base/common/path.js';
import { isEqual, basename, relativePath, isAbsolutePath } from '../../../../base/common/resources.js';
import * as strings from '../../../../base/common/strings.js';
import { assertIsDefined, isDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined, isDefined } from '../../../../base/common/types.js';
import { URI, URI as uri, UriComponents } from '../../../../base/common/uri.js';
import { isMultilineRegexSource } from '../../../../editor/common/model/textModelSearch.js';
import * as nls from '../../../../nls.js';
@ -313,7 +313,7 @@ export class QueryBuilder {
}
const relPath = path.relative(searchRoot.fsPath, file.fsPath);
assertIsDefined(folderQuery.includePattern)[relPath.replace(/\\/g, '/')] = true;
assertReturnsDefined(folderQuery.includePattern)[relPath.replace(/\\/g, '/')] = true;
} else {
if (file.fsPath) {
hasIncludedFile = true;

6
src/vs/workbench/services/storage/browser/storageService.ts
View File

@ -11,7 +11,7 @@ import { DeferredPromise, Promises } from '../../../../base/common/async.js';
import { toErrorMessage } from '../../../../base/common/errorMessage.js';
import { Emitter } from '../../../../base/common/event.js';
import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { InMemoryStorageDatabase, isStorageItemsChangeEvent, IStorage, IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from '../../../../base/parts/storage/common/storage.js';
import { ILogService } from '../../../../platform/log/common/log.js';
import { AbstractStorageService, isProfileUsingDefaultStorage, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@ -168,7 +168,7 @@ export class BrowserStorageService extends AbstractStorageService {
return;
}
const oldProfileStorage = assertIsDefined(this.profileStorage);
const oldProfileStorage = assertReturnsDefined(this.profileStorage);
const oldItems = oldProfileStorage.items;
// Close old profile storage but only if this is
@ -181,7 +181,7 @@ export class BrowserStorageService extends AbstractStorageService {
await this.createProfileStorage(toProfile);
// Handle data switch and eventing
this.switchData(oldItems, assertIsDefined(this.profileStorage), StorageScope.PROFILE);
this.switchData(oldItems, assertReturnsDefined(this.profileStorage), StorageScope.PROFILE);
}
protected async switchToWorkspace(toWorkspace: IAnyWorkspaceIdentifier, preserveData: boolean): Promise<void> {

4
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
View File

@ -7,7 +7,7 @@ import { localize } from '../../../../nls.js';
import { Emitter } from '../../../../base/common/event.js';
import { URI } from '../../../../base/common/uri.js';
import { mark } from '../../../../base/common/performance.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { EncodingMode, ITextFileService, TextFileEditorModelState, ITextFileEditorModel, ITextFileStreamContent, ITextFileResolveOptions, IResolvedTextFileEditorModel, TextFileResolveReason, ITextFileEditorModelSaveEvent, ITextFileSaveAsOptions } from './textfiles.js';
import { IRevertOptions, SaveReason, SaveSourceRegistry } from '../../../common/editor.js';
import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
@ -929,7 +929,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
// participant triggering
progress.report({ message: localize('saveTextFile', "Writing into file...") });
this.trace(`doSave(${versionId}) - before write()`);
const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
const lastResolvedFileStat = assertReturnsDefined(this.lastResolvedFileStat);
const resolvedTextFileEditorModel = this;
return this.saveSequentializer.run(versionId, (async () => {
try {

16
src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
View File

@ -12,7 +12,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from '../../../..
import { TextFileEditorModelManager } from '../../common/textFileEditorModelManager.js';
import { FileOperationResult, FileOperationError, NotModifiedSinceFileOperationError } from '../../../../../platform/files/common/files.js';
import { DeferredPromise, timeout } from '../../../../../base/common/async.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
import { SaveReason, SaveSourceRegistry } from '../../../../common/editor.js';
@ -611,7 +611,7 @@ suite('Files - TextFileEditorModel', () => {
await model.resolve();
const stat = assertIsDefined(getLastResolvedFileStat(model));
const stat = assertReturnsDefined(getLastResolvedFileStat(model));
accessor.textFileService.setReadStreamErrorOnce(new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked }));
await model.resolve();
@ -641,8 +641,8 @@ suite('Files - TextFileEditorModel', () => {
model1.updateTextEditorModel(createTextBufferFactory('foo'));
const m1Mtime = assertIsDefined(getLastResolvedFileStat(model1)).mtime;
const m2Mtime = assertIsDefined(getLastResolvedFileStat(model2)).mtime;
const m1Mtime = assertReturnsDefined(getLastResolvedFileStat(model1)).mtime;
const m2Mtime = assertReturnsDefined(getLastResolvedFileStat(model2)).mtime;
assert.ok(m1Mtime > 0);
assert.ok(m2Mtime > 0);
@ -662,12 +662,12 @@ suite('Files - TextFileEditorModel', () => {
// web tests does not ensure timeouts are respected at all, so we cannot
// really assert the mtime to be different, only that it is equal or greater.
// https://github.com/microsoft/vscode/issues/161886
assert.ok(assertIsDefined(getLastResolvedFileStat(model1)).mtime >= m1Mtime);
assert.ok(assertIsDefined(getLastResolvedFileStat(model2)).mtime >= m2Mtime);
assert.ok(assertReturnsDefined(getLastResolvedFileStat(model1)).mtime >= m1Mtime);
assert.ok(assertReturnsDefined(getLastResolvedFileStat(model2)).mtime >= m2Mtime);
} else {
// on desktop we want to assert this condition more strictly though
assert.ok(assertIsDefined(getLastResolvedFileStat(model1)).mtime > m1Mtime);
assert.ok(assertIsDefined(getLastResolvedFileStat(model2)).mtime > m2Mtime);
assert.ok(assertReturnsDefined(getLastResolvedFileStat(model1)).mtime > m1Mtime);
assert.ok(assertReturnsDefined(getLastResolvedFileStat(model2)).mtime > m2Mtime);
}
});

4
src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
View File

@ -18,7 +18,7 @@ import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService
import { IWorkingCopy, WorkingCopyCapabilities, IWorkingCopyBackup, NO_TYPE_ID, IWorkingCopySaveEvent } from '../../workingCopy/common/workingCopy.js';
import { IEncodingSupport, ILanguageSupport, ITextFileService } from '../../textfile/common/textfiles.js';
import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { ILabelService } from '../../../../platform/label/common/label.js';
import { ensureValidWordDefinition } from '../../../../editor/common/core/wordHelper.js';
import { IEditorService } from '../../editor/common/editorService.js';
@ -349,7 +349,7 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
}
// Listen to text model events
const textEditorModel = assertIsDefined(this.textEditorModel);
const textEditorModel = assertReturnsDefined(this.textEditorModel);
this.installModelListeners(textEditorModel);
// Only adjust name and dirty state etc. if we

10
src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts
View File

@ -11,7 +11,7 @@ import { workbenchInstantiationService } from '../../../../test/browser/workbenc
import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
import { ViewDescriptorService } from '../../browser/viewDescriptorService.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
@ -172,8 +172,8 @@ suite('ViewDescriptorService', () => {
assert.strictEqual(sidebarViews.activeViewDescriptors.length, 1, 'Sidebar container should have 1 view');
assert.strictEqual(panelViews.activeViewDescriptors.length, 0, 'Panel container should have no views');
const generatedPanel = assertIsDefined(testObject.getViewContainerByViewId(viewDescriptors[0].id));
const generatedSidebar = assertIsDefined(testObject.getViewContainerByViewId(viewDescriptors[2].id));
const generatedPanel = assertReturnsDefined(testObject.getViewContainerByViewId(viewDescriptors[0].id));
const generatedSidebar = assertReturnsDefined(testObject.getViewContainerByViewId(viewDescriptors[2].id));
assert.strictEqual(testObject.getViewContainerLocation(generatedPanel), ViewContainerLocation.Panel, 'Generated Panel should be in located in the panel');
assert.strictEqual(testObject.getViewContainerLocation(generatedSidebar), ViewContainerLocation.Sidebar, 'Generated Sidebar should be in located in the sidebar');
@ -311,8 +311,8 @@ suite('ViewDescriptorService', () => {
testObject.moveViewsToContainer([viewDescriptors[1]], panelContainer);
testObject.moveViewToLocation(viewDescriptors[2], ViewContainerLocation.Sidebar);
const generatedPanel = assertIsDefined(testObject.getViewContainerByViewId(viewDescriptors[0].id));
const generatedSidebar = assertIsDefined(testObject.getViewContainerByViewId(viewDescriptors[2].id));
const generatedPanel = assertReturnsDefined(testObject.getViewContainerByViewId(viewDescriptors[0].id));
const generatedSidebar = assertReturnsDefined(testObject.getViewContainerByViewId(viewDescriptors[2].id));
testObject.reset();

8
src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
View File

@ -13,7 +13,7 @@ import { IWorkingCopyService } from './workingCopyService.js';
import { IWorkingCopyBackup, IWorkingCopyBackupMeta, IWorkingCopySaveEvent, WorkingCopyCapabilities } from './workingCopy.js';
import { raceCancellation, TaskSequentializer, timeout } from '../../../../base/common/async.js';
import { ILogService } from '../../../../platform/log/common/log.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { IWorkingCopyFileService } from './workingCopyFileService.js';
import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
@ -1029,7 +1029,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
// participant triggering
progress.report({ message: localize('saveTextFile', "Writing into file...") });
this.trace(`doSave(${versionId}) - before write()`);
const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
const lastResolvedFileStat = assertReturnsDefined(this.lastResolvedFileStat);
const resolvedFileWorkingCopy = this;
return this.saveSequentializer.run(versionId, (async () => {
try {
@ -1074,9 +1074,9 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
// Write them to disk
if (options?.writeElevated && this.elevatedFileService.isSupported(lastResolvedFileStat.resource)) {
stat = await this.elevatedFileService.writeFileElevated(lastResolvedFileStat.resource, assertIsDefined(snapshot), writeFileOptions);
stat = await this.elevatedFileService.writeFileElevated(lastResolvedFileStat.resource, assertReturnsDefined(snapshot), writeFileOptions);
} else {
stat = await this.fileService.writeFile(lastResolvedFileStat.resource, assertIsDefined(snapshot), writeFileOptions);
stat = await this.fileService.writeFile(lastResolvedFileStat.resource, assertReturnsDefined(snapshot), writeFileOptions);
}
}

36
src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
View File

@ -5,7 +5,7 @@
import { localize } from '../../../../nls.js';
import { Event, Emitter } from '../../../../base/common/event.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { Registry } from '../../../../platform/registry/common/platform.js';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
import { ILifecycleService, LifecyclePhase, WillShutdownEvent } from '../../lifecycle/common/lifecycle.js';
@ -155,9 +155,9 @@ export class WorkingCopyHistoryModel {
}
private async doAddEntry(source: SaveSource, sourceDescription: string | undefined = undefined, timestamp: number, token: CancellationToken): Promise<IWorkingCopyHistoryEntry> {
const workingCopyResource = assertIsDefined(this.workingCopyResource);
const workingCopyName = assertIsDefined(this.workingCopyName);
const historyEntriesFolder = assertIsDefined(this.historyEntriesFolder);
const workingCopyResource = assertReturnsDefined(this.workingCopyResource);
const workingCopyName = assertReturnsDefined(this.workingCopyName);
const historyEntriesFolder = assertReturnsDefined(this.historyEntriesFolder);
// Perform a fast clone operation with minimal overhead to a new random location
const id = `${randomPath(undefined, undefined, 4)}${extname(workingCopyResource)}`;
@ -185,7 +185,7 @@ export class WorkingCopyHistoryModel {
}
private async doReplaceEntry(entry: IWorkingCopyHistoryEntry, source: SaveSource, sourceDescription: string | undefined = undefined, timestamp: number, token: CancellationToken): Promise<IWorkingCopyHistoryEntry> {
const workingCopyResource = assertIsDefined(this.workingCopyResource);
const workingCopyResource = assertReturnsDefined(this.workingCopyResource);
// Perform a fast clone operation with minimal overhead to the existing location
await this.fileService.cloneFile(workingCopyResource, entry.location);
@ -317,8 +317,8 @@ export class WorkingCopyHistoryModel {
}
private async resolveEntriesFromDisk(): Promise<Map<string /* ID */, IWorkingCopyHistoryEntry>> {
const workingCopyResource = assertIsDefined(this.workingCopyResource);
const workingCopyName = assertIsDefined(this.workingCopyName);
const workingCopyResource = assertReturnsDefined(this.workingCopyResource);
const workingCopyName = assertReturnsDefined(this.workingCopyName);
const [entryListing, entryStats] = await Promise.all([
@ -364,13 +364,13 @@ export class WorkingCopyHistoryModel {
async moveEntries(target: WorkingCopyHistoryModel, source: SaveSource, token: CancellationToken): Promise<void> {
const timestamp = Date.now();
const sourceDescription = this.labelService.getUriLabel(assertIsDefined(this.workingCopyResource));
const sourceDescription = this.labelService.getUriLabel(assertReturnsDefined(this.workingCopyResource));
// Move all entries into the target folder so that we preserve
// any existing history entries that might already be present
const sourceHistoryEntriesFolder = assertIsDefined(this.historyEntriesFolder);
const targetHistoryEntriesFolder = assertIsDefined(target.historyEntriesFolder);
const sourceHistoryEntriesFolder = assertReturnsDefined(this.historyEntriesFolder);
const targetHistoryEntriesFolder = assertReturnsDefined(target.historyEntriesFolder);
try {
for (const entry of this.entries) {
await this.fileService.move(entry.location, joinPath(targetHistoryEntriesFolder, entry.id), true);
@ -393,11 +393,11 @@ export class WorkingCopyHistoryModel {
const allEntries = distinct([...this.entries, ...target.entries], entry => entry.id).sort((entryA, entryB) => entryA.timestamp - entryB.timestamp);
// Update our associated working copy
const targetWorkingCopyResource = assertIsDefined(target.workingCopyResource);
const targetWorkingCopyResource = assertReturnsDefined(target.workingCopyResource);
this.setWorkingCopy(targetWorkingCopyResource);
// Restore our entries and ensure correct metadata
const targetWorkingCopyName = assertIsDefined(target.workingCopyName);
const targetWorkingCopyName = assertReturnsDefined(target.workingCopyName);
for (const entry of allEntries) {
this.entries.push({
id: entry.id,
@ -441,7 +441,7 @@ export class WorkingCopyHistoryModel {
}
private async doStore(token: CancellationToken): Promise<void> {
const historyEntriesFolder = assertIsDefined(this.historyEntriesFolder);
const historyEntriesFolder = assertReturnsDefined(this.historyEntriesFolder);
// Make sure to await resolving when persisting
await this.resolveEntriesOnce();
@ -505,8 +505,8 @@ export class WorkingCopyHistoryModel {
}
private async writeEntriesFile(): Promise<void> {
const workingCopyResource = assertIsDefined(this.workingCopyResource);
const historyEntriesListingFile = assertIsDefined(this.historyEntriesListingFile);
const workingCopyResource = assertReturnsDefined(this.workingCopyResource);
const historyEntriesListingFile = assertReturnsDefined(this.historyEntriesListingFile);
const serializedModel: ISerializedWorkingCopyHistoryModel = {
version: 1,
@ -525,7 +525,7 @@ export class WorkingCopyHistoryModel {
}
private async readEntriesFile(): Promise<ISerializedWorkingCopyHistoryModel | undefined> {
const historyEntriesListingFile = assertIsDefined(this.historyEntriesListingFile);
const historyEntriesListingFile = assertReturnsDefined(this.historyEntriesListingFile);
let serializedModel: ISerializedWorkingCopyHistoryModel | undefined = undefined;
try {
@ -540,8 +540,8 @@ export class WorkingCopyHistoryModel {
}
private async readEntriesFolder(): Promise<IFileStatWithMetadata[] | undefined> {
const historyEntriesFolder = assertIsDefined(this.historyEntriesFolder);
const historyEntriesNameMatcher = assertIsDefined(this.historyEntriesNameMatcher);
const historyEntriesFolder = assertReturnsDefined(this.historyEntriesFolder);
const historyEntriesNameMatcher = assertReturnsDefined(this.historyEntriesNameMatcher);
let rawEntries: IFileStatWithMetadata[] | undefined = undefined;

4
src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
View File

@ -20,7 +20,7 @@ import { consumeReadable, consumeStream, isReadableStream } from '../../../../..
import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
import { SnapshotContext } from '../../common/fileWorkingCopy.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
export class TestStoredFileWorkingCopyModel extends Disposable implements IStoredFileWorkingCopyModel {
@ -518,7 +518,7 @@ suite('StoredFileWorkingCopy', function () {
await workingCopy.resolve();
const stat = assertIsDefined(getLastResolvedFileStat(workingCopy));
const stat = assertReturnsDefined(getLastResolvedFileStat(workingCopy));
try {
accessor.fileService.readShouldThrowError = new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked });
await workingCopy.resolve();

4
src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts
View File

@ -23,7 +23,7 @@ import { TestDialogService } from '../../../../../platform/dialogs/test/common/t
import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
import { CancellationToken } from '../../../../../base/common/cancellation.js';
import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryEntryDescriptor } from '../../common/workingCopyHistory.js';
import { assertIsDefined } from '../../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../../base/common/types.js';
import { VSBuffer } from '../../../../../base/common/buffer.js';
import { DisposableStore } from '../../../../../base/common/lifecycle.js';
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
@ -63,7 +63,7 @@ suite('WorkingCopyHistoryTracker', () => {
timestamp: increasingTimestampCounter++ // very important to get tests to not be flaky with stable sort order
}, token);
return assertIsDefined(entry);
return assertReturnsDefined(entry);
}
setup(async () => {

4
src/vs/workbench/test/browser/workbenchTestServices.ts
View File

@ -123,7 +123,7 @@ import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreati
import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../platform/workspace/common/workspaceTrust.js';
import { IExtensionTerminalProfile, IShellLaunchConfig, ITerminalBackend, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from '../../../platform/terminal/common/terminal.js';
import { ICreateTerminalOptions, IDeserializedTerminalEditorInput, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from '../../contrib/terminal/browser/terminal.js';
import { assertIsDefined, upcast } from '../../../base/common/types.js';
import { assertReturnsDefined, upcast } from '../../../base/common/types.js';
import { IRegisterContributedProfileArgs, IShellLaunchConfigResolveOptions, ITerminalProfileProvider, ITerminalProfileResolverService, ITerminalProfileService, type ITerminalConfiguration } from '../../contrib/terminal/common/terminal.js';
import { EditorResolverService } from '../../services/editor/browser/editorResolverService.js';
import { FILE_EDITOR_INPUT_ID } from '../../contrib/files/common/files.js';
@ -739,7 +739,7 @@ export class TestPaneCompositeService extends Disposable implements IPaneComposi
}
getPartByLocation(viewContainerLocation: ViewContainerLocation): IPaneCompositePart {
return assertIsDefined(this.parts.get(viewContainerLocation));
return assertReturnsDefined(this.parts.get(viewContainerLocation));
}
}