Skip to content

Fix resolving, never overwrite by undefined #354

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
kaisalmen merged 1 commit into from
May 20, 2022
Merged

Fix resolving, never overwrite by undefined #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions packages/client/src/monaco-languages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ export function testGlob(pattern: string, value: string): boolean {
return regExp.test(value);
}

function overrideWithResolvedValue<T>(item: T, resolvedItem: T): void {
for (const key in resolvedItem) {
const value = resolvedItem[key]
if (value != null) {
item[key] = value
}
}
}

class ExtHostDiagnostics {
private static _idPool: number = 0;
private readonly _collections = new Map<string, DiagnosticCollection>();
Expand Down Expand Up @@ -140,7 +149,7 @@ export class MonacoLanguages implements Languages {
const resolvedItem = await provider.resolveCompletionItem!(protocolItem, token);
if (resolvedItem) {
const resolvedCompletionItem = this.p2m.asCompletionItem(resolvedItem, item.range);
Object.assign(item, resolvedCompletionItem);
overrideWithResolvedValue(item, resolvedCompletionItem);
}
return item;
} : undefined
Expand Down Expand Up @@ -270,7 +279,7 @@ export class MonacoLanguages implements Languages {
const result = await provider.resolveCodeAction!(params, token);
if (result) {
const resolvedCodeAction = this.p2m.asCodeAction(result);
Object.assign(codeAction, resolvedCodeAction);
overrideWithResolvedValue(codeAction, resolvedCodeAction);
}
return codeAction;
} : undefined
Expand All @@ -294,7 +303,7 @@ export class MonacoLanguages implements Languages {
const result = await provider.resolveCodeLens!(protocolCodeLens, token);
if (result) {
const resolvedCodeLens = this.p2m.asCodeLens(result);
Object.assign(codeLens, resolvedCodeLens);
overrideWithResolvedValue(codeLens, resolvedCodeLens);
}
return codeLens;
} : undefined
Expand Down Expand Up @@ -383,7 +392,7 @@ export class MonacoLanguages implements Languages {
const result = await provider.resolveDocumentLink(documentLink, token);
if (result) {
const resolvedLink = this.p2m.asDocumentLink(result);
Object.assign(link, resolvedLink);
overrideWithResolvedValue(link, resolvedLink);
}
}
return link;
Expand Down Expand Up @@ -529,7 +538,7 @@ export class MonacoLanguages implements Languages {
const result = await provider.resolveInlayHint(documentLink, token);
if (result) {
const resolvedInlayHint = this.p2m.asInlayHint(result);
Object.assign(hint, resolvedInlayHint);
overrideWithResolvedValue(hint, resolvedInlayHint);
}
}
return hint;
Expand Down