From ea35b016acf96aa12672475d3b3c15dcee7b0ec4 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 13 Nov 2020 11:38:58 -0800 Subject: [PATCH 1/3] Bind function to correct this for workspace syms --- src/client/jupyter/languageserver/notebookConverter.ts | 2 +- src/client/jupyter/languageserver/notebookMiddlewareAddon.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/jupyter/languageserver/notebookConverter.ts b/src/client/jupyter/languageserver/notebookConverter.ts index 29a7a00b75c9..bc70d1c43c86 100644 --- a/src/client/jupyter/languageserver/notebookConverter.ts +++ b/src/client/jupyter/languageserver/notebookConverter.ts @@ -129,7 +129,7 @@ export class NotebookConverter implements Disposable { public toIncomingWorkspaceSymbols(symbols: SymbolInformation[] | null | undefined) { if (Array.isArray(symbols)) { - return symbols.map(this.toIncomingWorkspaceSymbol.bind(this)); + return symbols.map((s) => this.toIncomingWorkspaceSymbol(s)); } return symbols; } diff --git a/src/client/jupyter/languageserver/notebookMiddlewareAddon.ts b/src/client/jupyter/languageserver/notebookMiddlewareAddon.ts index 9f116d0b4d83..6f8d40f082e8 100644 --- a/src/client/jupyter/languageserver/notebookMiddlewareAddon.ts +++ b/src/client/jupyter/languageserver/notebookMiddlewareAddon.ts @@ -294,7 +294,7 @@ export class NotebookMiddlewareAddon implements Middleware, Disposable { ): ProviderResult { const result = next(query, token); if (isThenable(result)) { - return result.then(this.converter.toIncomingWorkspaceSymbols.bind(this)); + return result.then(this.converter.toIncomingWorkspaceSymbols.bind(this.converter)); } return this.converter.toIncomingWorkspaceSymbols(result); } From bf43ad1ba9685d3a36874c1f7a9e3eaf9eb3df56 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 13 Nov 2020 11:40:29 -0800 Subject: [PATCH 2/3] News --- news/2 Fixes/14727.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2 Fixes/14727.md diff --git a/news/2 Fixes/14727.md b/news/2 Fixes/14727.md new file mode 100644 index 000000000000..4c336fb2d71c --- /dev/null +++ b/news/2 Fixes/14727.md @@ -0,0 +1 @@ +Fix workspace symbol searching always returning empty. From 200cd77dbb998c4554e34e60c0fa9066e5d8b669 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 13 Nov 2020 11:41:43 -0800 Subject: [PATCH 3/3] Revert unnecessary --- src/client/jupyter/languageserver/notebookConverter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/jupyter/languageserver/notebookConverter.ts b/src/client/jupyter/languageserver/notebookConverter.ts index bc70d1c43c86..29a7a00b75c9 100644 --- a/src/client/jupyter/languageserver/notebookConverter.ts +++ b/src/client/jupyter/languageserver/notebookConverter.ts @@ -129,7 +129,7 @@ export class NotebookConverter implements Disposable { public toIncomingWorkspaceSymbols(symbols: SymbolInformation[] | null | undefined) { if (Array.isArray(symbols)) { - return symbols.map((s) => this.toIncomingWorkspaceSymbol(s)); + return symbols.map(this.toIncomingWorkspaceSymbol.bind(this)); } return symbols; }