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

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { PickerQuickAccessProvider, TriggerAction } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
@@ -14,7 +14,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
     constructor(debugService, contextService, commandService, notificationService) {
         super(DEBUG_QUICK_ACCESS_PREFIX, {
             noResultsPick: {
-                label: ( localize('noDebugResults', "No matching launch configurations"))
+                label: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', 'noDebugResults', "No matching launch configurations")
             }
         });
         this.debugService = debugService;
@@ -43,7 +43,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugConfigure),
-                            tooltip: ( localize('customizeLaunchConfig', "Configure Launch Configuration"))
+                            tooltip: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', 'customizeLaunchConfig', "Configure Launch Configuration")
                         }],
                     trigger: () => {
                         config.launch.openConfigFile({ preserveFocus: false });
@@ -64,10 +64,10 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         const dynamicProviders = await configManager.getDynamicProviders();
         if (dynamicProviders.length > 0) {
             picks.push({
-                type: 'separator', label: ( localize({
+                type: 'separator', label: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', {
                     key: 'contributed',
                     comment: ['contributed is lower case because it looks better like that in UI. Nothing preceeds it. It is a name of the grouping of debug configurations.']
-                }, "contributed"))
+                }, "contributed")
             });
         }
         configManager.getRecentDynamicConfigurations().forEach(({ name, type }) => {
@@ -78,7 +78,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugRemoveConfig),
-                            tooltip: ( localize('removeLaunchConfig', "Remove Launch Configuration"))
+                            tooltip: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', 'removeLaunchConfig', "Remove Launch Configuration")
                         }],
                     trigger: () => {
                         configManager.removeRecentDynamicConfigurations(name, type);
@@ -101,11 +101,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         dynamicProviders.forEach(provider => {
             picks.push({
                 label: `$(folder) ${provider.label}...`,
-                ariaLabel: ( localize(
-                    { key: 'providerAriaLabel', comment: ['Placeholder stands for the provider label. For example "NodeJS".'] },
-                    "{0} contributed configurations",
-                    provider.label
-                )),
+                ariaLabel: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', { key: 'providerAriaLabel', comment: ['Placeholder stands for the provider label. For example "NodeJS".'] }, "{0} contributed configurations", provider.label),
                 accept: async () => {
                     const pick = await provider.pick();
                     if (pick) {
@@ -117,12 +113,12 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         });
         const visibleLaunches = configManager.getLaunches().filter(launch => !launch.hidden);
         if (visibleLaunches.length > 0) {
-            picks.push({ type: 'separator', label: ( localize('configure', "configure")) });
+            picks.push({ type: 'separator', label: localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', 'configure', "configure") });
         }
         for (const launch of visibleLaunches) {
             const label = this.contextService.getWorkbenchState() === 3  ?
-                ( localize("addConfigTo", "Add Config ({0})...", launch.name)) :
-                ( localize('addConfiguration', "Add Configuration..."));
+                localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', "addConfigTo", "Add Config ({0})...", launch.name) :
+                localizeWithPath('vs/workbench/contrib/debug/browser/debugQuickAccess', 'addConfiguration', "Add Configuration...");
             picks.push({
                 label,
                 description: this.contextService.getWorkbenchState() === 3  ? launch.name : '',

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

@@ -127,7 +127,10 @@ let DebugService = class DebugService {
             if (numberOfSessions > 0) {
                 const viewContainer = this.viewDescriptorService.getViewContainerByViewId(CALLSTACK_VIEW_ID);
                 if (viewContainer) {
-                    this.activity = this.activityService.showViewContainerActivity(viewContainer.id, { badge: ( new NumberBadge(numberOfSessions, n => n === 1 ? ( nls.localize('1activeSession', "1 active session")) : ( nls.localize('nActiveSessions', "{0} active sessions", n)))) });
+                    this.activity = this.activityService.showViewContainerActivity(viewContainer.id, { badge: ( new NumberBadge(
+                        numberOfSessions,
+                        n => n === 1 ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', '1activeSession', "1 active session") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'nActiveSessions', "{0} active sessions", n)
+                    )) });
                 }
             }
         }));
@@ -255,13 +258,7 @@ let DebugService = class DebugService {
         }
     }
     async startDebugging(launch, configOrName, options, saveBeforeStart = !options?.parentSession) {
-        const message = options && options.noDebug ? ( nls.localize(
-            'runTrust',
-            "Running executes build tasks and program code from your workspace."
-        )) : ( nls.localize(
-            'debugTrust',
-            "Debugging executes build tasks and program code from your workspace."
-        ));
+        const message = options && options.noDebug ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'runTrust', "Running executes build tasks and program code from your workspace.") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugTrust', "Debugging executes build tasks and program code from your workspace.");
         const trust = await this.workspaceTrustRequestService.requestWorkspaceTrust({ message });
         if (!trust) {
             return false;
@@ -289,7 +286,7 @@ let DebugService = class DebugService {
             }
             if (compound) {
                 if (!compound.configurations) {
-                    throw new Error(nls.localize({ key: 'compoundMustHaveConfigurations', comment: ['compound indicates a "compounds" configuration item', '"configurations" is an attribute and should not be localized'] }, "Compound must have \"configurations\" attribute set in order to start multiple configurations."));
+                    throw new Error(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', { key: 'compoundMustHaveConfigurations', comment: ['compound indicates a "compounds" configuration item', '"configurations" is an attribute and should not be localized'] }, "Compound must have \"configurations\" attribute set in order to start multiple configurations."));
                 }
                 if (compound.preLaunchTask) {
                     const taskResult = await this.taskRunner.runTaskAndCheckErrors(launch?.workspace || this.contextService.getWorkspace(), compound.preLaunchTask);
@@ -316,8 +313,8 @@ let DebugService = class DebugService {
                             launchForName = launch;
                         }
                         else {
-                            throw new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name)
-                                : nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.", name));
+                            throw new Error(launchesContainingName.length === 0 ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name)
+                                : nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'multipleConfigurationNamesInWorkspace', "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.", name));
                         }
                     }
                     else if (configData.folder) {
@@ -326,7 +323,7 @@ let DebugService = class DebugService {
                             launchForName = launchesMatchingConfigData[0];
                         }
                         else {
-                            throw new Error(nls.localize('noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name));
+                            throw new Error(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name));
                         }
                     }
                     return this.createSession(launchForName, launchForName.getConfiguration(name), options);
@@ -336,15 +333,8 @@ let DebugService = class DebugService {
                 return result;
             }
             if (configOrName && !config) {
-                const message = !!launch ? ( nls.localize(
-                    'configMissing',
-                    "Configuration '{0}' is missing in 'launch.json'.",
-                    typeof configOrName === 'string' ? configOrName : configOrName.name
-                )) :
-                    ( nls.localize(
-                        'launchJsonDoesNotExist',
-                        "'launch.json' does not exist for passed workspace folder."
-                    ));
+                const message = !!launch ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : configOrName.name) :
+                    nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'launchJsonDoesNotExist', "'launch.json' does not exist for passed workspace folder.");
                 throw new Error(message);
             }
             const result = await this.createSession(launch, config, options);
@@ -416,35 +406,21 @@ let DebugService = class DebugService {
                 if (!dbg || (configByProviders.request !== 'attach' && configByProviders.request !== 'launch')) {
                     let message;
                     if (configByProviders.request !== 'attach' && configByProviders.request !== 'launch') {
-                        message = configByProviders.request ? ( nls.localize(
-                            'debugRequestNotSupported',
-                            "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.",
-                            'request',
-                            configByProviders.request
-                        ))
-                            : ( nls.localize(
-                            'debugRequesMissing',
-                            "Attribute '{0}' is missing from the chosen debug configuration.",
-                            'request'
-                        ));
+                        message = configByProviders.request ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugRequestNotSupported', "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.", 'request', configByProviders.request)
+                            : nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugRequesMissing', "Attribute '{0}' is missing from the chosen debug configuration.", 'request');
                     }
                     else {
-                        message = resolvedConfig.type ? ( nls.localize(
-                            'debugTypeNotSupported',
-                            "Configured debug type '{0}' is not supported.",
-                            resolvedConfig.type
-                        )) :
-                            ( nls.localize(
-                                'debugTypeMissing',
-                                "Missing property 'type' for the chosen launch configuration."
-                            ));
+                        message = resolvedConfig.type ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugTypeNotSupported', "Configured debug type '{0}' is not supported.", resolvedConfig.type) :
+                            nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugTypeMissing', "Missing property 'type' for the chosen launch configuration.");
                     }
                     const actionList = [];
-                    actionList.push(( new Action('installAdditionalDebuggers', ( nls.localize(
-                        { key: 'installAdditionalDebuggers', comment: ['Placeholder is the debug type, so for example "node", "python"'] },
-                        "Install {0} Extension",
-                        resolvedConfig.type
-                    )), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type))));
+                    actionList.push(( new Action(
+                        'installAdditionalDebuggers',
+                        nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', { key: 'installAdditionalDebuggers', comment: ['Placeholder is the debug type, so for example "node", "python"'] }, "Install {0} Extension", resolvedConfig.type),
+                        undefined,
+                        true,
+                        async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)
+                    )));
                     await this.showError(message, actionList);
                     return false;
                 }
@@ -464,10 +440,7 @@ let DebugService = class DebugService {
                     await this.showError(err.message);
                 }
                 else if (this.contextService.getWorkbenchState() === 1 ) {
-                    await this.showError(( nls.localize(
-                        'noFolderWorkspaceDebugError',
-                        "The active file can not be debugged. Make sure it is saved and that you have a debug extension installed for that file type."
-                    )));
+                    await this.showError(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'noFolderWorkspaceDebugError', "The active file can not be debugged. Make sure it is saved and that you have a debug extension installed for that file type."));
                 }
                 if (launch && !initCancellationToken.token.isCancellationRequested) {
                     await launch.openConfigFile({ preserveFocus: true }, initCancellationToken.token);
@@ -483,11 +456,7 @@ let DebugService = class DebugService {
     async doCreateSession(sessionId, root, configuration, options) {
         const session = this.instantiationService.createInstance(DebugSession, sessionId, configuration, root, this.model, options);
         if (options?.startedByUser && ( this.model.getSessions().some(s => s.getLabel() === session.getLabel())) && configuration.resolved.suppressMultipleSessionWarning !== true) {
-            const result = await this.dialogService.confirm({ message: ( nls.localize(
-                'multipleSession',
-                "'{0}' is already running. Do you want to start another instance?",
-                session.getLabel()
-            )) });
+            const result = await this.dialogService.confirm({ message: nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'multipleSession', "'{0}' is already running. Do you want to start another instance?", session.getLabel()) });
             if (!result.confirmed) {
                 return false;
             }
@@ -567,11 +536,7 @@ let DebugService = class DebugService {
         this.disposables.add(session.onDidEndAdapter(async (adapterExitEvent) => {
             if (adapterExitEvent) {
                 if (adapterExitEvent.error) {
-                    this.notificationService.error(( nls.localize(
-                        'debugAdapterCrash',
-                        "Debug adapter process has terminated unexpectedly ({0})",
-                        adapterExitEvent.error.message || ( adapterExitEvent.error.toString())
-                    )));
+                    this.notificationService.error(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'debugAdapterCrash', "Debug adapter process has terminated unexpectedly ({0})", adapterExitEvent.error.message || ( adapterExitEvent.error.toString())));
                 }
                 this.telemetry.logDebugSessionStop(session, adapterExitEvent);
             }
@@ -773,14 +738,7 @@ let DebugService = class DebugService {
                         const lineNumber = stackFrame.range.startLineNumber;
                         if (lineNumber >= 1 && lineNumber <= model.getLineCount()) {
                             const lineContent = control.getModel().getLineContent(lineNumber);
-                            aria.alert(( nls.localize(
-                                { key: 'debuggingPaused', comment: ['First placeholder is the file line content, second placeholder is the reason why debugging is stopped, for example "breakpoint", third is the stack frame name, and last is the line number.'] },
-                                "{0}, debugging paused {1}, {2}:{3}",
-                                lineContent,
-                                thread && thread.stoppedDetails ? `, reason ${thread.stoppedDetails.reason}` : '',
-                                stackFrame.source ? stackFrame.source.name : '',
-                                stackFrame.range.startLineNumber
-                            )));
+                            aria.alert(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', { key: 'debuggingPaused', comment: ['First placeholder is the file line content, second placeholder is the reason why debugging is stopped, for example "breakpoint", third is the stack frame name, and last is the line number.'] }, "{0}, debugging paused {1}, {2}:{3}", lineContent, thread && thread.stoppedDetails ? `, reason ${thread.stoppedDetails.reason}` : '', stackFrame.source ? stackFrame.source.name : '', stackFrame.range.startLineNumber));
                         }
                     }
                 }
@@ -846,12 +804,7 @@ let DebugService = class DebugService {
     async addBreakpoints(uri, rawBreakpoints, ariaAnnounce = true) {
         const breakpoints = this.model.addBreakpoints(uri, rawBreakpoints);
         if (ariaAnnounce) {
-            breakpoints.forEach(bp => aria.status(( nls.localize(
-                'breakpointAdded',
-                "Added breakpoint, line {0}, file {1}",
-                bp.lineNumber,
-                uri.fsPath
-            ))));
+            breakpoints.forEach(bp => aria.status(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'breakpointAdded', "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath)));
         }
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendBreakpoints(uri);
@@ -871,12 +824,7 @@ let DebugService = class DebugService {
     }
     async removeBreakpoints(id) {
         const toRemove = this.model.getBreakpoints().filter(bp => !id || bp.getId() === id);
-        toRemove.forEach(bp => aria.status(( nls.localize(
-            'breakpointRemoved',
-            "Removed breakpoint, line {0}, file {1}",
-            bp.lineNumber,
-            bp.uri.fsPath
-        ))));
+        toRemove.forEach(bp => aria.status(nls.localizeWithPath('vs/workbench/contrib/debug/browser/debugService', 'breakpointRemoved', "Removed breakpoint, line {0}, file {1}", bp.lineNumber, bp.uri.fsPath)));
         const urisToClear = ( distinct(toRemove, bp => ( bp.originalUri.toString())).map(bp => bp.originalUri));
         this.model.removeBreakpoints(toRemove);
         this.debugStorage.storeBreakpoints(this.model);