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

feat: support find reference to extaLib, treat extraLib as a normal model as well

Browse source
This commit is contained in:
paranoidjk 2021-09-26 14:20:55 +08:00
parent 1a0d39eb31
commit e8f34f3e53
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/languageFeatures.ts
View file

@ -98,7 +98,10 @@ export class LibFiles {
private _hasFetchedLibFiles: boolean; private _hasFetchedLibFiles: boolean;
private _fetchLibFilesPromise: Promise<void> | null; private _fetchLibFilesPromise: Promise<void> | null;
constructor(private readonly _worker: (...uris: Uri[]) => Promise<TypeScriptWorker>) { constructor(
private readonly modeId: string,
private readonly _worker: (...uris: Uri[]) => Promise<TypeScriptWorker>
) {
this._libFiles = {}; this._libFiles = {};
this._hasFetchedLibFiles = false; this._hasFetchedLibFiles = false;
this._fetchLibFilesPromise = null; this._fetchLibFilesPromise = null;
@ -120,7 +123,16 @@ export class LibFiles {
return model; return model;
} }
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)], this.modeId, uri);
}
const extraLibs = typescriptDefaults.getExtraLibs();
const extraLibPaths = Object.keys(extraLibs);
for (let i = 0; i < extraLibPaths.length; i++) {
const currentPath = extraLibPaths[i];
const currentUri = Uri.parse(currentPath);
if (currentUri.path === uri.path) {
return editor.createModel(extraLibs[currentPath].content, this.modeId, uri);
}
} }
return null; return null;
} }
@ -794,15 +806,6 @@ export class DefinitionAdapter extends Adapter {
uri: uri, uri: 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;
@ -1160,6 +1163,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,
@ -1204,7 +1213,7 @@ 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 resource = Uri.parse(renameLocation.fileName);
const model = editor.getModel(resource); const model = this._libFiles.getOrCreateModel(resource);
if (model) { if (model) {
edits.push({ edits.push({
resource, resource,

4
src/tsMode.ts
View file

@ -50,7 +50,7 @@ function setupMode(
return client.getLanguageServiceWorker(...uris); return client.getLanguageServiceWorker(...uris);
}; };
const libFiles = new languageFeatures.LibFiles(worker); const libFiles = new languageFeatures.LibFiles(modeId, worker);
languages.registerCompletionItemProvider(modeId, new languageFeatures.SuggestAdapter(worker)); languages.registerCompletionItemProvider(modeId, new languageFeatures.SuggestAdapter(worker));
languages.registerSignatureHelpProvider( languages.registerSignatureHelpProvider(
@ -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;