Skip to content

Commit

Permalink
fix bad name of service
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Jun 1, 2020
1 parent 0b634c4 commit acd3be0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions src/vs/workbench/services/editor/browser/editorService.ts
Expand Up @@ -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();
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -329,15 +329,15 @@ 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;
}

let matches = false;
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) {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/services/textfile/browser/textFileService.ts
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/test/browser/workbenchTestServices.ts
Expand Up @@ -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,
Expand All @@ -242,7 +242,7 @@ export class TestTextFileService extends BrowserTextFileService {
codeEditorService,
pathService,
workingCopyFileService,
uriIdentitiyService
uriIdentityService
);
}

Expand Down
Expand Up @@ -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,
Expand All @@ -95,7 +95,7 @@ export class TestTextFileService extends NativeTextFileService {
athService,
workingCopyFileService,
logService,
uriIdentitiyService
uriIdentityService
);
}

Expand Down

0 comments on commit acd3be0

Please sign in to comment.