SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 20:52:56 +01:00
Code Issues Projects Releases Packages Activity

Avoid Uri.parse for fileName equality

Browse source
This commit is contained in:
Alex Dima 2021-10-08 16:45:48 +02:00
parent f2e2b1d3a4
commit 215112db6d
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/languageFeatures.ts
View file

@ -114,7 +114,8 @@ export class LibFiles {
return false; return false;
} }
public getOrCreateModel(uri: Uri): editor.ITextModel | null { public getOrCreateModel(fileName: string): editor.ITextModel | null {
const uri = Uri.parse(fileName);
const model = editor.getModel(uri); const model = editor.getModel(uri);
if (model) { if (model) {
return model; return model;
@ -122,14 +123,9 @@ export class LibFiles {
if (this.isLibFile(uri) && this._hasFetchedLibFiles) { if (this.isLibFile(uri) && this._hasFetchedLibFiles) {
return editor.createModel(this._libFiles[uri.path.slice(1)], 'typescript', uri); return editor.createModel(this._libFiles[uri.path.slice(1)], 'typescript', uri);
} }
const extraLibs = typescriptDefaults.getExtraLibs(); const matchedLibFile = typescriptDefaults.getExtraLibs()[fileName];
const extraLibPaths = Object.keys(extraLibs); if (matchedLibFile) {
for (let i = 0; i < extraLibPaths.length; i++) { return editor.createModel(matchedLibFile.content, 'typescript', uri);
const currentPath = extraLibPaths[i];
const currentUri = Uri.parse(currentPath);
if (currentUri.path === uri.path) {
return editor.createModel(extraLibs[currentPath].content, 'typescript', uri);
}
} }
return null; return null;
} }
@ -390,8 +386,7 @@ export class DiagnosticsAdapter extends Adapter {
relatedInformation.forEach((info) => { relatedInformation.forEach((info) => {
let relatedResource: editor.ITextModel | null = model; let relatedResource: editor.ITextModel | null = model;
if (info.file) { if (info.file) {
const relatedResourceUri = Uri.parse(info.file.fileName); relatedResource = this._libFiles.getOrCreateModel(info.file.fileName);
relatedResource = this._libFiles.getOrCreateModel(relatedResourceUri);
} }
if (!relatedResource) { if (!relatedResource) {
@ -796,11 +791,10 @@ export class DefinitionAdapter extends Adapter {
const result: languages.Location[] = []; const result: languages.Location[] = [];
for (let entry of entries) { for (let entry of entries) {
const uri = Uri.parse(entry.fileName); const refModel = this._libFiles.getOrCreateModel(entry.fileName);
const refModel = this._libFiles.getOrCreateModel(uri);
if (refModel) { if (refModel) {
result.push({ result.push({
uri: uri, uri: refModel.uri,
range: this._textSpanToRange(refModel, entry.textSpan) range: this._textSpanToRange(refModel, entry.textSpan)
}); });
} }
@ -850,11 +844,10 @@ export class ReferenceAdapter extends Adapter implements languages.ReferenceProv
const result: languages.Location[] = []; const result: languages.Location[] = [];
for (let entry of entries) { for (let entry of entries) {
const uri = Uri.parse(entry.fileName); const refModel = this._libFiles.getOrCreateModel(entry.fileName);
const refModel = this._libFiles.getOrCreateModel(uri);
if (refModel) { if (refModel) {
result.push({ result.push({
uri: uri, uri: refModel.uri,
range: this._textSpanToRange(refModel, entry.textSpan) range: this._textSpanToRange(refModel, entry.textSpan)
}); });
} }
@ -1209,18 +1202,17 @@ export class RenameAdapter extends Adapter implements languages.RenameProvider {
const edits: languages.WorkspaceTextEdit[] = []; const edits: languages.WorkspaceTextEdit[] = [];
for (const renameLocation of renameLocations) { for (const renameLocation of renameLocations) {
const resource = Uri.parse(renameLocation.fileName); const model = this._libFiles.getOrCreateModel(renameLocation.fileName);
const model = this._libFiles.getOrCreateModel(resource);
if (model) { if (model) {
edits.push({ edits.push({
resource, resource: model.uri,
edit: { edit: {
range: this._textSpanToRange(model, renameLocation.textSpan), range: this._textSpanToRange(model, renameLocation.textSpan),
text: newName text: newName
} }
}); });
} else { } else {
throw new Error(`Unknown URI ${resource}.`); throw new Error(`Unknown file ${renameLocation.fileName}.`);
} }
} }