From ef3dbb5e11e08dfc163e02e912bbd408f82b2556 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Thu, 9 Mar 2023 23:13:17 +0800 Subject: [PATCH 1/2] fix: typos --- build/gulpfile.vscode.web.js | 6 +++--- build/lib/optimize.ts | 2 +- .../contrib/extensions/browser/extensionsActions.ts | 4 ++-- .../extensions/common/extensionManifestPropertiesService.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index f8305b89d10b8..553ef6fc496c0 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -83,7 +83,7 @@ const buildDate = new Date().toISOString(); */ const createVSCodeWebProductConfigurationPatcher = (product) => { /** - * @param content {string} The contens of the file + * @param content {string} The contents of the file * @param path {string} The absolute file path, always using `/`, even on Windows */ const result = (content, path) => { @@ -108,7 +108,7 @@ const createVSCodeWebProductConfigurationPatcher = (product) => { */ const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => { /** - * @param content {string} The contens of the file + * @param content {string} The contents of the file * @param path {string} The absolute file path, always using `/`, even on Windows */ const result = (content, path) => { @@ -128,7 +128,7 @@ const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => { */ const combineContentPatchers = (...patchers) => { /** - * @param content {string} The contens of the file + * @param content {string} The contents of the file * @param path {string} The absolute file path, always using `/`, even on Windows */ const result = (content, path) => { diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts index a927bda8cc349..9541c26a42567 100644 --- a/build/lib/optimize.ts +++ b/build/lib/optimize.ts @@ -202,7 +202,7 @@ export interface IOptimizeAMDTaskOpts { languages?: Language[]; /** * File contents interceptor - * @param contents The contens of the file + * @param contents The contents of the file * @param path The absolute file path, always using `/`, even on Windows */ fileContentMapper?: (contents: string, path: string) => string; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts index a329755f732d2..8bd168374fd4c 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -507,7 +507,7 @@ export class InstallAction extends AbstractInstallAction { @IDialogService dialogService: IDialogService, @IPreferencesService preferencesService: IPreferencesService, @IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService, - @IWorkbenchExtensionManagementService private readonly workbenchExtensioManagementService: IWorkbenchExtensionManagementService, + @IWorkbenchExtensionManagementService private readonly workbenchExtensionManagementService: IWorkbenchExtensionManagementService, @IUserDataSyncEnablementService protected readonly userDataSyncEnablementService: IUserDataSyncEnablementService, @ITelemetryService telemetryService: ITelemetryService, ) { @@ -528,7 +528,7 @@ export class InstallAction extends AbstractInstallAction { // When remote connection exists if (this._manifest && this.extensionManagementServerService.remoteExtensionManagementServer) { - const server = this.workbenchExtensioManagementService.getExtensionManagementServerToInstall(this._manifest); + const server = this.workbenchExtensionManagementService.getExtensionManagementServerToInstall(this._manifest); if (server === this.extensionManagementServerService.remoteExtensionManagementServer) { const host = this.extensionManagementServerService.remoteExtensionManagementServer.label; diff --git a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts index 6f3079a78668a..25aca0b026475 100644 --- a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts +++ b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts @@ -68,7 +68,7 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE this._configuredExtensionWorkspaceTrustRequestMap.set(id, configuredExtensionWorkspaceTrustRequests[id]); } - // Workspace trust request type (products.json) + // Workspace trust request type (product.json) this._productExtensionWorkspaceTrustRequestMap = new Map(); if (productService.extensionUntrustedWorkspaceSupport) { for (const id of Object.keys(productService.extensionUntrustedWorkspaceSupport)) { From 4065a16a41511acbaad0da6ebf5879b3e5e87dec Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Fri, 10 Mar 2023 20:01:31 +0800 Subject: [PATCH 2/2] fix: typos --- .../configuration-editing/src/settingsDocumentHelper.ts | 2 +- src/vs/platform/configuration/common/configuration.ts | 4 ++-- src/vs/platform/configuration/common/configurationModels.ts | 6 +++--- .../services/configuration/browser/configurationService.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts index 6c52bb5a511f6..110494fdb3e69 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -266,7 +266,7 @@ export class SettingsDocument { const languageOverrideRange = languageOverridesRanges.find(range => range.contains(position)); /** - * Skip if suggestsions are for first language override range + * Skip if suggestions are for first language override range * Since VSCode registers language overrides to the schema, JSON language server does suggestions for first language override. */ if (languageOverrideRange && !languageOverrideRange.isEqual(languageOverridesRanges[0])) { diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts index c12b9bac4a011..d922c48fd6075 100644 --- a/src/vs/platform/configuration/common/configuration.ts +++ b/src/vs/platform/configuration/common/configuration.ts @@ -121,7 +121,7 @@ export interface IConfigurationService { * Fetches the value of the section for the given overrides. * Value can be of native type or an object keyed off the section name. * - * @param section - Section of the configuraion. Can be `null` or `undefined`. + * @param section - Section of the configuration. Can be `null` or `undefined`. * @param overrides - Overrides that has to be applied while fetching * */ @@ -139,7 +139,7 @@ export interface IConfigurationService { * * Passing a resource through overrides will update the configuration in the workspace folder containing that resource. * - * *Note 1:* Updating configuraiton to a default value will remove the configuration from the requested target. If not target is passed, it will be removed from all writeable targets. + * *Note 1:* Updating configuration to a default value will remove the configuration from the requested target. If not target is passed, it will be removed from all writeable targets. * * *Note 2:* Use `undefined` value to remove the configuration from the given target. If not target is passed, it will be removed from all writeable targets. * diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index d5abc19271359..f05974df9efee 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -1012,7 +1012,7 @@ export class Configuration { this._defaultConfiguration.keys.forEach(key => keys.add(key)); this.userConfiguration.keys.forEach(key => keys.add(key)); this._workspaceConfiguration.keys.forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.keys.forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.keys.forEach(key => keys.add(key))); return [...keys.values()]; } @@ -1021,7 +1021,7 @@ export class Configuration { this._defaultConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); this.userConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); this._workspaceConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.getAllOverrideIdentifiers().forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.getAllOverrideIdentifiers().forEach(key => keys.add(key))); return [...keys.values()]; } @@ -1030,7 +1030,7 @@ export class Configuration { this._defaultConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this.userConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this._workspaceConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); - this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key))); + this._folderConfigurations.forEach(folderConfiguration => folderConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key))); return [...keys.values()]; } diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts index 4d68798fc9a25..bc3a08c3cbd20 100644 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts +++ b/src/vs/workbench/services/configuration/browser/configurationService.ts @@ -789,8 +789,8 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat private onApplicationConfigurationChanged(applicationConfiguration: ConfigurationModel): void { const previous = { data: this._configuration.toData(), workspace: this.workspace }; const change = this._configuration.compareAndUpdateApplicationConfiguration(applicationConfiguration); - const configuraitonProperties = this.configurationRegistry.getConfigurationProperties(); - change.keys = change.keys.filter(key => configuraitonProperties[key]?.scope === ConfigurationScope.APPLICATION); + const configurationProperties = this.configurationRegistry.getConfigurationProperties(); + change.keys = change.keys.filter(key => configurationProperties[key]?.scope === ConfigurationScope.APPLICATION); this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER); }