Skip to content

Commit b644486

Browse files
author
Benjamin Pasero
committed
debt - a bit more strict init
1 parent d157c2e commit b644486

7 files changed

Lines changed: 19 additions & 29 deletions

File tree

‎src/vs/code/browser/workbench/workbench.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LocalStorageCredentialsProvider implements ICredentialsProvider {
2424

2525
static readonly CREDENTIALS_OPENED_KEY = 'credentials.provider';
2626

27-
private _credentials: ICredential[];
27+
private _credentials!: ICredential[];
2828
private get credentials(): ICredential[] {
2929
if (!this._credentials) {
3030
try {

‎src/vs/platform/lifecycle/electron-browser/lifecycleService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class LifecycleService extends AbstractLifecycleService {
1919

2020
_serviceBrand: undefined;
2121

22-
private shutdownReason: ShutdownReason;
22+
private shutdownReason: ShutdownReason | undefined;
2323

2424
constructor(
2525
@INotificationService private readonly notificationService: INotificationService,

‎src/vs/platform/workspace/common/workspace.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export interface IWorkspaceFolder extends IWorkspaceFolderData {
143143
export class Workspace implements IWorkspace {
144144

145145
private _foldersMap: TernarySearchTree<WorkspaceFolder> = TernarySearchTree.forPaths<WorkspaceFolder>();
146-
private _folders: WorkspaceFolder[];
146+
private _folders!: WorkspaceFolder[];
147147

148148
constructor(
149149
private _id: string,
@@ -265,4 +265,4 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
265265
}
266266
}
267267
return result;
268-
}
268+
}

‎src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import * as pfs from 'vs/base/node/pfs';
1111
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
1212
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
1313
import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/electron-main/workspacesMainService';
14-
import { WORKSPACE_EXTENSION, IWorkspaceIdentifier, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder, rewriteWorkspaceFileForNewLocation } from 'vs/platform/workspaces/common/workspaces';
14+
import { WORKSPACE_EXTENSION, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder, rewriteWorkspaceFileForNewLocation } from 'vs/platform/workspaces/common/workspaces';
1515
import { NullLogService } from 'vs/platform/log/common/log';
1616
import { URI } from 'vs/base/common/uri';
1717
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
@@ -29,16 +29,6 @@ suite('WorkspacesMainService', () => {
2929
}
3030
}
3131

32-
class TestWorkspacesMainService extends WorkspacesMainService {
33-
public deleteWorkspaceCall: IWorkspaceIdentifier;
34-
35-
public deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
36-
this.deleteWorkspaceCall = workspace;
37-
38-
super.deleteUntitledWorkspaceSync(workspace);
39-
}
40-
}
41-
4232
function createWorkspace(folders: string[], names?: string[]) {
4333
return service.createUntitledWorkspace(folders.map((folder, index) => ({ uri: URI.file(folder), name: names ? names[index] : undefined } as IWorkspaceFolderCreationData)));
4434
}
@@ -50,10 +40,10 @@ suite('WorkspacesMainService', () => {
5040
const environmentService = new TestEnvironmentService(parseArgs(process.argv, OPTIONS), process.execPath);
5141
const logService = new NullLogService();
5242

53-
let service: TestWorkspacesMainService;
43+
let service: WorkspacesMainService;
5444

5545
setup(async () => {
56-
service = new TestWorkspacesMainService(environmentService, logService);
46+
service = new WorkspacesMainService(environmentService, logService);
5747

5848
// Delete any existing backups completely and then re-create it.
5949
await pfs.rimraf(untitledWorkspacesHomePath, pfs.RimRafMode.MOVE);

‎src/vs/workbench/browser/legacyLayout.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ export class WorkbenchLegacyLayout extends Disposable implements IVerticalSashLa
4343
private static readonly sashYHeightSettingsKey = 'workbench.panel.height';
4444
private static readonly panelSizeBeforeMaximizedKey = 'workbench.panel.sizeBeforeMaximized';
4545

46-
private workbenchSize: Dimension;
46+
private workbenchSize!: Dimension;
4747

4848
private sashXOne: Sash;
4949
private sashXTwo: Sash;
5050
private sashY: Sash;
5151

52-
private _sidebarWidth: number;
53-
private sidebarHeight: number;
54-
private titlebarHeight: number;
55-
private statusbarHeight: number;
56-
private panelSizeBeforeMaximized: number;
57-
private panelMaximized: boolean;
58-
private _panelHeight: number;
59-
private _panelWidth: number;
52+
private _sidebarWidth!: number;
53+
private sidebarHeight!: number;
54+
private titlebarHeight!: number;
55+
private statusbarHeight!: number;
56+
private panelSizeBeforeMaximized!: number;
57+
private panelMaximized!: boolean;
58+
private _panelHeight!: number;
59+
private _panelWidth!: number;
6060

6161
constructor(
6262
private parent: HTMLElement,

‎src/vs/workbench/contrib/remote/browser/remote.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class HelpDataSource implements IAsyncDataSource<any, any> {
126126
}
127127

128128
getChildren(element: any) {
129-
if (element instanceof HelpModel) {
129+
if (element instanceof HelpModel && element.items) {
130130
return element.items;
131131
}
132132

@@ -201,7 +201,7 @@ class IssueReporterItem implements IHelpItem {
201201
}
202202

203203
class HelpModel {
204-
items: IHelpItem[];
204+
items: IHelpItem[] | undefined;
205205

206206
constructor(
207207
viewModel: IViewModel,

‎src/vs/workbench/contrib/watermark/browser/watermark.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const folderEntries = [
6969
const WORKBENCH_TIPS_ENABLED_KEY = 'workbench.tips.enabled';
7070

7171
export class WatermarkContribution extends Disposable implements IWorkbenchContribution {
72-
private watermark: HTMLElement;
72+
private watermark: HTMLElement | undefined;
7373
private watermarkDisposable = this._register(new DisposableStore());
7474
private enabled: boolean;
7575
private workbenchState: WorkbenchState;

0 commit comments

Comments
 (0)