From acd3be0499d9c3d105a63024d07744c9be267238 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 1 Jun 2020 09:40:54 +0200 Subject: [PATCH] fix bad name of service --- .../services/editor/browser/editorService.ts | 14 +++++++------- .../services/textfile/browser/textFileService.ts | 4 ++-- .../electron-browser/nativeTextFileService.ts | 4 ++-- .../test/browser/workbenchTestServices.ts | 4 ++-- .../test/electron-browser/workbenchTestServices.ts | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 5b62fcac446..708cd167f7b 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -77,7 +77,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { @IConfigurationService private readonly configurationService: IConfigurationService, @IWorkspaceContextService private readonly contextService: IWorkspaceContextService, @IWorkingCopyService private readonly workingCopyService: IWorkingCopyService, - @IUriIdentityService private readonly uriIdentitiyService: IUriIdentityService, + @IUriIdentityService private readonly uriIdentityService: IUriIdentityService, @IModelService private readonly modelService: IModelService ) { super(); @@ -243,7 +243,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { for (const editor of group.editors) { const resource = editor.resource; - if (!resource || !this.uriIdentitiyService.extUri.isEqualOrParent(resource, source)) { + if (!resource || !this.uriIdentityService.extUri.isEqualOrParent(resource, source)) { continue; // not matching our resource } @@ -329,7 +329,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { // Do NOT close any opened editor that matches the resource path (either equal or being parent) of the // resource we move to (movedTo). Otherwise we would close a resource that has been renamed to the same // path but different casing. - if (movedTo && this.uriIdentitiyService.extUri.isEqualOrParent(resource, movedTo)) { + if (movedTo && this.uriIdentityService.extUri.isEqualOrParent(resource, movedTo)) { return; } @@ -337,7 +337,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { if (arg1 instanceof FileChangesEvent) { matches = arg1.contains(resource, FileChangeType.DELETED); } else { - matches = this.uriIdentitiyService.extUri.isEqualOrParent(resource, arg1); + matches = this.uriIdentityService.extUri.isEqualOrParent(resource, arg1); } if (!matches) { @@ -885,7 +885,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { // TODO@Ben remove this check once canonical URIs are adopted in ITextModelResolerService canonicalResource = resourceEditorInput.resource; } else { - canonicalResource = this.uriIdentitiyService.asCanonicalUri(resourceEditorInput.resource); + canonicalResource = this.uriIdentityService.asCanonicalUri(resourceEditorInput.resource); } // Derive the label from the path if not provided explicitly @@ -1187,7 +1187,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { // Remove from resources to wait for being closed based on the // resources from editors that got closed remainingEditors = remainingEditors.filter(({ resource }) => { - if (this.uriIdentitiyService.extUri.isEqual(resource, masterResource) || this.uriIdentitiyService.extUri.isEqual(resource, detailsResource)) { + if (this.uriIdentityService.extUri.isEqual(resource, masterResource) || this.uriIdentityService.extUri.isEqual(resource, detailsResource)) { return false; // remove - the closing editor matches this resource } @@ -1223,7 +1223,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { // Otherwise resolve promise when resource is saved const listener = this.workingCopyService.onDidChangeDirty(workingCopy => { - if (!workingCopy.isDirty() && this.uriIdentitiyService.extUri.isEqual(resource, workingCopy.resource)) { + if (!workingCopy.isDirty() && this.uriIdentityService.extUri.isEqual(resource, workingCopy.resource)) { listener.dispose(); resolve(); diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts index 11bcba042b1..8a826ed8260 100644 --- a/src/vs/workbench/services/textfile/browser/textFileService.ts +++ b/src/vs/workbench/services/textfile/browser/textFileService.ts @@ -71,7 +71,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex @ICodeEditorService private readonly codeEditorService: ICodeEditorService, @IPathService private readonly pathService: IPathService, @IWorkingCopyFileService private readonly workingCopyFileService: IWorkingCopyFileService, - @IUriIdentityService private readonly uriIdentitiyService: IUriIdentityService + @IUriIdentityService private readonly uriIdentityService: IUriIdentityService ) { super(); @@ -231,7 +231,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex // If the target is different but of same identity, we // move the source to the target, knowing that the // underlying file system cannot have both and then save. - if (this.fileService.canHandleResource(source) && this.uriIdentitiyService.extUri.isEqual(source, target)) { + if (this.fileService.canHandleResource(source) && this.uriIdentityService.extUri.isEqual(source, target)) { await this.workingCopyFileService.move(source, target); return this.save(target, options); diff --git a/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts index 48114750c9b..61e703951c6 100644 --- a/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts +++ b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts @@ -61,9 +61,9 @@ export class NativeTextFileService extends AbstractTextFileService { @IPathService pathService: IPathService, @IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService, @ILogService private readonly logService: ILogService, - @IUriIdentityService uriIdentitiyService: IUriIdentityService + @IUriIdentityService uriIdentityService: IUriIdentityService ) { - super(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, textModelService, codeEditorService, pathService, workingCopyFileService, uriIdentitiyService); + super(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, textModelService, codeEditorService, pathService, workingCopyFileService, uriIdentityService); } private _encoding: EncodingOracle | undefined; diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts index d38df7376c9..5ed6d556655 100644 --- a/src/vs/workbench/test/browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/browser/workbenchTestServices.ts @@ -225,7 +225,7 @@ export class TestTextFileService extends BrowserTextFileService { @ICodeEditorService codeEditorService: ICodeEditorService, @IPathService pathService: IPathService, @IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService, - @IUriIdentityService uriIdentitiyService: IUriIdentityService + @IUriIdentityService uriIdentityService: IUriIdentityService ) { super( fileService, @@ -242,7 +242,7 @@ export class TestTextFileService extends BrowserTextFileService { codeEditorService, pathService, workingCopyFileService, - uriIdentitiyService + uriIdentityService ); } diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts index 5b78cc15126..75b4eb33ae2 100644 --- a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts @@ -76,7 +76,7 @@ export class TestTextFileService extends NativeTextFileService { @IPathService athService: IPathService, @IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService, @ILogService logService: ILogService, - @IUriIdentityService uriIdentitiyService: IUriIdentityService + @IUriIdentityService uriIdentityService: IUriIdentityService ) { super( fileService, @@ -95,7 +95,7 @@ export class TestTextFileService extends NativeTextFileService { athService, workingCopyFileService, logService, - uriIdentitiyService + uriIdentityService ); }