@codingame/monaco-vscode-debug-service-override 1.83.2 → 1.83.3

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

@@ -18,7 +18,7 @@ import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeS
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { watchExpressionsAdd, watchExpressionsRemoveAll } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { MenuId, registerAction2, Action2, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } 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';
@@ -247,7 +247,7 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         if (settingValue) {
             return {
                 initialValue: expression.value,
-                ariaLabel: ( localize('typeNewValue', "Type new value")),
+                ariaLabel: localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'typeNewValue', "Type new value"),
                 onFinish: async (value, success) => {
                     if (success && value) {
                         const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -261,8 +261,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         }
         return {
             initialValue: expression.name ? expression.name : '',
-            ariaLabel: ( localize('watchExpressionInputAriaLabel', "Type watch expression")),
-            placeholder: ( localize('watchExpressionPlaceholder', "Expression to watch")),
+            ariaLabel: localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'watchExpressionInputAriaLabel', "Type watch expression"),
+            placeholder: localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'watchExpressionPlaceholder', "Expression to watch"),
             onFinish: (value, success) => {
                 if (success && value) {
                     this.debugService.renameWatchExpression(expression.getId(), value);
@@ -301,16 +301,13 @@ function getContextForWatchExpressionMenu(parentContext, expression) {
 }
 class WatchExpressionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(
-            { comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' },
-            "Debug Watch Expressions"
-        ));
+        return localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', { comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' }, "Debug Watch Expressions");
     }
     getAriaLabel(element) {
         if (element instanceof Expression) {
-            return ( localize('watchExpressionAriaLabel', "{0}, value {1}", element.name, element.value));
+            return localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'watchExpressionAriaLabel', "{0}, value {1}", element.name, element.value);
         }
-        return ( localize('watchVariableAriaLabel', "{0}, value {1}", element.name, element.value));
+        return localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'watchVariableAriaLabel', "{0}, value {1}", element.name, element.value);
     }
 }
 class WatchExpressionsDragAndDrop {
@@ -352,7 +349,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'watch.collapse',
             viewId: WATCH_VIEW_ID,
-            title: ( localize('collapse', "Collapse All")),
+            title: localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'collapse', "Collapse All"),
             f1: false,
             icon: Codicon.collapseAll,
             precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
@@ -369,7 +366,7 @@ registerAction2(class Collapse extends ViewAction {
     }
 });
 const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
-const ADD_WATCH_LABEL = ( localize('addWatchExpression', "Add Expression"));
+const ADD_WATCH_LABEL = localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'addWatchExpression', "Add Expression");
 registerAction2(class AddWatchExpressionAction extends Action2 {
     constructor() {
         super({
@@ -390,7 +387,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
     }
 });
 const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localize('removeAllWatchExpressions', "Remove All Expressions"));
+const REMOVE_WATCH_EXPRESSIONS_LABEL = localizeWithPath('vs/workbench/contrib/debug/browser/watchExpressionsView', 'removeAllWatchExpressions', "Remove All Expressions");
 registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
     constructor() {
         super({

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

@@ -3,26 +3,30 @@ 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, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { RawContextKey, ContextKeyExpr, 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 { 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 { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContentGroups, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 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 } from './debugCommands.js';
+import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_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 = ( localize('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;
@@ -83,6 +87,57 @@ 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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { getMimeTypes } from 'monaco-editor/esm/vs/editor/common/services/languagesAssociations.js';
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
@@ -48,19 +48,16 @@ let DebugContentProvider = class DebugContentProvider {
             session = this.debugService.getViewModel().focusedSession;
         }
         if (!session) {
-            return Promise.reject(( new ErrorNoTelemetry(( localize('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
-                ? ( localize(
-                'canNotResolveSourceWithError',
-                "Could not load source '{0}': {1}.",
-                resource.path,
-                errMsg
-            ))
-                : ( localize('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,24 +27,15 @@ let DebugLifecycle = class DebugLifecycle {
     async showWindowCloseConfirmation(numSessions) {
         let message;
         if (numSessions === 1) {
-            message = ( nls.localize(
-                '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.localize(
-                '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.localize(
-                { 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,7 +153,22 @@ class ExpressionContainer {
                         idDuplicationIndex
                     ));
                 }
-                return ( new Variable(this.session, this.threadId, this, 0, '', undefined, ( nls.localize('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())));
@@ -193,7 +208,7 @@ class ExpressionContainer {
     }
     async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false) {
         if (!session || (!stackFrame && context !== 'repl')) {
-            this.value = context === 'repl' ? ( nls.localize('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;
         }
@@ -232,7 +247,7 @@ function handleSetResponse(expression, response) {
     }
 }
 class Expression extends ExpressionContainer {
-    static { this.DEFAULT_VALUE = ( nls.localize('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;
@@ -450,13 +465,9 @@ class Thread {
     get stateLabel() {
         if (this.stoppedDetails) {
             return this.stoppedDetails.description ||
-                (this.stoppedDetails.reason ? ( nls.localize(
-                { key: 'pausedOn', comment: ['indicates reason for program being paused'] },
-                "Paused on {0}",
-                this.stoppedDetails.reason
-            )) : ( nls.localize('paused', "Paused")));
+                (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.localize({ key: 'running', comment: ['indicates state'] }, "Running"));
+        return nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', { key: 'running', comment: ['indicates state'] }, "Running");
     }
     async fetchCallStack(levels = 20) {
         if (this.stopped) {
@@ -728,10 +739,7 @@ class Breakpoint extends BaseBreakpoint {
     }
     get message() {
         if (this.textFileService.isDirty(this.uri)) {
-            return ( nls.localize(
-                '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;
     }