merging with main changes

news/1 Enhancements/8399.md

@@ -0,0 +1,2 @@
+Alert boxes of the form `<div style="alert alert-danger">` are now styled as colored boxes, to match how they are in Jupyter.
+(thanks [Eric Wieser](https://github.com/eric-wieser/))

resources/jupyter-markdown-style.css

@@ -1,5 +1,24 @@
 /* These classnames are inherited from bootstrap, but are present in most notebook renderers */
 
+.alert {
+    width: auto;
+    padding: 1em;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+.alert > *:last-child {
+    margin-bottom: 0;
+}
+#preview > .alert:last-child {
+    /* Prevent this being set to zero by the default notebook stylesheet */
+    padding-bottom: 1em;
+}
+
+.alert-success {
+    /* Note there is no suitable color available, so we just copy "info" */
+    background-color: var(--theme-info-background);
+    color: var(--theme-info-foreground);
+}
 .alert-info {
     background-color: var(--theme-info-background);
     color: var(--theme-info-foreground);
@@ -11,4 +30,4 @@
 .alert-danger {
     background-color: var(--theme-error-background);
     color: var(--theme-error-foreground);
-}
+}

src/platform/debugger/jupyter/helper.ts

@@ -3,7 +3,7 @@
 
 import { DebugProtocol } from 'vscode-debugprotocol';
 import { IKernel } from '../../../kernels/types';
-import { IKernelDebugAdapterConfig, KernelDebugMode } from '../types';
+import { IKernelDebugAdapter, IKernelDebugAdapterConfig, KernelDebugMode } from '../types';
 
 export enum IpykernelCheckResult {
     Unknown,
@@ -122,3 +122,12 @@ export function shortNameMatchesLongName(shortNamePath: string, longNamePath: st
     const r = new RegExp(shortNamePath.replace(/\\/g, '\\\\').replace(/~\d+\\\\/g, '[^\\\\]+\\\\'), 'i');
     return r.test(longNamePath);
 }
+
+export async function cellDebugSetup(kernel: IKernel, debugAdapter: IKernelDebugAdapter): Promise<void> {
+    // remove this if when https://github.com/microsoft/debugpy/issues/706 is fixed and ipykernel ships it
+    // executing this code restarts debugpy and fixes https://github.com/microsoft/vscode-jupyter/issues/7251
+    const code = 'import debugpy\ndebugpy.debug_this_thread()';
+    await kernel.executeHidden(code);
+
+    await debugAdapter.dumpAllCells();
+}

src/platform/debugger/jupyter/kernelDebugAdapter.ts

@@ -52,7 +52,7 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
     onDidSendMessage: Event<DebugProtocolMessage> = this.sendMessage.event;
     onDidEndSession: Event<DebugSession> = this.endSession.event;
     public readonly debugCell: NotebookCell | undefined;
-    private disconected: boolean = false;
+    private disconnected: boolean = false;
     private kernelEventHook = (_event: 'willRestart' | 'willInterrupt') => this.disconnect();
 
     constructor(
@@ -103,7 +103,7 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
                     if (
                         this.configuration.__cellIndex === cellStateChange.cell.index &&
                         cellStateChange.state === NotebookCellExecutionState.Idle &&
-                        !this.disconected
+                        !this.disconnected
                     ) {
                         sendTelemetryEvent(DebuggingTelemetry.endedSession, undefined, { reason: 'normally' });
                         void this.disconnect();
@@ -184,7 +184,7 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
     public async disconnect() {
         await this.session.customRequest('disconnect', { restart: false });
         this.endSession.fire(this.session);
-        this.disconected = true;
+        this.disconnected = true;
         this.kernel?.removeEventHook(this.kernelEventHook);
     }
 

src/platform/debugger/jupyter/notebook/debugCellControllers.ts

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { DebugProtocolMessage, NotebookCell } from 'vscode';
+import { DebugProtocol } from 'vscode-debugprotocol';
+import { ICommandManager } from '../../../common/application/types';
+import { IKernel } from '../../../../kernels/types';
+import { sendTelemetryEvent } from '../../../../telemetry';
+import { DebuggingTelemetry } from '../../constants';
+import { IDebuggingDelegate, IKernelDebugAdapter } from '../../types';
+import { cellDebugSetup } from '../helper';
+
+export class DebugCellController implements IDebuggingDelegate {
+    constructor(
+        private readonly debugAdapter: IKernelDebugAdapter,
+        public readonly debugCell: NotebookCell,
+        private readonly kernel: IKernel,
+        private readonly commandManager: ICommandManager
+    ) {
+        sendTelemetryEvent(DebuggingTelemetry.successfullyStartedRunAndDebugCell);
+    }
+
+    public async willSendEvent(_msg: DebugProtocolMessage): Promise<boolean> {
+        return false;
+    }
+
+    public async willSendRequest(request: DebugProtocol.Request): Promise<void> {
+        if (request.command === 'configurationDone') {
+            await cellDebugSetup(this.kernel, this.debugAdapter);
+
+            void this.commandManager.executeCommand('notebook.cell.execute', {
+                ranges: [{ start: this.debugCell.index, end: this.debugCell.index + 1 }],
+                document: this.debugCell.document.uri
+            });
+        }
+    }
+}

src/platform/debugger/jupyter/debuggingManager.ts → src/platform/debugger/jupyter/notebook/debuggingManager.ts

@@ -17,24 +17,25 @@ import {
     EventEmitter,
     NotebookEditor
 } from 'vscode';
-import * as path from '../../vscode-path/path';
-import { IKernel, IKernelProvider } from '../../../kernels/types';
-import { IConfigurationService, IDisposable } from '../../common/types';
-import { KernelDebugAdapter } from './kernelDebugAdapter';
-import { IExtensionSingleActivationService } from '../../activation/types';
-import { ContextKey } from '../../common/contextKey';
-import { IApplicationShell, ICommandManager, IVSCodeNotebook } from '../../common/application/types';
-import { traceError, traceInfo, traceInfoIfCI } from '../../logging';
-import { DataScience } from '../../common/utils/localize';
-import { Commands as DSCommands, EditorContexts } from '../../../webviews/webview-side/common/constants';
-import { IPlatformService } from '../../common/platform/types';
-import { IDebuggingManager, IKernelDebugAdapterConfig, KernelDebugMode } from '../types';
-import { DebuggingTelemetry, pythonKernelDebugAdapter } from '../constants';
-import { sendTelemetryEvent } from '../../../telemetry';
-import { DebugCellController, RunByLineController } from './debugControllers';
-import { assertIsDebugConfig, IpykernelCheckResult, isUsingIpykernel6OrLater } from './helper';
-import { Debugger } from './debugger';
-import { INotebookControllerManager } from '../../../notebooks/types';
+import * as path from '../../../vscode-path/path';
+import { IKernel, IKernelProvider } from '../../../../kernels/types';
+import { IConfigurationService, IDisposable } from '../../../common/types';
+import { KernelDebugAdapter } from '../kernelDebugAdapter';
+import { IExtensionSingleActivationService } from '../../../activation/types';
+import { ContextKey } from '../../../common/contextKey';
+import { IApplicationShell, ICommandManager, IVSCodeNotebook } from '../../../common/application/types';
+import { traceError, traceInfo, traceInfoIfCI } from '../../../logging';
+import { DataScience } from '../../../common/utils/localize';
+import { Commands as DSCommands, EditorContexts } from '../../../../webviews/webview-side/common/constants';
+import { IPlatformService } from '../../../common/platform/types';
+import { IDebuggingManager, IKernelDebugAdapterConfig, KernelDebugMode } from '../../types';
+import { DebuggingTelemetry, pythonKernelDebugAdapter } from '../../constants';
+import { sendTelemetryEvent } from '../../../../telemetry';
+import { DebugCellController } from './debugCellControllers';
+import { assertIsDebugConfig, IpykernelCheckResult, isUsingIpykernel6OrLater } from '../helper';
+import { Debugger } from '../debugger';
+import { INotebookControllerManager } from '../../../../notebooks/types';
+import { RunByLineController } from './runByLineController';
 
 /**
  * The DebuggingManager maintains the mapping between notebook documents and debug sessions.

src/platform/debugger/jupyter/debugControllers.ts → src/platform/debugger/jupyter/notebook/runByLineController.ts

@@ -1,45 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import * as path from '../../vscode-path/path';
+import * as path from '../../../vscode-path/path';
 import { DebugProtocolMessage, NotebookCell } from 'vscode';
 import { DebugProtocol } from 'vscode-debugprotocol';
-import { parseForComments } from '../../../webviews/webview-side/common';
-import { ICommandManager } from '../../common/application/types';
-import { traceInfoIfCI, traceVerbose } from '../../logging';
-import { IConfigurationService } from '../../common/types';
-import { noop } from '../../common/utils/misc';
-import { IKernel } from '../../../kernels/types';
-import { sendTelemetryEvent } from '../../../telemetry';
-import { DebuggingTelemetry } from '../constants';
-import { IDebuggingDelegate, IKernelDebugAdapter, KernelDebugMode } from '../types';
-import { Commands } from '../../common/constants';
-
-export class DebugCellController implements IDebuggingDelegate {
-    constructor(
-        private readonly debugAdapter: IKernelDebugAdapter,
-        public readonly debugCell: NotebookCell,
-        private readonly kernel: IKernel,
-        private readonly commandManager: ICommandManager
-    ) {
-        sendTelemetryEvent(DebuggingTelemetry.successfullyStartedRunAndDebugCell);
-    }
-
-    public async willSendEvent(_msg: DebugProtocolMessage): Promise<boolean> {
-        return false;
-    }
-
-    public async willSendRequest(request: DebugProtocol.Request): Promise<void> {
-        if (request.command === 'configurationDone') {
-            await cellDebugSetup(this.kernel, this.debugAdapter);
-
-            void this.commandManager.executeCommand('notebook.cell.execute', {
-                ranges: [{ start: this.debugCell.index, end: this.debugCell.index + 1 }],
-                document: this.debugCell.document.uri
-            });
-        }
-    }
-}
+import { parseForComments } from '../../../../webviews/webview-side/common';
+import { ICommandManager } from '../../../common/application/types';
+import { traceInfoIfCI, traceVerbose } from '../../../logging';
+import { IConfigurationService } from '../../../common/types';
+import { noop } from '../../../common/utils/misc';
+import { IKernel } from '../../../../kernels/types';
+import { sendTelemetryEvent } from '../../../../telemetry';
+import { DebuggingTelemetry } from '../../constants';
+import { IDebuggingDelegate, IKernelDebugAdapter, KernelDebugMode } from '../../types';
+import { Commands } from '../../../common/constants';
+import { cellDebugSetup } from '../helper';
 
 export class RunByLineController implements IDebuggingDelegate {
     private lastPausedThreadId: number | undefined;
@@ -170,12 +145,3 @@ export class RunByLineController implements IDebuggingDelegate {
         });
     }
 }
-
-async function cellDebugSetup(kernel: IKernel, debugAdapter: IKernelDebugAdapter): Promise<void> {
-    // remove this if when https://github.com/microsoft/debugpy/issues/706 is fixed and ipykernel ships it
-    // executing this code restarts debugpy and fixes https://github.com/microsoft/vscode-jupyter/issues/7251
-    const code = 'import debugpy\ndebugpy.debug_this_thread()';
-    await kernel.executeHidden(code);
-
-    await debugAdapter.dumpAllCells();
-}

src/platform/serviceRegistry.node.ts

@@ -33,7 +33,7 @@ import { GlobalActivation } from './common/globalActivation';
 import { PreReleaseChecker } from './common/prereleaseChecker.node';
 import { IConfigurationService, IDataScienceCommandListener, IExtensionContext } from './common/types';
 import { DebugLocationTrackerFactory } from './debugger/debugLocationTrackerFactory.node';
-import { DebuggingManager } from './debugger/jupyter/debuggingManager';
+import { DebuggingManager } from './debugger/jupyter/notebook/debuggingManager';
 import { IDebugLocationTracker, IDebuggingManager } from './debugger/types';
 import { DataScienceErrorHandler } from './errors/errorHandler';
 import { IDataScienceErrorHandler } from './errors/types';

src/platform/serviceRegistry.web.ts

@@ -28,7 +28,7 @@ import { IExtensionSingleActivationService } from './activation/types';
 import { ExtensionSideRenderer, IExtensionSideRenderer } from '../webviews/extension-side/renderer';
 import { OutputCommandListener } from './logging/outputCommandListener';
 import { IDebuggingManager } from './debugger/types';
-import { DebuggingManager } from './debugger/jupyter/debuggingManager';
+import { DebuggingManager } from './debugger/jupyter/notebook/debuggingManager';
 import { ExportDialog } from './export/exportDialog';
 import { ExportFormat, IExport, IExportDialog, IFileConverter } from './export/types';
 import { FileConverter } from './export/fileConverter.web';