@codingame/monaco-vscode-api 1.81.8-next.3 → 1.82.0-next.0

package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js

@@ -6,7 +6,7 @@ import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancel
 import { canceled } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { normalizeDriveLetter } from 'monaco-editor/esm/vs/base/common/labels.js';
-import { MutableDisposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { DisposableStore, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { mixin } from 'monaco-editor/esm/vs/base/common/objects.js';
 import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
@@ -55,7 +55,7 @@ let DebugSession = class DebugSession {
         this.threads = ( new Map());
         this.threadIds = [];
         this.cancellationMap = ( new Map());
-        this.rawListeners = [];
+        this.rawListeners = ( new DisposableStore());
         this.stoppedDetails = [];
         this._onDidChangeState = ( new Emitter());
         this._onDidEndAdapter = ( new Emitter());
@@ -75,14 +75,11 @@ let DebugSession = class DebugSession {
         else {
             this.repl = this.parentSession.repl;
         }
-        const toDispose = ( new DisposableStore());
+        const toDispose = this.rawListeners.add(( new DisposableStore()));
         const replListener = toDispose.add(( new MutableDisposable()));
         replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
         if (lifecycleService) {
-            toDispose.add(lifecycleService.onWillShutdown(() => {
-                this.shutdown();
-                dispose(toDispose);
-            }));
+            toDispose.add(lifecycleService.onWillShutdown(() => this.shutdown()));
         }
         const compoundRoot = this._options.compoundRoot;
         if (compoundRoot) {
@@ -781,7 +778,7 @@ let DebugSession = class DebugSession {
         if (!this.raw) {
             return;
         }
-        this.rawListeners.push(this.raw.onDidInitialize(async () => {
+        this.rawListeners.add(this.raw.onDidInitialize(async () => {
             aria.status(( localize('debuggingStarted', "Debugging started.")));
             const sendConfigurationDone = async () => {
                 if (this.raw && this.raw.capabilities.supportsConfigurationDoneRequest) {
@@ -804,7 +801,7 @@ let DebugSession = class DebugSession {
             }
         }));
         const statusQueue = ( new Queue());
-        this.rawListeners.push(this.raw.onDidStop(async (event) => {
+        this.rawListeners.add(this.raw.onDidStop(async (event) => {
             statusQueue.queue(async () => {
                 this.passFocusScheduler.cancel();
                 this.stoppedDetails.push(event.body);
@@ -845,14 +842,14 @@ let DebugSession = class DebugSession {
                 this._onDidChangeState.fire();
             });
         }));
-        this.rawListeners.push(this.raw.onDidThread(event => {
+        this.rawListeners.add(this.raw.onDidThread(event => {
             statusQueue.queue(async () => {
                 if (event.body.reason === 'started') {
                     if (!this.fetchThreadsScheduler) {
                         this.fetchThreadsScheduler = ( new RunOnceScheduler(() => {
                             this.fetchThreads();
                         }, 100));
-                        this.rawListeners.push(this.fetchThreadsScheduler);
+                        this.rawListeners.add(this.fetchThreadsScheduler);
                     }
                     if (!this.fetchThreadsScheduler.isScheduled()) {
                         this.fetchThreadsScheduler.schedule();
@@ -869,7 +866,7 @@ let DebugSession = class DebugSession {
                 }
             });
         }));
-        this.rawListeners.push(this.raw.onDidTerminateDebugee(async (event) => {
+        this.rawListeners.add(this.raw.onDidTerminateDebugee(async (event) => {
             aria.status(( localize('debuggingStopped', "Debugging stopped.")));
             if (event.body && event.body.restart) {
                 await this.debugService.restartSession(this, event.body.restart);
@@ -878,14 +875,14 @@ let DebugSession = class DebugSession {
                 await this.raw.disconnect({ terminateDebuggee: false });
             }
         }));
-        this.rawListeners.push(this.raw.onDidContinued(event => {
+        this.rawListeners.add(this.raw.onDidContinued(event => {
             statusQueue.queue(async () => {
                 const threadId = event.body.allThreadsContinued !== false ? undefined : event.body.threadId;
                 if (typeof threadId === 'number') {
                     this.stoppedDetails = this.stoppedDetails.filter(sd => sd.threadId !== threadId);
                     const tokens = this.cancellationMap.get(threadId);
                     this.cancellationMap.delete(threadId);
-                    tokens?.forEach(t => t.cancel());
+                    tokens?.forEach(t => t.dispose(true));
                 }
                 else {
                     this.stoppedDetails = [];
@@ -898,7 +895,7 @@ let DebugSession = class DebugSession {
             });
         }));
         const outputQueue = ( new Queue());
-        this.rawListeners.push(this.raw.onDidOutput(async (event) => {
+        this.rawListeners.add(this.raw.onDidOutput(async (event) => {
             const outputSeverity = event.body.category === 'stderr' ? Severity.Error : event.body.category === 'console' ? Severity.Warning : Severity.Info;
             if (event.body.variablesReference) {
                 const source = event.body.source && event.body.line ? {
@@ -957,7 +954,7 @@ let DebugSession = class DebugSession {
                 }
             });
         }));
-        this.rawListeners.push(this.raw.onDidBreakpoint(event => {
+        this.rawListeners.add(this.raw.onDidBreakpoint(event => {
             const id = event.body && event.body.breakpoint ? event.body.breakpoint.id : undefined;
             const breakpoint = this.model.getBreakpoints().find(bp => bp.getIdFromAdapter(this.getId()) === id);
             const functionBreakpoint = this.model.getFunctionBreakpoints().find(bp => bp.getIdFromAdapter(this.getId()) === id);
@@ -1008,28 +1005,28 @@ let DebugSession = class DebugSession {
                 }
             }
         }));
-        this.rawListeners.push(this.raw.onDidLoadedSource(event => {
+        this.rawListeners.add(this.raw.onDidLoadedSource(event => {
             this._onDidLoadedSource.fire({
                 reason: event.body.reason,
                 source: this.getSource(event.body.source)
             });
         }));
-        this.rawListeners.push(this.raw.onDidCustomEvent(event => {
+        this.rawListeners.add(this.raw.onDidCustomEvent(event => {
             this._onDidCustomEvent.fire(event);
         }));
-        this.rawListeners.push(this.raw.onDidProgressStart(event => {
+        this.rawListeners.add(this.raw.onDidProgressStart(event => {
             this._onDidProgressStart.fire(event);
         }));
-        this.rawListeners.push(this.raw.onDidProgressUpdate(event => {
+        this.rawListeners.add(this.raw.onDidProgressUpdate(event => {
             this._onDidProgressUpdate.fire(event);
         }));
-        this.rawListeners.push(this.raw.onDidProgressEnd(event => {
+        this.rawListeners.add(this.raw.onDidProgressEnd(event => {
             this._onDidProgressEnd.fire(event);
         }));
-        this.rawListeners.push(this.raw.onDidInvalidateMemory(event => {
+        this.rawListeners.add(this.raw.onDidInvalidateMemory(event => {
             this._onDidInvalidMemory.fire(event);
         }));
-        this.rawListeners.push(this.raw.onDidInvalidated(async (event) => {
+        this.rawListeners.add(this.raw.onDidInvalidated(async (event) => {
             if (!(event.body.areas && event.body.areas.length === 1 && (event.body.areas[0] === 'variables' || event.body.areas[0] === 'watch'))) {
                 this.cancelAllRequests();
                 this.model.clearThreads(this.getId(), true);
@@ -1040,7 +1037,7 @@ let DebugSession = class DebugSession {
                 viewModel.updateViews();
             }
         }));
-        this.rawListeners.push(this.raw.onDidExitAdapter(event => this.onDidExitAdapter(event)));
+        this.rawListeners.add(this.raw.onDidExitAdapter(event => this.onDidExitAdapter(event)));
     }
     onDidExitAdapter(event) {
         this.initialized = true;
@@ -1049,7 +1046,7 @@ let DebugSession = class DebugSession {
         this._onDidEndAdapter.fire(event);
     }
     shutdown() {
-        dispose(this.rawListeners);
+        this.rawListeners.clear();
         if (this.raw) {
             this.raw.disconnect({});
             this.raw.dispose();
@@ -1062,6 +1059,10 @@ let DebugSession = class DebugSession {
         this.model.clearThreads(this.getId(), true);
         this._onDidChangeState.fire();
     }
+    dispose() {
+        this.cancelAllRequests();
+        this.rawListeners.dispose();
+    }
     getSourceForUri(uri) {
         return this.sources.get(( this.uriIdentityService.asCanonicalUri(uri).toString()));
     }
@@ -1099,7 +1100,7 @@ let DebugSession = class DebugSession {
         return tokenSource.token;
     }
     cancelAllRequests() {
-        this.cancellationMap.forEach(tokens => tokens.forEach(t => t.cancel()));
+        this.cancellationMap.forEach(tokens => tokens.forEach(t => t.dispose(true)));
         this.cancellationMap.clear();
     }
     getReplElements() {

package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js

@@ -5,7 +5,6 @@ import { Markers } from '../../markers/common/markers.js';
 import { ITaskService } from '../../tasks/common/taskService.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { MarkerSeverity, IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
 import { IViewsService } from '../../../common/views.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
@@ -228,7 +227,7 @@ let DebugTaskRunner = class DebugTaskRunner {
             if (task.configurationProperties.isBackground) {
                 return inactivePromise;
             }
-            return taskPromise.then(withUndefinedAsNull);
+            return taskPromise.then(x => x ?? null);
         });
         return ( new Promise((c, e) => {
             const waitForInput = ( new Promise(

package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js

@@ -31,6 +31,7 @@ import { isAbsolute } from 'monaco-editor/esm/vs/base/common/path.js';
 import { applyFontInfo } from 'monaco-editor/esm/vs/editor/browser/config/domFontInfo.js';
 import { binarySearch2 } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+var DisassemblyView_1, BreakpointRenderer_1, InstructionRenderer_1;
 const disassemblyNotAvailable = {
     allowBreakpoint: false,
     isBreakpointSet: false,
@@ -42,6 +43,7 @@ const disassemblyNotAvailable = {
     instructionAddress: BigInt(-1)
 };
 let DisassemblyView = class DisassemblyView extends EditorPane {
+    static { DisassemblyView_1 = this; }
     static { this.NUM_INSTRUCTIONS_TO_LOAD = 50; }
     constructor(telemetryService, themeService, storageService, _configurationService, _instantiationService, _debugService) {
         super(DISASSEMBLY_VIEW_ID, telemetryService, themeService, storageService);
@@ -152,8 +154,8 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
             if (e.oldScrollTop > e.scrollTop && e.scrollTop < e.height) {
                 this._loadingLock = true;
-                const topElement = Math.floor(e.scrollTop / this.fontInfo.lineHeight) + DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD;
-                this.scrollUp_LoadDisassembledInstructions(DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD).then((success) => {
+                const topElement = Math.floor(e.scrollTop / this.fontInfo.lineHeight) + DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD;
+                this.scrollUp_LoadDisassembledInstructions(DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD).then((success) => {
                     if (success) {
                         this._disassembledInstructions.reveal(topElement, 0);
                     }
@@ -162,7 +164,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
             else if (e.oldScrollTop < e.scrollTop && e.scrollTop + e.height > e.scrollHeight - e.height) {
                 this._loadingLock = true;
-                this.scrollDown_LoadDisassembledInstructions(DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD).then(() => { this._loadingLock = false; });
+                this.scrollDown_LoadDisassembledInstructions(DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD).then(() => { this._loadingLock = false; });
             }
         }));
         this._register(this._debugService.getViewModel().onDidFocusStackFrame((stackFrame) => {
@@ -338,7 +340,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             this._loadingLock = true;
             this._disassembledInstructions.splice(0, this._disassembledInstructions.length, [disassemblyNotAvailable]);
             this._instructionBpList = this._debugService.getModel().getInstructionBreakpoints();
-            this.loadDisassembledInstructions(targetAddress, -DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD * 4, DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD * 8).then(() => {
+            this.loadDisassembledInstructions(targetAddress, -DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD * 4, DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD * 8).then(() => {
                 if (this._disassembledInstructions.length > 0) {
                     const targetIndex = Math.floor(this._disassembledInstructions.length / 2);
                     this._disassembledInstructions.reveal(targetIndex, 0.5);
@@ -350,7 +352,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         }
     }
 };
-DisassemblyView = ( (__decorate([
+DisassemblyView = DisassemblyView_1 = ( (__decorate([
     ( (__param(0, ITelemetryService))),
     ( (__param(1, IThemeService))),
     ( (__param(2, IStorageService))),
@@ -359,11 +361,12 @@ DisassemblyView = ( (__decorate([
     ( (__param(5, IDebugService)))
 ], DisassemblyView)));
 let BreakpointRenderer = class BreakpointRenderer {
+    static { BreakpointRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'breakpoint'; }
     constructor(_disassemblyView, _debugService) {
         this._disassemblyView = _disassemblyView;
         this._debugService = _debugService;
-        this.templateId = BreakpointRenderer.TEMPLATE_ID;
+        this.templateId = BreakpointRenderer_1.TEMPLATE_ID;
         this._breakpointIcon = 'codicon-' + breakpoint.regular.id;
         this._breakpointDisabledIcon = 'codicon-' + breakpoint.disabled.id;
         this._breakpointHintIcon = 'codicon-' + debugBreakpointHint.id;
@@ -441,10 +444,11 @@ let BreakpointRenderer = class BreakpointRenderer {
         }
     }
 };
-BreakpointRenderer = ( (__decorate([
+BreakpointRenderer = BreakpointRenderer_1 = ( (__decorate([
     ( (__param(1, IDebugService)))
 ], BreakpointRenderer)));
 let InstructionRenderer = class InstructionRenderer extends Disposable {
+    static { InstructionRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'instruction'; }
     static { this.INSTRUCTION_ADDR_MIN_LENGTH = 25; }
     static { this.INSTRUCTION_BYTES_MIN_LENGTH = 30; }
@@ -455,7 +459,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
         this.textModelService = textModelService;
         this.uriService = uriService;
         this.logService = logService;
-        this.templateId = InstructionRenderer.TEMPLATE_ID;
+        this.templateId = InstructionRenderer_1.TEMPLATE_ID;
         this._topStackFrameColor = themeService.getColorTheme().getColor(topStackFrameColor);
         this._focusedStackFrameColor = themeService.getColorTheme().getColor(focusedStackFrameColor);
         this._register(themeService.onDidColorThemeChange(e => {
@@ -511,8 +515,8 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
         let spacesToAppend = 10;
         if (instruction.address !== '-1') {
             sb.appendString(instruction.address);
-            if (instruction.address.length < InstructionRenderer.INSTRUCTION_ADDR_MIN_LENGTH) {
-                spacesToAppend = InstructionRenderer.INSTRUCTION_ADDR_MIN_LENGTH - instruction.address.length;
+            if (instruction.address.length < InstructionRenderer_1.INSTRUCTION_ADDR_MIN_LENGTH) {
+                spacesToAppend = InstructionRenderer_1.INSTRUCTION_ADDR_MIN_LENGTH - instruction.address.length;
             }
             for (let i = 0; i < spacesToAppend; i++) {
                 sb.appendString(' ');
@@ -521,8 +525,8 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
         if (instruction.instructionBytes) {
             sb.appendString(instruction.instructionBytes);
             spacesToAppend = 10;
-            if (instruction.instructionBytes.length < InstructionRenderer.INSTRUCTION_BYTES_MIN_LENGTH) {
-                spacesToAppend = InstructionRenderer.INSTRUCTION_BYTES_MIN_LENGTH - instruction.instructionBytes.length;
+            if (instruction.instructionBytes.length < InstructionRenderer_1.INSTRUCTION_BYTES_MIN_LENGTH) {
+                spacesToAppend = InstructionRenderer_1.INSTRUCTION_BYTES_MIN_LENGTH - instruction.instructionBytes.length;
             }
             for (let i = 0; i < spacesToAppend; i++) {
                 sb.appendString(' ');
@@ -593,7 +597,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
         element.style.whiteSpace = 'pre';
     }
 };
-InstructionRenderer = ( (__decorate([
+InstructionRenderer = InstructionRenderer_1 = ( (__decorate([
     ( (__param(1, IThemeService))),
     ( (__param(2, IEditorService))),
     ( (__param(3, ITextModelService))),

package/vscode/src/vs/workbench/contrib/debug/browser/repl.js

@@ -54,6 +54,7 @@ import { Variable } from '../common/debugModel.js';
 import { ReplEvaluationResult, ReplGroup } from '../common/replModel.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+var Repl_1, ReplOptions_1;
 const $ = dom.$;
 const HISTORY_STORAGE_KEY = 'debug.repl.history';
 const FILTER_HISTORY_STORAGE_KEY = 'debug.repl.filterHistory';
@@ -65,6 +66,7 @@ function revealLastElement(tree) {
 const sessionsToIgnore = ( (new Set()));
 const identityProvider = { getId: (element) => element.getId() };
 let Repl = class Repl extends FilterViewPane {
+    static { Repl_1 = this; }
     static { this.REFRESH_DELAY = 50; }
     static { this.URI = ( URI.parse(`${DEBUG_SCHEME}:replinput`)); }
     constructor(options, debugService, instantiationService, storageService, themeService, modelService, contextKeyService, codeEditorService, viewDescriptorService, contextMenuService, configurationService, textResourcePropertiesService, editorService, keybindingService, openerService, telemetryService, menuService, languageFeaturesService, logService) {
@@ -136,7 +138,7 @@ let Repl = class Repl extends FilterViewPane {
         this._register(this.onDidChangeBodyVisibility(visible => {
             if (visible) {
                 if (!this.model) {
-                    this.model = this.modelService.getModel(Repl.URI) || this.modelService.createModel('', null, Repl.URI, true);
+                    this.model = this.modelService.getModel(Repl_1.URI) || this.modelService.createModel('', null, Repl_1.URI, true);
                 }
                 this.setMode();
                 this.replInput.setModel(this.model);
@@ -446,7 +448,7 @@ let Repl = class Repl extends FilterViewPane {
                 }
                 const { total, filtered } = this.getFilterStats();
                 this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( (localize('showing filtered repl lines', "Showing {0} of {1}", filtered, total))));
-            }, Repl.REFRESH_DELAY))
+            }, Repl_1.REFRESH_DELAY))
         );
     }
     render() {
@@ -639,7 +641,7 @@ let Repl = class Repl extends FilterViewPane {
 Repl.__decorator = ( (__decorate([
     memoize
 ], Repl.prototype, "refreshScheduler", null)));
-Repl = ( (__decorate([
+Repl = Repl_1 = ( (__decorate([
     ( (__param(1, IDebugService))),
     ( (__param(2, IInstantiationService))),
     ( (__param(3, IStorageService))),
@@ -660,6 +662,7 @@ Repl = ( (__decorate([
     ( (__param(18, ILogService)))
 ], Repl)));
 let ReplOptions = class ReplOptions extends Disposable {
+    static { ReplOptions_1 = this; }
     static { this.lineHeightEm = 1.4; }
     get replConfiguration() {
         return this._replConfig;
@@ -690,15 +693,15 @@ let ReplOptions = class ReplOptions extends Disposable {
         this._replConfig = {
             fontSize: debugConsole.fontSize,
             fontFamily: debugConsole.fontFamily,
-            lineHeight: debugConsole.lineHeight ? debugConsole.lineHeight : ReplOptions.lineHeightEm * debugConsole.fontSize,
-            cssLineHeight: debugConsole.lineHeight ? `${debugConsole.lineHeight}px` : `${ReplOptions.lineHeightEm}em`,
+            lineHeight: debugConsole.lineHeight ? debugConsole.lineHeight : ReplOptions_1.lineHeightEm * debugConsole.fontSize,
+            cssLineHeight: debugConsole.lineHeight ? `${debugConsole.lineHeight}px` : `${ReplOptions_1.lineHeightEm}em`,
             backgroundColor: this.themeService.getColorTheme().getColor(this.backgroundColorDelegate()),
-            fontSizeForTwistie: debugConsole.fontSize * ReplOptions.lineHeightEm / 2 - 8
+            fontSizeForTwistie: debugConsole.fontSize * ReplOptions_1.lineHeightEm / 2 - 8
         };
         this._onDidChange.fire();
     }
 };
-ReplOptions = ( (__decorate([
+ReplOptions = ReplOptions_1 = ( (__decorate([
     ( (__param(2, IConfigurationService))),
     ( (__param(3, IThemeService))),
     ( (__param(4, IViewDescriptorService)))

package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js

@@ -20,6 +20,7 @@ import { IDebugService } from '../common/debug.js';
 import { Variable } from '../common/debugModel.js';
 import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from '../common/replModel.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
+var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
 const $ = dom.$;
 class ReplEvaluationInputsRenderer {
     static { this.ID = 'replEvaluationInput'; }
@@ -40,13 +41,14 @@ class ReplEvaluationInputsRenderer {
     }
 }
 let ReplGroupRenderer = class ReplGroupRenderer {
+    static { ReplGroupRenderer_1 = this; }
     static { this.ID = 'replGroup'; }
     constructor(linkDetector, themeService) {
         this.linkDetector = linkDetector;
         this.themeService = themeService;
     }
     get templateId() {
-        return ReplGroupRenderer.ID;
+        return ReplGroupRenderer_1.ID;
     }
     renderTemplate(container) {
         const label = dom.append(container, $('.expression'));
@@ -61,7 +63,7 @@ let ReplGroupRenderer = class ReplGroupRenderer {
     disposeTemplate(_templateData) {
     }
 };
-ReplGroupRenderer = ( __decorate([
+ReplGroupRenderer = ReplGroupRenderer_1 = ( __decorate([
     ( __param(1, IThemeService))
 ], ReplGroupRenderer));
 class ReplEvaluationResultsRenderer {
@@ -89,6 +91,7 @@ class ReplEvaluationResultsRenderer {
     }
 }
 let ReplOutputElementRenderer = class ReplOutputElementRenderer {
+    static { ReplOutputElementRenderer_1 = this; }
     static { this.ID = 'outputReplElement'; }
     constructor(linkDetector, editorService, labelService, themeService) {
         this.linkDetector = linkDetector;
@@ -97,7 +100,7 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         this.themeService = themeService;
     }
     get templateId() {
-        return ReplOutputElementRenderer.ID;
+        return ReplOutputElementRenderer_1.ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -151,15 +154,16 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         templateData.elementListener.dispose();
     }
 };
-ReplOutputElementRenderer = ( __decorate([
+ReplOutputElementRenderer = ReplOutputElementRenderer_1 = ( __decorate([
     ( __param(1, IEditorService)),
     ( __param(2, ILabelService)),
     ( __param(3, IThemeService))
 ], ReplOutputElementRenderer));
 let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressionsRenderer {
+    static { ReplVariablesRenderer_1 = this; }
     static { this.ID = 'replVariable'; }
     get templateId() {
-        return ReplVariablesRenderer.ID;
+        return ReplVariablesRenderer_1.ID;
     }
     constructor(linkDetector, debugService, contextViewService) {
         super(debugService, contextViewService);
@@ -185,7 +189,7 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
         return undefined;
     }
 };
-ReplVariablesRenderer = ( __decorate([
+ReplVariablesRenderer = ReplVariablesRenderer_1 = ( __decorate([
     ( __param(1, IDebugService)),
     ( __param(2, IContextViewService))
 ], ReplVariablesRenderer));

package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js

@@ -6,7 +6,6 @@ import { timeout, RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/asyn
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId, registerAction2, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
@@ -31,6 +30,7 @@ import { IDebugService, VARIABLES_VIEW_ID, CONTEXT_VARIABLES_FOCUSED, CONTEXT_DE
 import { getUriForDebugMemory, Variable, Expression, ErrorScope, Scope, StackFrame } from '../common/debugModel.js';
 import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+var VariablesRenderer_1;
 const $ = dom.$;
 let forgetScopes = true;
 let variableInternalContext;
@@ -78,7 +78,7 @@ let VariablesView = class VariablesView extends ViewPane {
                 listBackground: this.getBackgroundColor()
             }
         });
-        this.tree.setInput(withUndefinedAsNull(this.debugService.getViewModel().focusedStackFrame));
+        this.tree.setInput(this.debugService.getViewModel().focusedStackFrame ?? null);
         CONTEXT_VARIABLES_FOCUSED.bindTo(this.tree.contextKeyService);
         this._register(this.debugService.getViewModel().onDidFocusStackFrame(sf => {
             if (!this.isBodyVisible()) {
@@ -295,6 +295,7 @@ class ScopeErrorRenderer {
     }
 }
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
+    static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
     constructor(linkDetector, menuService, contextKeyService, debugService, contextViewService) {
         super(debugService, contextViewService);
@@ -303,7 +304,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         this.contextKeyService = contextKeyService;
     }
     get templateId() {
-        return VariablesRenderer.ID;
+        return VariablesRenderer_1.ID;
     }
     renderExpression(expression, data, highlights) {
         renderVariable(expression, data, true, highlights, this.linkDetector);
@@ -344,7 +345,7 @@ let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRende
         actionBar.push(primary, { icon: true, label: false });
     }
 };
-VariablesRenderer = ( __decorate([
+VariablesRenderer = VariablesRenderer_1 = ( __decorate([
     ( __param(1, IMenuService)),
     ( __param(2, IContextKeyService)),
     ( __param(3, IDebugService)),

package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js

@@ -22,6 +22,7 @@ import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
 import { LinkDetector } from './linkDetector.js';
+var WatchExpressionsRenderer_1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 let ignoreViewUpdates = false;
 let useCachedEvaluation = false;
@@ -209,6 +210,7 @@ class WatchExpressionsDataSource {
     }
 }
 let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
+    static { WatchExpressionsRenderer_1 = this; }
     static { this.ID = 'watchexpression'; }
     constructor(menuService, contextKeyService, debugService, contextViewService) {
         super(debugService, contextViewService);
@@ -216,7 +218,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         this.contextKeyService = contextKeyService;
     }
     get templateId() {
-        return WatchExpressionsRenderer.ID;
+        return WatchExpressionsRenderer_1.ID;
     }
     renderElement(node, index, data) {
         super.renderExpressionElement(node.element, node, data);
@@ -284,7 +286,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         actionBar.push(primary, { icon: true, label: false });
     }
 };
-WatchExpressionsRenderer = ( __decorate([
+WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( __decorate([
     ( __param(0, IMenuService)),
     ( __param(1, IContextKeyService)),
     ( __param(2, IDebugService)),

package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts

@@ -875,4 +875,4 @@ interface IDebugService {
     runTo(uri: URI, lineNumber: number, column?: number): Promise<void>;
 }
 
-export { AdapterEndEvent, DebugConfigurationProviderTriggerKind, DebuggerString, IAdapterDescriptor, IAdapterManager, IBaseBreakpoint, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IBreakpointsChangeEvent, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugAdapterExecutable, IDebugAdapterExecutableOptions, IDebugAdapterFactory, IDebugAdapterImpl, IDebugAdapterInlineImpl, IDebugAdapterNamedPipeServer, IDebugAdapterServer, IDebugConfigurationProvider, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IDebugSessionReplMode, IDebugger, IDebuggerMetadata, IEnablement, IErrorMemoryRange, IEvaluate, IExceptionBreakpoint, IExceptionInfo, IExpression, IExpressionContainer, IFunctionBreakpoint, IInstructionBreakpoint, ILaunch, IMemoryInvalidationEvent, IMemoryRange, IMemoryRegion, INewReplElementData, IRawModelUpdate, IRawStoppedDetails, IReplElement, IReplElementSource, IScope, IStackFrame, IThread, ITreeElement, IUnreadableMemoryRange, IValidMemoryRange, IViewModel, LoadedSourceEvent, MemoryRange, MemoryRangeType, State };
+export { type AdapterEndEvent, DebugConfigurationProviderTriggerKind, DebuggerString, type IAdapterDescriptor, type IAdapterManager, type IBaseBreakpoint, type IBreakpoint, type IBreakpointData, type IBreakpointUpdateData, type IBreakpointsChangeEvent, type ICompound, type IConfig, type IConfigPresentation, type IConfigurationManager, type IDataBreakpoint, type IDataBreakpointInfoResponse, type IDebugAdapter, type IDebugAdapterDescriptorFactory, type IDebugAdapterExecutable, type IDebugAdapterExecutableOptions, type IDebugAdapterFactory, type IDebugAdapterImpl, type IDebugAdapterInlineImpl, type IDebugAdapterNamedPipeServer, type IDebugAdapterServer, type IDebugConfigurationProvider, type IDebugModel, IDebugService, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugger, type IDebuggerMetadata, type IEnablement, type IErrorMemoryRange, type IEvaluate, type IExceptionBreakpoint, type IExceptionInfo, type IExpression, type IExpressionContainer, type IFunctionBreakpoint, type IInstructionBreakpoint, type ILaunch, type IMemoryInvalidationEvent, type IMemoryRange, type IMemoryRegion, type INewReplElementData, type IRawModelUpdate, type IRawStoppedDetails, type IReplElement, type IReplElementSource, type IScope, type IStackFrame, type IThread, type ITreeElement, type IUnreadableMemoryRange, type IValidMemoryRange, type IViewModel, type LoadedSourceEvent, type MemoryRange, MemoryRangeType, State };

package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js

@@ -12,7 +12,9 @@ import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { PLAINTEXT_LANGUAGE_ID } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
 import { ErrorNoTelemetry } from 'monaco-editor/esm/vs/base/common/errors.js';
+var DebugContentProvider_1;
 let DebugContentProvider = class DebugContentProvider {
+    static { DebugContentProvider_1 = this; }
     constructor(textModelResolverService, debugService, modelService, languageService, editorWorkerService) {
         this.debugService = debugService;
         this.modelService = modelService;
@@ -20,7 +22,7 @@ let DebugContentProvider = class DebugContentProvider {
         this.editorWorkerService = editorWorkerService;
         this.pendingUpdates = ( new Map());
         textModelResolverService.registerTextModelContentProvider(DEBUG_SCHEME, this);
-        DebugContentProvider.INSTANCE = this;
+        DebugContentProvider_1.INSTANCE = this;
     }
     dispose() {
         this.pendingUpdates.forEach(cancellationSource => cancellationSource.dispose());
@@ -29,7 +31,7 @@ let DebugContentProvider = class DebugContentProvider {
         return this.createOrUpdateContentModel(resource, true);
     }
     static refreshDebugContent(resource) {
-        DebugContentProvider.INSTANCE?.createOrUpdateContentModel(resource, false);
+        DebugContentProvider_1.INSTANCE?.createOrUpdateContentModel(resource, false);
     }
     createOrUpdateContentModel(resource, createIfNotExists) {
         const model = this.modelService.getModel(resource);
@@ -86,7 +88,7 @@ let DebugContentProvider = class DebugContentProvider {
         }, (err) => createErrModel(err.message));
     }
 };
-DebugContentProvider = ( __decorate([
+DebugContentProvider = DebugContentProvider_1 = ( __decorate([
     ( __param(0, ITextModelService)),
     ( __param(1, IDebugService)),
     ( __param(2, IModelService)),