Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 08:38:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure inlay hints are within range asked for, https://github.com/microsoft/vscode/issues/16221

Browse Source
This commit is contained in:
Johannes Rieken
2022-01-12 09:19:56 +01:00
parent 1bdbdf84e9
commit 8f8d0a9cc4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/common/extHostLanguageFeatures.ts
View File

@@ -1181,10 +1181,11 @@ class InlayHintsAdapter {
private readonly _provider: vscode.InlayHintsProvider,
) { }
async provideInlayHints(resource: URI, range: IRange, token: CancellationToken): Promise<extHostProtocol.IInlayHintsDto | undefined> {
async provideInlayHints(resource: URI, ran: IRange, token: CancellationToken): Promise<extHostProtocol.IInlayHintsDto | undefined> {
const doc = this._documents.getDocument(resource);
const range = typeConvert.Range.to(ran);
const hints = await this._provider.provideInlayHints(doc, typeConvert.Range.to(range), token);
const hints = await this._provider.provideInlayHints(doc, range, token);
if (!Array.isArray(hints) || hints.length === 0) {
// bad result
return undefined;
@@ -1198,7 +1199,7 @@ class InlayHintsAdapter {
this._disposables.set(pid, new DisposableStore());
const result: extHostProtocol.IInlayHintsDto = { hints: [], cacheId: pid };
for (let i = 0; i < hints.length; i++) {
if (this._isValidInlayHint(hints[i])) {
if (this._isValidInlayHint(hints[i], range)) {
result.hints.push(this._convertInlayHint(hints[i], [pid, i]));
}
}
@@ -1232,11 +1233,15 @@ class InlayHintsAdapter {
this._cache.delete(id);
}
private _isValidInlayHint(hint: vscode.InlayHint): boolean {
private _isValidInlayHint(hint: vscode.InlayHint, range?: vscode.Range): boolean {
if (hint.label.length === 0 || Array.isArray(hint.label) && hint.label.every(part => part.label.length === 0)) {
console.log('INVALID inlay hint, empty label', hint);
return false;
}
if (range && !range.contains(hint.position)) {
console.log('INVALID inlay hint, position outside range', hint);
return false;
}
return true;
}