Skip to content

Always use canonical uri inside createModelReference #99658

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
jrieken merged 3 commits into from
Jun 9, 2020
Merged

Always use canonical uri inside createModelReference #99658

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca69713
Always use canonical uri inside `createModelReference`
jrieken Jun 9, 2020
1e1ac63
Merge branch 'master' into joh/uriIdent
jrieken Jun 9, 2020
2c6e086
Update src/vs/workbench/services/textmodelResolver/common/textModelRe…
jrieken Jun 9, 2020
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
10 changes: 9 additions & 1 deletion src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { IFileService } from 'vs/platform/files/common/files';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
import { ModelUndoRedoParticipant } from 'vs/editor/common/services/modelUndoRedoParticipant';
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';

class ResourceModelCollection extends ReferenceCollection<Promise<ITextEditorModel>> {

Expand Down Expand Up @@ -174,13 +175,20 @@ export class TextModelResolverService extends Disposable implements ITextModelSe
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IFileService private readonly fileService: IFileService,
@IUndoRedoService private readonly undoRedoService: IUndoRedoService,
@IModelService private readonly modelService: IModelService
@IModelService private readonly modelService: IModelService,
@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
) {
super();
this._register(new ModelUndoRedoParticipant(this.modelService, this, this.undoRedoService));
}

async createModelReference(resource: URI): Promise<IReference<IResolvedTextEditorModel>> {

// From this moment on, only operate on the canonical resource
// to ensure we reduce the chance of resolving the same resource
// with different resource forms (e.g. path casing on Windows)
resource = this.uriIdentityService.asCanonicalUri(resource);
Copy link
Copy Markdown
Member Author

@jrieken jrieken Jun 9, 2020

Choose a reason for hiding this comment

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

@bpasero this is the brute force way which might be OK... However, there are still all callers that we might need to visit and should maybe move this call to where it matter most, e.g where we actually branch off into the file service. E.g here:

vscode/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts

Line 58 in 72a5562

return this.textFileService.files.resolve(resource, { reason: TextFileLoadReason.REFERENCE });

All other places shouldn't be affected by URI "normalization" because only file systems can contribute rules.

Comment thread
jrieken marked this conversation as resolved.

const ref = this.resourceModelCollection.acquire(resource.toString());

try {
Expand Down