Skip to content
Merged

fix: typos #155310

Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions extensions/git/src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,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 Expand Up @@ -1971,7 +1971,7 @@ export class CommandCenter {
}

// 5 attempts to generate a random branch name
for (let index = 0; index < 5; index++) {
for (let index = 0;index < 5;index++) {
const randomName = uniqueNamesGenerator({
dictionaries,
length: dictionaries.length,
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/browser/web.main.ts
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
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,10 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
private compareFolders(currentFolders: IWorkspaceFolder[], newFolders: IWorkspaceFolder[]): IWorkspaceFoldersChangeEvent {
const result: IWorkspaceFoldersChangeEvent = { added: [], removed: [], changed: [] };
result.added = newFolders.filter(newFolder => !currentFolders.some(currentFolder => newFolder.uri.toString() === currentFolder.uri.toString()));
for (let currentIndex = 0; currentIndex < currentFolders.length; currentIndex++) {
for (let currentIndex = 0;currentIndex < currentFolders.length;currentIndex++) {
const currentFolder = currentFolders[currentIndex];
let newIndex = 0;
for (newIndex = 0; newIndex < newFolders.length && currentFolder.uri.toString() !== newFolders[newIndex].uri.toString(); newIndex++) { }
for (newIndex = 0;newIndex < newFolders.length && currentFolder.uri.toString() !== newFolders[newIndex].uri.toString();newIndex++) { }
if (newIndex < newFolders.length) {
if (currentIndex !== newIndex || currentFolder.name !== newFolders[newIndex].name) {
result.changed.push(currentFolder);
Expand Down 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
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