Fix native notebook interrtupt toolbar

microsoft · Jun 14, 2021 · 0bb374d · 0bb374d
1 parent 6b1c4e9
commit 0bb374d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/news/2 Fixes/6254.md b/news/2 Fixes/6254.md
@@ -0,0 +1 @@
+Fix interrupt button in Native Notebook toolbar.
diff --git a/src/client/datascience/commands/activeEditorContext.ts b/src/client/datascience/commands/activeEditorContext.ts
@@ -146,9 +146,9 @@ export class ActiveEditorContextService implements IExtensionSingleActivationSer
                 .getOrCreateNotebook({ identity: activeEditor.file, resource: activeEditor.file, getOnly: true })
                 .then((nb) => {
                     if (activeEditor === this.notebookEditorProvider.activeEditor) {
-                        const canStart = nb && nb.status !== ServerStatus.NotStarted && activeEditor.model?.isTrusted;
+                        const canStart = nb && nb.status !== ServerStatus.NotStarted;
                         this.canRestartNotebookKernelContext.set(!!canStart).ignoreErrors();
-                        const canInterrupt = nb && nb.status === ServerStatus.Busy && activeEditor.model?.isTrusted;
+                        const canInterrupt = nb && nb.status === ServerStatus.Busy;
                         this.canInterruptNotebookKernelContext.set(!!canInterrupt).ignoreErrors();
                     }
                 })

diff --git a/src/client/datascience/interactive-ipynb/nativeEditorCommandListener.ts b/src/client/datascience/interactive-ipynb/nativeEditorCommandListener.ts
@@ -14,6 +14,7 @@ import { captureTelemetry } from '../../telemetry';
 import { CommandSource } from '../../testing/common/constants';
 import { Commands, Telemetry } from '../constants';
 import { IDataScienceCommandListener, IDataScienceErrorHandler, INotebookEditorProvider } from '../types';
+import { isUri } from '../../common/utils/misc';
 
 @injectable()
 export class NativeEditorCommandListener implements IDataScienceCommandListener {
@@ -93,7 +94,7 @@ export class NativeEditorCommandListener implements IDataScienceCommandListener
 
     private interruptKernel(notebookUri: Uri | undefined) {
         // `document` may be undefined if this command is invoked from the command palette.
-        if (notebookUri) {
+        if (isUri(notebookUri)) {
             traceInfo(`Interrupt requested for ${notebookUri.toString()} in nativeEditorCommandListener`);
             traceInfo(`this.provider.activeEditor?.file.toString() = ${this.provider.activeEditor?.file.toString()}`);
             traceInfo(`this.provider.editors = ${this.provider.editors.map((item) => item.file.toString())}`);