From fbdc848c29c8d70faeba67b298cc245f1fac2c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E8=89=AF?= <1204183885@qq.com> Date: Tue, 26 Jul 2022 06:41:30 +0800 Subject: [PATCH] fix: typos (#155310) * fix: typos * chore: revert formatting changes * fix: Remove redundant blank lines --- extensions/git/src/commands.ts | 2 +- src/vs/editor/common/services/getIconClasses.ts | 1 - src/vs/workbench/browser/web.main.ts | 4 ++-- .../services/configuration/browser/configurationService.ts | 6 +++--- .../browser/webExtensionsScannerService.ts | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 560734f6316..ac763f00c53 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -1770,7 +1770,7 @@ export class CommandCenter { const shouldPrompt = config.get('confirmEmptyCommits') === true; if (shouldPrompt) { - const message = localize('confirm emtpy commit', "Are you sure you want to create an empty commit?"); + const message = localize('confirm empty commit', "Are you sure you want to create an empty commit?"); const yes = localize('yes', "Yes"); const neverAgain = localize('yes never again', "Yes, Don't Show Again"); const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain); diff --git a/src/vs/editor/common/services/getIconClasses.ts b/src/vs/editor/common/services/getIconClasses.ts index 57a63980ce7..38f13bf83c7 100644 --- a/src/vs/editor/common/services/getIconClasses.ts +++ b/src/vs/editor/common/services/getIconClasses.ts @@ -71,7 +71,6 @@ export function getIconClasses(modelService: IModelService, languageService: ILa return classes; } - export function getIconClassesForLanguageId(languageId: string): string[] { return ['file-icon', `${cssEscape(languageId)}-lang-file-icon`]; } diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index 0cdc6ba01d3..a307a64ec7e 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -137,7 +137,7 @@ export class BrowserMain extends Disposable { const openerService = accessor.get(IOpenerService); const productService = accessor.get(IProductService); const telemetryService = accessor.get(ITelemetryService); - const progessService = accessor.get(IProgressService); + const progressService = accessor.get(IProgressService); const environmentService = accessor.get(IBrowserWorkbenchEnvironmentService); const instantiationService = accessor.get(IInstantiationService); const remoteExplorerService = accessor.get(IRemoteExplorerService); @@ -169,7 +169,7 @@ export class BrowserMain extends Disposable { } }, window: { - withProgress: (options, task) => progessService.withProgress(options, task) + withProgress: (options, task) => progressService.withProgress(options, task) }, workspace: { openTunnel: async (tunnelOptions) => { diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts index 6dd1c75a6c2..a1245856684 100644 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts +++ b/src/vs/workbench/services/configuration/browser/configurationService.ts @@ -912,12 +912,12 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat private async onWorkspaceFolderConfigurationChanged(folder: IWorkspaceFolder): Promise { const [folderConfiguration] = await this.loadFolderConfigurations([folder]); const previous = { data: this._configuration.toData(), workspace: this.workspace }; - const folderConfiguraitonChange = this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration); + const folderConfigurationChange = this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration); if (this.getWorkbenchState() === WorkbenchState.FOLDER) { const workspaceConfigurationChange = this._configuration.compareAndUpdateWorkspaceConfiguration(folderConfiguration); - this.triggerConfigurationChange(mergeChanges(folderConfiguraitonChange, workspaceConfigurationChange), previous, ConfigurationTarget.WORKSPACE); + this.triggerConfigurationChange(mergeChanges(folderConfigurationChange, workspaceConfigurationChange), previous, ConfigurationTarget.WORKSPACE); } else { - this.triggerConfigurationChange(folderConfiguraitonChange, previous, ConfigurationTarget.WORKSPACE_FOLDER); + this.triggerConfigurationChange(folderConfigurationChange, previous, ConfigurationTarget.WORKSPACE_FOLDER); } this.updateRestrictedSettings(); } diff --git a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts index bc5e140d42a..61275010652 100644 --- a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts +++ b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts @@ -331,7 +331,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten const missingExtensions = extensions.filter(({ id }) => !galleryExtensionsMap.has(id.toLowerCase())); if (missingExtensions.length) { - this.logService.info('Skipping the additional builtin extensions because their compatible versions are not foud.', missingExtensions); + this.logService.info('Skipping the additional builtin extensions because their compatible versions are not found.', missingExtensions); } const webExtensions: IWebExtension[] = [];