From 675aba917969251370adc018373045148b0e5e39 Mon Sep 17 00:00:00 2001 From: Ian Huff Date: Mon, 27 Apr 2020 09:17:33 -0700 Subject: [PATCH 1/2] only close interactive session on interactive window close (#11405) Co-authored-by: Ian Huff --- news/2 Fixes/11404.md | 1 + .../datascience/interactive-common/notebookProvider.ts | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 news/2 Fixes/11404.md diff --git a/news/2 Fixes/11404.md b/news/2 Fixes/11404.md new file mode 100644 index 000000000000..09ac624da87e --- /dev/null +++ b/news/2 Fixes/11404.md @@ -0,0 +1 @@ +Closing the interactive window shuts down other active notebook sessions. \ No newline at end of file diff --git a/src/client/datascience/interactive-common/notebookProvider.ts b/src/client/datascience/interactive-common/notebookProvider.ts index 13b896d3de39..c7e48fdb4667 100644 --- a/src/client/datascience/interactive-common/notebookProvider.ts +++ b/src/client/datascience/interactive-common/notebookProvider.ts @@ -281,7 +281,13 @@ export class NotebookProvider implements INotebookProvider { } Array.from(this.notebooks.values()).forEach((promise) => { - promise.then((notebook) => notebook.dispose()).catch(noop); + promise + .then((notebook) => { + if (notebook.identity.scheme === 'history') { + notebook.dispose().ignoreErrors(); + } + }) + .catch(noop); }); this.notebooks.clear(); From e4ac84757ccad0e175522d4601ebbbd435db4468 Mon Sep 17 00:00:00 2001 From: Ian Huff Date: Mon, 27 Apr 2020 11:16:40 -0700 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 ++ news/2 Fixes/11404.md | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 news/2 Fixes/11404.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db19843d850..4205ac52f62d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ ([#11334](https://github.com/Microsoft/vscode-python/issues/11334)) 1. Change "python.dataScience.runStartupCommands" commands to be a global setting, not a workspace setting. ([#11352](https://github.com/Microsoft/vscode-python/issues/11352)) +1. Closing the interactive window shuts down other active notebook sessions. + ([#11404](https://github.com/Microsoft/vscode-python/issues/11404)) ### Thanks diff --git a/news/2 Fixes/11404.md b/news/2 Fixes/11404.md deleted file mode 100644 index 09ac624da87e..000000000000 --- a/news/2 Fixes/11404.md +++ /dev/null @@ -1 +0,0 @@ -Closing the interactive window shuts down other active notebook sessions. \ No newline at end of file