diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index ca5ed69d0afaea38ff5dbbfc33f973a1888adb95..c4d6e66aaa86e293d3b7dc6dec208f47c1064793 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -64,14 +64,14 @@ export class IssueReporter extends Disposable { private environmentService: IEnvironmentService; private telemetryService: ITelemetryService; private logService: ILogService; - private issueReporterModel: IssueReporterModel; + private readonly issueReporterModel: IssueReporterModel; private numberOfSearchResultsDisplayed = 0; private receivedSystemInfo = false; private receivedPerformanceInfo = false; private shouldQueueSearch = false; private hasBeenSubmitted = false; - private previewButton: Button; + private readonly previewButton: Button; constructor(configuration: IssueReporterConfiguration) { super(); diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index b918ceff96169d294e886731765111245618e05d..8ad189c44b4842d6b8249a0e99bc0a66b450ac78 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -34,7 +34,7 @@ export interface IssueReporterData { } export class IssueReporterModel { - private _data: IssueReporterData; + private readonly _data: IssueReporterData; constructor(initialData?: Partial) { const defaultData = { @@ -196,7 +196,7 @@ ${this._data.workspaceInfo}; return 'Extensions: none' + themeExclusionStr; } - let tableHeader = `Extension|Author (truncated)|Version + const tableHeader = `Extension|Author (truncated)|Version ---|---|---`; const table = this._data.enabledNonThemeExtesions.map(e => { return `${e.name}|${e.publisher.substr(0, 3)}|${e.version}`; @@ -226,7 +226,7 @@ Literal matches: ${this._data.filterResultCount}`; return `No fuzzy results`; } - let tableHeader = `Setting|Extension|Score + const tableHeader = `Setting|Extension|Score ---|---|---`; const table = this._data.actualSearchResults.map(setting => { return `${setting.key}|${setting.extensionId}|${String(setting.score).slice(0, 5)}`; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts index 19c73491115d71bf7654218d9609a8060549b193..e7f1eec77423a5c4665e450348450fbe3b72bd1f 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts @@ -57,15 +57,15 @@ export class LanguagePackCachedDataCleaner { ? 1000 * 60 * 60 * 24 * 7 // roughly 1 week : 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months try { - let installed: IStringDictionary = Object.create(null); + const installed: IStringDictionary = Object.create(null); const metaData: LanguagePackFile = JSON.parse(await pfs.readFile(path.join(this._environmentService.userDataPath, 'languagepacks.json'), 'utf8')); for (let locale of Object.keys(metaData)) { - let entry = metaData[locale]; + const entry = metaData[locale]; installed[`${entry.hash}.${locale}`] = true; } // Cleanup entries for language packs that aren't installed anymore const cacheDir = path.join(this._environmentService.userDataPath, 'clp'); - let exists = await pfs.exists(cacheDir); + const exists = await pfs.exists(cacheDir); if (!exists) { return; } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index a97534eb33131b4f450a7a05ad782d962b8c2d2e..d0e144be9fe36f4f810bbbad3e98cb21f8b3646a 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -91,8 +91,8 @@ export class CodeApplication extends Disposable { private sharedProcessClient: Promise; constructor( - private mainIpcServer: Server, - private userEnv: IProcessEnvironment, + private readonly mainIpcServer: Server, + private readonly userEnv: IProcessEnvironment, @IInstantiationService private readonly instantiationService: IInstantiationService, @ILogService private readonly logService: ILogService, @IEnvironmentService private readonly environmentService: IEnvironmentService, @@ -648,9 +648,9 @@ export class CodeApplication extends Disposable { const isBuilt = this.environmentService.isBuilt; class ActiveConnection { - private _authority: string; - private _client: Promise>; - private _disposeRunner: RunOnceScheduler; + private readonly _authority: string; + private readonly _client: Promise>; + private readonly _disposeRunner: RunOnceScheduler; constructor(authority: string, host: string, port: number) { this._authority = authority; @@ -707,7 +707,7 @@ export class CodeApplication extends Disposable { if (connectionPool.has(uri.authority)) { activeConnection = connectionPool.get(uri.authority); } else { - let resolvedAuthority = resolveAuthority(uri.authority); + const resolvedAuthority = resolveAuthority(uri.authority); if (!resolvedAuthority) { callback(undefined); return; diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index b63e759f3a9b0dfd958b3f83b5d9456bab6978d4..234ed41eeb1e80713722aefb4bf8ed040dc52033 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -69,14 +69,14 @@ export class CodeWindow extends Disposable implements ICodeWindow { private currentMenuBarVisibility: MenuBarVisibility; private representedFilename: string; - private whenReadyCallbacks: { (window: ICodeWindow): void }[]; + private readonly whenReadyCallbacks: { (window: ICodeWindow): void }[]; private currentConfig: IWindowConfiguration; private pendingLoadConfig?: IWindowConfiguration; private marketplaceHeadersPromise: Promise; - private touchBarGroups: Electron.TouchBarSegmentedControl[]; + private readonly touchBarGroups: Electron.TouchBarSegmentedControl[]; constructor( config: IWindowCreationOptions, diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index b3a582ce9c5abd6b1cf39426f3b1386104519ec4..1bd75d43c0c89b7d1dc54e10160e726ec24a691f 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -158,11 +158,11 @@ export class WindowsManager implements IWindowsMainService { private initialUserEnv: IProcessEnvironment; - private windowsState: IWindowsState; + private readonly windowsState: IWindowsState; private lastClosedWindowState?: IWindowState; - private dialogs: Dialogs; - private workspacesManager: WorkspacesManager; + private readonly dialogs: Dialogs; + private readonly workspacesManager: WorkspacesManager; private _onWindowReady = new Emitter(); onWindowReady: CommonEvent = this._onWindowReady.event; @@ -367,7 +367,7 @@ export class WindowsManager implements IWindowsMainService { this.logService.trace('windowsManager#open'); openConfig = this.validateOpenConfig(openConfig); - let pathsToOpen = this.getPathsToOpen(openConfig); + const pathsToOpen = this.getPathsToOpen(openConfig); const foldersToAdd: IFolderPathToOpen[] = []; const foldersToOpen: IFolderPathToOpen[] = []; @@ -439,7 +439,7 @@ export class WindowsManager implements IWindowsMainService { // Make sure to pass focus to the most relevant of the windows if we open multiple if (usedWindows.length > 1) { - let focusLastActive = this.windowsState.lastActiveWindow && !openConfig.forceEmpty && !hasArgs(openConfig.cli._) && !hasArgs(openConfig.cli['file-uri']) && !hasArgs(openConfig.cli['folder-uri']) && !(openConfig.urisToOpen && openConfig.urisToOpen.length); + const focusLastActive = this.windowsState.lastActiveWindow && !openConfig.forceEmpty && !hasArgs(openConfig.cli._) && !hasArgs(openConfig.cli['file-uri']) && !hasArgs(openConfig.cli['folder-uri']) && !(openConfig.urisToOpen && openConfig.urisToOpen.length); let focusLastOpened = true; let focusLastWindow = true; @@ -550,7 +550,7 @@ export class WindowsManager implements IWindowsMainService { // only look at the windows with correct authority const windows = WindowsManager.WINDOWS.filter(w => w.remoteAuthority === fileInputs!.remoteAuthority); - let bestWindowOrFolder = findBestWindowOrFolderForFile({ + const bestWindowOrFolder = findBestWindowOrFolderForFile({ windows, newWindow: openFilesInNewWindow, context: openConfig.context, @@ -819,7 +819,7 @@ export class WindowsManager implements IWindowsMainService { if (!openConfig.addMode && isCommandLineOrAPICall) { const foldersToOpen = windowsToOpen.filter(path => !!path.folderUri); if (foldersToOpen.length > 1) { - let remoteAuthority = foldersToOpen[0].remoteAuthority; + const remoteAuthority = foldersToOpen[0].remoteAuthority; if (foldersToOpen.every(f => f.remoteAuthority === remoteAuthority)) { // only if all folder have the same authority const workspace = this.workspacesMainService.createUntitledWorkspaceSync(foldersToOpen.map(folder => ({ uri: folder.folderUri! }))); @@ -836,7 +836,7 @@ export class WindowsManager implements IWindowsMainService { private doExtractPathsFromAPI(openConfig: IOpenConfiguration): IPathToOpen[] { const pathsToOpen: IPathToOpen[] = []; const cli = openConfig.cli; - let parseOptions: IPathParseOptions = { gotoLineMode: cli && cli.goto, forceOpenWorkspaceAsFile: openConfig.forceOpenWorkspaceAsFile }; + const parseOptions: IPathParseOptions = { gotoLineMode: cli && cli.goto, forceOpenWorkspaceAsFile: openConfig.forceOpenWorkspaceAsFile }; for (const pathToOpen of openConfig.urisToOpen || []) { if (!pathToOpen) { continue; @@ -979,7 +979,7 @@ export class WindowsManager implements IWindowsMainService { private argToUri(arg: string): URI | undefined { try { - let uri = URI.parse(arg); + const uri = URI.parse(arg); if (!uri.scheme) { this.logService.error(`Invalid URI input string, scheme missing: ${arg}`); return undefined; @@ -1547,7 +1547,7 @@ export class WindowsManager implements IWindowsMainService { openNewWindow(context: OpenContext, options?: INewWindowOptions): ICodeWindow[] { let cli = this.environmentService.args; - let remote = options && options.remoteAuthority || undefined; + const remote = options && options.remoteAuthority || undefined; if (cli && (cli.remote !== remote)) { cli = { ...cli, remote }; } @@ -1784,14 +1784,14 @@ class Dialogs { private static readonly workingDirPickerStorageKey = 'pickerWorkingDir'; - private mapWindowToDialogQueue: Map>; - private noWindowDialogQueue: Queue; + private readonly mapWindowToDialogQueue: Map>; + private readonly noWindowDialogQueue: Queue; constructor( - private environmentService: IEnvironmentService, - private telemetryService: ITelemetryService, - private stateService: IStateService, - private windowsMainService: IWindowsMainService, + private readonly environmentService: IEnvironmentService, + private readonly telemetryService: ITelemetryService, + private readonly stateService: IStateService, + private readonly windowsMainService: IWindowsMainService, ) { this.mapWindowToDialogQueue = new Map>(); this.noWindowDialogQueue = new Queue(); diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 3f07a1e63657f1b97861f496e9be9a293a097a61..566448022a8ac1a07cacee26eadffdb639c916b4 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -104,7 +104,7 @@ export class Main { } private async installExtensions(extensions: string[], force: boolean): Promise { - let failed: string[] = []; + const failed: string[] = []; for (const extension of extensions) { try { await this.installExtension(extension, force);