@codingame/monaco-vscode-debug-service-override 7.1.0 → 8.0.0

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
@@ -11,12 +11,11 @@ import { DEBUG_QUICK_ACCESS_PREFIX, ADD_CONFIGURATION_ID } from 'vscode/vscode/v
 import { debugConfigure, debugRemoveConfig } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugQuickAccess";
 let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends PickerQuickAccessProvider {
     constructor(debugService, contextService, commandService, notificationService) {
         super(DEBUG_QUICK_ACCESS_PREFIX, {
             noResultsPick: {
-                label: ( localizeWithPath(_moduleId, 0, "No matching launch configurations"))
+                label: ( localize(5994, "No matching launch configurations"))
             }
         });
         this.debugService = debugService;
@@ -45,7 +44,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugConfigure),
-                            tooltip: ( localizeWithPath(_moduleId, 1, "Configure Launch Configuration"))
+                            tooltip: ( localize(5995, "Configure Launch Configuration"))
                         }],
                     trigger: () => {
                         config.launch.openConfigFile({ preserveFocus: false });
@@ -66,7 +65,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         const dynamicProviders = await configManager.getDynamicProviders();
         if (dynamicProviders.length > 0) {
             picks.push({
-                type: 'separator', label: ( localizeWithPath(_moduleId, 2, "contributed"))
+                type: 'separator', label: ( localize(5996, "contributed"))
             });
         }
         configManager.getRecentDynamicConfigurations().forEach(({ name, type }) => {
@@ -77,7 +76,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugRemoveConfig),
-                            tooltip: ( localizeWithPath(_moduleId, 3, "Remove Launch Configuration"))
+                            tooltip: ( localize(5997, "Remove Launch Configuration"))
                         }],
                     trigger: () => {
                         configManager.removeRecentDynamicConfigurations(name, type);
@@ -100,7 +99,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         dynamicProviders.forEach(provider => {
             picks.push({
                 label: `$(folder) ${provider.label}...`,
-                ariaLabel: ( localizeWithPath(_moduleId, 4, "{0} contributed configurations", provider.label)),
+                ariaLabel: ( localize(5998, "{0} contributed configurations", provider.label)),
                 accept: async () => {
                     const pick = await provider.pick();
                     if (pick) {
@@ -112,12 +111,12 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
         });
         const visibleLaunches = configManager.getLaunches().filter(launch => !launch.hidden);
         if (visibleLaunches.length > 0) {
-            picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 5, "configure")) });
+            picks.push({ type: 'separator', label: ( localize(5999, "configure")) });
         }
         for (const launch of visibleLaunches) {
             const label = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ?
-                ( localizeWithPath(_moduleId, 6, "Add Config ({0})...", launch.name)) :
-                ( localizeWithPath(_moduleId, 7, "Add Configuration..."));
+                ( localize(6000, "Add Config ({0})...", launch.name)) :
+                ( localize(6001, "Add Configuration..."));
             picks.push({
                 label,
                 description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? launch.name : '',

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

@@ -13,7 +13,7 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -58,7 +58,6 @@ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugService";
 let DebugService = class DebugService {
     constructor(editorService, paneCompositeService, viewsService, viewDescriptorService, notificationService, dialogService, layoutService, contextService, contextKeyService, lifecycleService, instantiationService, extensionService, fileService, configurationService, extensionHostDebugService, activityService, commandService, quickInputService, workspaceTrustRequestService, uriIdentityService, testService) {
         this.editorService = editorService;
@@ -139,7 +138,7 @@ 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 ? ( localizeWithPath(_moduleId, 0, "1 active session")) : ( localizeWithPath(_moduleId, 1, "{0} active sessions", n))))) });
+                    this.activity = this.activityService.showViewContainerActivity(viewContainer.id, { badge: ( (new NumberBadge(numberOfSessions, n => n === 1 ? ( localize(2076, "1 active session")) : ( localize(2077, "{0} active sessions", n))))) });
                 }
             }
         }));
@@ -161,7 +160,7 @@ let DebugService = class DebugService {
             }
         }));
         this.disposables.add(extensionService.onWillStop(evt => {
-            evt.veto(this.model.getSessions().length > 0, ( localizeWithPath(_moduleId, 2, 'A debug session is still running.')));
+            evt.veto(this.model.getSessions().length > 0, ( localize(2078, 'A debug session is still running.')));
         }));
         this.initContextKeys(contextKeyService);
     }
@@ -270,13 +269,8 @@ let DebugService = class DebugService {
         }
     }
     async startDebugging(launch, configOrName, options, saveBeforeStart = !options?.parentSession) {
-        const message = options && options.noDebug ? ( localizeWithPath(
-            _moduleId,
-            3,
-            "Running executes build tasks and program code from your workspace."
-        )) : ( localizeWithPath(
-            _moduleId,
-            4,
+        const message = options && options.noDebug ? ( localize(2079, "Running executes build tasks and program code from your workspace.")) : ( localize(
+            2080,
             "Debugging executes build tasks and program code from your workspace."
         ));
         const trust = await this.workspaceTrustRequestService.requestWorkspaceTrust({ message });
@@ -306,9 +300,8 @@ let DebugService = class DebugService {
             }
             if (compound) {
                 if (!compound.configurations) {
-                    throw ( (new Error(localizeWithPath(
-                        _moduleId,
-                        5,
+                    throw ( (new Error(localize(
+                        2081,
                         "Compound must have \"configurations\" attribute set in order to start multiple configurations."
                     ))));
                 }
@@ -337,18 +330,14 @@ let DebugService = class DebugService {
                             launchForName = launch;
                         }
                         else {
-                            throw ( (new Error(launchesContainingName.length === 0 ? localizeWithPath(
-                                _moduleId,
-                                6,
-                                "Could not find launch configuration '{0}' in the workspace.",
-                                name
-                            )
-                                : localizeWithPath(
-                                _moduleId,
-                                7,
-                                "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.",
-                                name
-                            ))));
+                            throw ( (new Error(
+                                launchesContainingName.length === 0 ? localize(2082, "Could not find launch configuration '{0}' in the workspace.", name)
+                                    : localize(
+                                    2083,
+                                    "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.",
+                                    name
+                                )
+                            )));
                         }
                     }
                     else if (configData.folder) {
@@ -357,9 +346,8 @@ let DebugService = class DebugService {
                             launchForName = launchesMatchingConfigData[0];
                         }
                         else {
-                            throw ( (new Error(localizeWithPath(
-                                _moduleId,
-                                8,
+                            throw ( (new Error(localize(
+                                2084,
                                 "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.",
                                 configData.folder,
                                 configData.name,
@@ -374,13 +362,12 @@ let DebugService = class DebugService {
                 return result;
             }
             if (configOrName && !config) {
-                const message = !!launch ? ( localizeWithPath(
-                    _moduleId,
-                    9,
+                const message = !!launch ? ( localize(
+                    2085,
                     "Configuration '{0}' is missing in 'launch.json'.",
                     typeof configOrName === 'string' ? configOrName : configOrName.name
                 )) :
-                    ( localizeWithPath(_moduleId, 10, "'launch.json' does not exist for passed workspace folder."));
+                    ( localize(2086, "'launch.json' does not exist for passed workspace folder."));
                 throw ( (new Error(message)));
             }
             const result = await this.createSession(launch, config, options);
@@ -452,35 +439,24 @@ let DebugService = class DebugService {
                 if (!dbg || (configByProviders.request !== 'attach' && configByProviders.request !== 'launch')) {
                     let message;
                     if (configByProviders.request !== 'attach' && configByProviders.request !== 'launch') {
-                        message = configByProviders.request ? ( localizeWithPath(
-                            _moduleId,
-                            11,
+                        message = configByProviders.request ? ( localize(
+                            2087,
                             "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.",
                             'request',
                             configByProviders.request
                         ))
-                            : ( localizeWithPath(
-                            _moduleId,
-                            12,
+                            : ( localize(
+                            2088,
                             "Attribute '{0}' is missing from the chosen debug configuration.",
                             'request'
                         ));
                     }
                     else {
-                        message = resolvedConfig.type ? ( localizeWithPath(
-                            _moduleId,
-                            13,
-                            "Configured debug type '{0}' is not supported.",
-                            resolvedConfig.type
-                        )) :
-                            ( localizeWithPath(
-                                _moduleId,
-                                14,
-                                "Missing property 'type' for the chosen launch configuration."
-                            ));
+                        message = resolvedConfig.type ? ( localize(2089, "Configured debug type '{0}' is not supported.", resolvedConfig.type)) :
+                            ( localize(2090, "Missing property 'type' for the chosen launch configuration."));
                     }
                     const actionList = [];
-                    actionList.push(( (new Action('installAdditionalDebuggers', ( localizeWithPath(_moduleId, 15, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
+                    actionList.push(( (new Action('installAdditionalDebuggers', ( localize(2091, "Install {0} Extension", resolvedConfig.type)), undefined, true, async () => this.commandService.executeCommand('debug.installAdditionalDebuggers', resolvedConfig?.type)))));
                     await this.showError(message, actionList);
                     return false;
                 }
@@ -500,9 +476,8 @@ let DebugService = class DebugService {
                     await this.showError(err.message);
                 }
                 else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-                    await this.showError(( localizeWithPath(
-                        _moduleId,
-                        16,
+                    await this.showError(( localize(
+                        2092,
                         "The active file can not be debugged. Make sure it is saved and that you have a debug extension installed for that file type."
                     )));
                 }
@@ -520,9 +495,8 @@ 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: ( localizeWithPath(
-                _moduleId,
-                17,
+            const result = await this.dialogService.confirm({ message: ( localize(
+                2093,
                 "'{0}' is already running. Do you want to start another instance?",
                 session.getLabel()
             )) });
@@ -612,9 +586,8 @@ let DebugService = class DebugService {
         listenerDisposables.add(session.onDidEndAdapter(async (adapterExitEvent) => {
             if (adapterExitEvent) {
                 if (adapterExitEvent.error) {
-                    this.notificationService.error(( localizeWithPath(
-                        _moduleId,
-                        18,
+                    this.notificationService.error(( localize(
+                        2094,
                         "Debug adapter process has terminated unexpectedly ({0})",
                         adapterExitEvent.error.message || ( (adapterExitEvent.error.toString()))
                     )));
@@ -856,9 +829,8 @@ let DebugService = class DebugService {
                         const lineNumber = stackFrame.range.startLineNumber;
                         if (lineNumber >= 1 && lineNumber <= model.getLineCount()) {
                             const lineContent = control.getModel().getLineContent(lineNumber);
-                            alert(( localizeWithPath(
-                                _moduleId,
-                                19,
+                            alert(( localize(
+                                2095,
                                 "{0}, debugging paused {1}, {2}:{3}",
                                 lineContent,
                                 thread && thread.stoppedDetails ? `, reason ${thread.stoppedDetails.reason}` : '',
@@ -931,13 +903,7 @@ let DebugService = class DebugService {
     async addBreakpoints(uri, rawBreakpoints, ariaAnnounce = true) {
         const breakpoints = this.model.addBreakpoints(uri, rawBreakpoints);
         if (ariaAnnounce) {
-            breakpoints.forEach(bp => status(( localizeWithPath(
-                _moduleId,
-                20,
-                "Added breakpoint, line {0}, file {1}",
-                bp.lineNumber,
-                uri.fsPath
-            ))));
+            breakpoints.forEach(bp => status(( localize(2096, "Added breakpoint, line {0}, file {1}", bp.lineNumber, uri.fsPath))));
         }
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendBreakpoints(uri);
@@ -958,9 +924,8 @@ let DebugService = class DebugService {
     async removeBreakpoints(id) {
         const breakpoints = this.model.getBreakpoints();
         const toRemove = breakpoints.filter(bp => !id || bp.getId() === id);
-        toRemove.forEach(bp => status(( localizeWithPath(
-            _moduleId,
-            21,
+        toRemove.forEach(bp => status(( localize(
+            2097,
             "Removed breakpoint, line {0}, file {1}",
             bp.lineNumber,
             bp.uri.fsPath