Skip to content

fix: typos #155310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjbvz merged 4 commits into from
Jul 25, 2022
Merged

fix: typos #155310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c10bb0
fix: typos
yiliang114 Jul 15, 2022
1751371
Merge branch 'main' of https://github.com/microsoft/vscode
yiliang114 Jul 22, 2022
a711e0c
chore: revert formatting changes
yiliang114 Jul 22, 2022
1a1d852
fix: Remove redundant blank lines
yiliang114 Jul 22, 2022
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
2 changes: 1 addition & 1 deletion extensions/git/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ export class CommandCenter {
const shouldPrompt = config.get<boolean>('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);
Expand Down
1 change: 0 additions & 1 deletion src/vs/editor/common/services/getIconClasses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`];
}
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/browser/web.main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -169,7 +169,7 @@ export class BrowserMain extends Disposable {
}
},
window: {
withProgress: (options, task) => progessService.withProgress(options, task)
withProgress: (options, task) => progressService.withProgress(options, task)
},
shutdown: () => lifecycleService.shutdown(),
openTunnel: async (tunnelOptions) => {
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/services/configuration/browser/configurationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,12 +906,12 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
private async onWorkspaceFolderConfigurationChanged(folder: IWorkspaceFolder): Promise<void> {
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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [];
Expand Down