@codingame/monaco-vscode-debug-service-override 1.83.4 → 1.83.6

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

@@ -3,30 +3,26 @@ import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeS
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Extensions, ViewContentGroups, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
-import { isMacintosh, isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from './debugCommands.js';
+import { DEBUG_START_COMMAND_ID } from './debugCommands.js';
 
 const debugStartLanguageKey = 'debugStartLanguage';
 const CONTEXT_DEBUG_START_LANGUAGE = ( new RawContextKey(debugStartLanguageKey, undefined));
 const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( new RawContextKey('debuggerInterestedInActiveEditor', false));
 let WelcomeView = class WelcomeView extends ViewPane {
     static { this.ID = 'workbench.debug.welcome'; }
-    static { this.LABEL = localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', 'run', "Run"); }
+    static { this.LABEL = ( localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', 'run', "Run")); }
     constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.debugService = debugService;
@@ -87,57 +83,6 @@ WelcomeView = ( __decorate([
     ( __param(11, IStorageService)),
     ( __param(12, ITelemetryService))
 ], WelcomeView));
-const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
-        key: 'openAFileWhichCanBeDebugged',
-        comment: [
-            'Please do not translate the word "command", it is part of our internal syntax which must not change',
-            '{Locked="](command:{0})"}'
-        ]
-    }, "[Open a file](command:{0}) which can be debugged or run.", (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID),
-    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.toNegated()))),
-    group: ViewContentGroups.Open,
-}));
 let debugKeybindingLabel = '';
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', 'runAndDebugAction', "Run and Debug")}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
-    when: CONTEXT_DEBUGGERS_AVAILABLE,
-    group: ViewContentGroups.Debug,
-    order: 1
-}));
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: `[${localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', 'detectThenRunAndDebug', "Show all automatic debug configurations")}](command:${SELECT_AND_START_ID}).`,
-    when: CONTEXT_DEBUGGERS_AVAILABLE,
-    group: ViewContentGroups.Debug,
-    order: 10
-}));
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
-        key: 'customizeRunAndDebug',
-        comment: [
-            'Please do not translate the word "command", it is part of our internal syntax which must not change',
-            '{Locked="](command:{0})"}'
-        ]
-    }, "To customize Run and Debug [create a launch.json file](command:{0}).", DEBUG_CONFIGURE_COMMAND_ID),
-    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.notEqualsTo('empty')))),
-    group: ViewContentGroups.Debug
-}));
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
-        key: 'customizeRunAndDebugOpenFolder',
-        comment: [
-            'Please do not translate the word "commmand", it is part of our internal syntax which must not change',
-            '{Locked="](command:{0})"}'
-        ]
-    }, "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.", (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID),
-    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.isEqualTo('empty')))),
-    group: ViewContentGroups.Debug
-}));
-( viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
-    content: localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', 'allDebuggersDisabled', "All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."),
-    when: ( CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated()),
-    group: ViewContentGroups.Debug
-}));
 
 export { WelcomeView };

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

@@ -48,16 +48,29 @@ let DebugContentProvider = class DebugContentProvider {
             session = this.debugService.getViewModel().focusedSession;
         }
         if (!session) {
-            return Promise.reject(( new ErrorNoTelemetry(
-                localizeWithPath('vs/workbench/contrib/debug/common/debugContentProvider', 'unable', "Unable to resolve the resource without a debug session")
-            )));
+            return Promise.reject(( new ErrorNoTelemetry(( localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugContentProvider',
+                'unable',
+                "Unable to resolve the resource without a debug session"
+            )))));
         }
         const createErrModel = (errMsg) => {
             this.debugService.sourceIsNotAvailable(resource);
             const languageSelection = this.languageService.createById(PLAINTEXT_LANGUAGE_ID);
             const message = errMsg
-                ? localizeWithPath('vs/workbench/contrib/debug/common/debugContentProvider', 'canNotResolveSourceWithError', "Could not load source '{0}': {1}.", resource.path, errMsg)
-                : localizeWithPath('vs/workbench/contrib/debug/common/debugContentProvider', 'canNotResolveSource', "Could not load source '{0}'.", resource.path);
+                ? ( localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugContentProvider',
+                'canNotResolveSourceWithError',
+                "Could not load source '{0}': {1}.",
+                resource.path,
+                errMsg
+            ))
+                : ( localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugContentProvider',
+                'canNotResolveSource',
+                "Could not load source '{0}'.",
+                resource.path
+            ));
             return this.modelService.createModel(message, languageSelection, resource);
         };
         return session.loadSource(resource).then(response => {

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

@@ -27,15 +27,27 @@ let DebugLifecycle = class DebugLifecycle {
     async showWindowCloseConfirmation(numSessions) {
         let message;
         if (numSessions === 1) {
-            message = nls.localizeWithPath('vs/workbench/contrib/debug/common/debugLifecycle', 'debug.debugSessionCloseConfirmationSingular', "There is an active debug session, are you sure you want to stop it?");
+            message = ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugLifecycle',
+                'debug.debugSessionCloseConfirmationSingular',
+                "There is an active debug session, are you sure you want to stop it?"
+            ));
         }
         else {
-            message = nls.localizeWithPath('vs/workbench/contrib/debug/common/debugLifecycle', 'debug.debugSessionCloseConfirmationPlural', "There are active debug sessions, are you sure you want to stop them?");
+            message = ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugLifecycle',
+                'debug.debugSessionCloseConfirmationPlural',
+                "There are active debug sessions, are you sure you want to stop them?"
+            ));
         }
         const res = await this.dialogService.confirm({
             message,
             type: 'warning',
-            primaryButton: nls.localizeWithPath('vs/workbench/contrib/debug/common/debugLifecycle', { key: 'debug.stop', comment: ['&& denotes a mnemonic'] }, "&&Stop Debugging")
+            primaryButton: ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugLifecycle',
+                { key: 'debug.stop', comment: ['&& denotes a mnemonic'] },
+                "&&Stop Debugging"
+            ))
         });
         return !res.confirmed;
     }

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

@@ -153,22 +153,11 @@ class ExpressionContainer {
                         idDuplicationIndex
                     ));
                 }
-                return ( new Variable(
-                    this.session,
-                    this.threadId,
-                    this,
-                    0,
-                    '',
-                    undefined,
-                    nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'invalidVariableAttributes', "Invalid variable attributes"),
-                    0,
-                    0,
-                    undefined,
-                    { kind: 'virtual' },
-                    undefined,
-                    undefined,
-                    false
-                ));
+                return ( new Variable(this.session, this.threadId, this, 0, '', undefined, ( nls.localizeWithPath(
+                    'vs/workbench/contrib/debug/common/debugModel',
+                    'invalidVariableAttributes',
+                    "Invalid variable attributes"
+                )), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false));
             }));
             if (this.session.autoExpandLazyVariables) {
                 await Promise.all(( vars.map(v => v.presentationHint?.lazy && v.evaluateLazy())));
@@ -208,7 +197,11 @@ class ExpressionContainer {
     }
     async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false) {
         if (!session || (!stackFrame && context !== 'repl')) {
-            this.value = context === 'repl' ? nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'startDebugFirst', "Please start a debug session to evaluate expressions") : Expression.DEFAULT_VALUE;
+            this.value = context === 'repl' ? ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugModel',
+                'startDebugFirst',
+                "Please start a debug session to evaluate expressions"
+            )) : Expression.DEFAULT_VALUE;
             this.reference = 0;
             return false;
         }
@@ -247,7 +240,11 @@ function handleSetResponse(expression, response) {
     }
 }
 class Expression extends ExpressionContainer {
-    static { this.DEFAULT_VALUE = nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'notAvailable', "not available"); }
+    static { this.DEFAULT_VALUE = ( nls.localizeWithPath(
+        'vs/workbench/contrib/debug/common/debugModel',
+        'notAvailable',
+        "not available"
+    )); }
     constructor(name, id = generateUuid()) {
         super(undefined, undefined, 0, id);
         this.name = name;
@@ -465,9 +462,18 @@ class Thread {
     get stateLabel() {
         if (this.stoppedDetails) {
             return this.stoppedDetails.description ||
-                (this.stoppedDetails.reason ? nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', { key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'paused', "Paused"));
-        }
-        return nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', { key: 'running', comment: ['indicates state'] }, "Running");
+                (this.stoppedDetails.reason ? ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugModel',
+                { key: 'pausedOn', comment: ['indicates reason for program being paused'] },
+                "Paused on {0}",
+                this.stoppedDetails.reason
+            )) : ( nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'paused', "Paused")));
+        }
+        return ( nls.localizeWithPath(
+            'vs/workbench/contrib/debug/common/debugModel',
+            { key: 'running', comment: ['indicates state'] },
+            "Running"
+        ));
     }
     async fetchCallStack(levels = 20) {
         if (this.stopped) {
@@ -739,7 +745,11 @@ class Breakpoint extends BaseBreakpoint {
     }
     get message() {
         if (this.textFileService.isDirty(this.uri)) {
-            return nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.");
+            return ( nls.localizeWithPath(
+                'vs/workbench/contrib/debug/common/debugModel',
+                'breakpointDirtydHover',
+                "Unverified breakpoint. File is modified, please restart debug session."
+            ));
         }
         return super.message;
     }