Skip to content
Merged

fix typos #176764

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/gulpfile.vscode.web.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand All @@ -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) => {
Expand All @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion build/lib/optimize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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])) {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/configuration/common/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/
Expand All @@ -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.
*
Expand Down
6 changes: 3 additions & 3 deletions src/vs/platform/configuration/common/configurationModels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()];
}

Expand All @@ -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()];
}

Expand All @@ -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()];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE
this._configuredExtensionWorkspaceTrustRequestMap.set(id, configuredExtensionWorkspaceTrustRequests[id]);
}

// Workspace trust request type (products.json)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be a typo here, because there seems to be no products.json but product.jon file.

// Workspace trust request type (product.json)
this._productExtensionWorkspaceTrustRequestMap = new Map<string, ExtensionUntrustedWorkspaceSupport>();
if (productService.extensionUntrustedWorkspaceSupport) {
for (const id of Object.keys(productService.extensionUntrustedWorkspaceSupport)) {
Expand Down