Skip to content

Commit 1daea80

Browse files
committed
[release] src/goLanguageServer.ts: fix broken event forwarding in middleware
Middleware must forward the intercepted event to the next handler. Also, fixes the type error occurring when intercepting the codelens response - it can be undefined or null. Change-Id: I59aca7b63503cdb23da11670cfd5fa33ec06014c Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/245540 Reviewed-by: Rebecca Stambler <[email protected]> (cherry picked from commit bd41c5e) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/245599
1 parent ea392d4 commit 1daea80

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/goLanguageServer.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
260260
middleware: {
261261
provideCodeLenses: async (doc, token, next): Promise<vscode.CodeLens[]> => {
262262
const codeLens = await next(doc, token);
263+
if (!codeLens || codeLens.length === 0) {
264+
return codeLens;
265+
}
263266
return codeLens.map((lens: vscode.CodeLens) => {
264267
switch (lens.command.title) {
265268
case 'run test': {
@@ -365,17 +368,21 @@ function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
365368
},
366369
// Keep track of the last file change in order to not prompt
367370
// user if they are actively working.
368-
didOpen: () => {
371+
didOpen: (e, next) => {
369372
lastUserAction = new Date();
373+
next(e);
370374
},
371-
didChange: () => {
375+
didChange: (e, next) => {
372376
lastUserAction = new Date();
377+
next(e);
373378
},
374-
didClose: () => {
379+
didClose: (e, next) => {
375380
lastUserAction = new Date();
381+
next(e);
376382
},
377-
didSave: () => {
383+
didSave: (e, next) => {
378384
lastUserAction = new Date();
385+
next(e);
379386
},
380387
}
381388
}

0 commit comments

Comments
 (0)