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

Merge pull request #84 from paranoidjk/fix-reference

Browse source 
feat: support find reference to extraLib
This commit is contained in:
Alexandru Dima 2021-10-08 16:46:24 +02:00 • committed by GitHub
commit 66f57d0811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
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,6 +123,10 @@ 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 matchedLibFile = typescriptDefaults.getExtraLibs()[fileName];
if (matchedLibFile) {
return editor.createModel(matchedLibFile.content, 'typescript', uri);
}
return null; return null;
} }
@ -381,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) {
@ -787,22 +791,12 @@ 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)
}); });
} else {
const matchedLibFile = typescriptDefaults.getExtraLibs()[entry.fileName];
if (matchedLibFile) {
const libModel = editor.createModel(matchedLibFile.content, 'typescript', uri);
return {
uri: uri,
range: this._textSpanToRange(libModel, entry.textSpan)
};
}
} }
} }
return result; return result;
@ -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)
}); });
} }
@ -1160,6 +1153,12 @@ export class CodeActionAdaptor extends FormatHelper implements languages.CodeAct
// --- rename ---- // --- rename ----
export class RenameAdapter extends Adapter implements languages.RenameProvider { export class RenameAdapter extends Adapter implements languages.RenameProvider {
constructor(
private readonly _libFiles: LibFiles,
worker: (...uris: Uri[]) => Promise<TypeScriptWorker>
) {
super(worker);
}
public async provideRenameEdits( public async provideRenameEdits(
model: editor.ITextModel, model: editor.ITextModel,
position: Position, position: Position,
@ -1203,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 = editor.getModel(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}.`);
} }
} }

2
src/tsMode.ts
View file

@ -80,7 +80,7 @@ function setupMode(
new languageFeatures.FormatOnTypeAdapter(worker) new languageFeatures.FormatOnTypeAdapter(worker)
); );
languages.registerCodeActionProvider(modeId, new languageFeatures.CodeActionAdaptor(worker)); languages.registerCodeActionProvider(modeId, new languageFeatures.CodeActionAdaptor(worker));
languages.registerRenameProvider(modeId, new languageFeatures.RenameAdapter(worker)); languages.registerRenameProvider(modeId, new languageFeatures.RenameAdapter(libFiles, worker));
languages.registerInlayHintsProvider(modeId, new languageFeatures.InlayHintsAdapter(worker)); languages.registerInlayHintsProvider(modeId, new languageFeatures.InlayHintsAdapter(worker));
new languageFeatures.DiagnosticsAdapter(libFiles, defaults, modeId, worker); new languageFeatures.DiagnosticsAdapter(libFiles, defaults, modeId, worker);
return worker; return worker;