fix: ensure code lenses from different sources are merged

dummdidumm · dummdidumm · commit 7bfe801237ed · 2024-11-09T12:52:37.000+01:00
diff --git a/packages/language-server/src/plugins/PluginHost.ts b/packages/language-server/src/plugins/PluginHost.ts
@@ -633,12 +633,13 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {
             throw new Error('Cannot call methods on an unopened document');
         }
 
-        return await this.execute<CodeLens[]>(
+        const result = await this.execute<CodeLens[]>(
             'getCodeLens',
             [document],
-            ExecuteMode.FirstNonNull,
+            ExecuteMode.Collect,
             'smart'
         );
+        return flatten(result.filter(Boolean));
     }
 
     async getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[]> {

Original file line number	Diff line number	Diff line change
`@@ -633,12 +633,13 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {`
`633`	`633`	`throw new Error('Cannot call methods on an unopened document');`
`634`	`634`	`}`
`635`	`635`
`636`		`- return await this.execute<CodeLens[]>(`
	`636`	`+ const result = await this.execute<CodeLens[]>(`
`637`	`637`	`'getCodeLens',`
`638`	`638`	`[document],`
`639`		`- ExecuteMode.FirstNonNull,`
	`639`	`+ ExecuteMode.Collect,`
`640`	`640`	`'smart'`
`641`	`641`	`);`
	`642`	`+ return flatten(result.filter(Boolean));`
`642`	`643`	`}`
`643`	`644`
`644`	`645`	`async getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[]> {`