@codingame/monaco-vscode-debug-service-override 9.0.2 → 10.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +160 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +22 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +133 -136
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +12 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +12 -13
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +23 -26
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +35 -36
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +21 -28
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +29 -42
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.js +10 -10
- package/vscode/src/vs/workbench/contrib/debug/browser/debugProgress.js +1 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +11 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +55 -67
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +58 -58
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSettingMigration.js +3 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +5 -7
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +35 -42
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.js +1 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +17 -21
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +8 -8
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +13 -15
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +8 -9
- package/vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js +3 -5
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +12 -13
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +5 -5
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +66 -71
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.js +12 -14
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.js +4 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/replFilter.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +40 -45
- package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.js +20 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +5 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +39 -48
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +34 -35
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +9 -10
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +44 -44
- package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js +24 -24
- package/vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.js +5 -4
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +11 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugANSIHandling.js +0 -347
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
2
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
3
|
-
import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
4
3
|
import { $ as $$1, append, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
|
|
5
4
|
import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
|
|
6
5
|
import { SelectBox } from 'vscode/vscode/vs/base/browser/ui/selectBox/selectBox';
|
|
7
6
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
8
7
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
9
|
-
import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
10
8
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
11
9
|
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
12
10
|
import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
|
|
@@ -21,7 +19,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
|
|
|
21
19
|
import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
22
20
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
23
21
|
import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
|
|
24
|
-
import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
25
22
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
26
23
|
import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
27
24
|
import { ADD_CONFIGURATION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
|
|
@@ -31,8 +28,6 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
|
|
|
31
28
|
import { defaultSelectBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
|
|
32
29
|
import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
33
30
|
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
34
|
-
import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
35
|
-
import { AccessibilityCommandId } from 'vscode/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
|
|
36
31
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
37
32
|
|
|
38
33
|
var StartDebugActionViewItem_1;
|
|
@@ -59,7 +54,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
59
54
|
-1,
|
|
60
55
|
contextViewService,
|
|
61
56
|
defaultSelectBoxStyles,
|
|
62
|
-
{ ariaLabel: ( localize(
|
|
57
|
+
{ ariaLabel: ( localize(10348, 'Debug Launch Configurations')) }
|
|
63
58
|
)));
|
|
64
59
|
this.selectBox.setFocusable(false);
|
|
65
60
|
this.toDispose.push(this.selectBox);
|
|
@@ -87,7 +82,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
87
82
|
this._setAriaLabel(title);
|
|
88
83
|
this.toDispose.push(addDisposableListener(this.start, EventType.CLICK, () => {
|
|
89
84
|
this.start.blur();
|
|
90
|
-
if (this.debugService.state !==
|
|
85
|
+
if (this.debugService.state !== 1 ) {
|
|
91
86
|
this.actionRunner.run(this.action, this.context);
|
|
92
87
|
}
|
|
93
88
|
}));
|
|
@@ -104,7 +99,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
104
99
|
}));
|
|
105
100
|
this.toDispose.push(addDisposableListener(this.start, EventType.KEY_DOWN, (e) => {
|
|
106
101
|
const event = ( (new StandardKeyboardEvent(e)));
|
|
107
|
-
if (event.equals(
|
|
102
|
+
if (event.equals(17 )) {
|
|
108
103
|
this.start.tabIndex = -1;
|
|
109
104
|
this.selectBox.focus();
|
|
110
105
|
event.stopPropagation();
|
|
@@ -124,7 +119,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
124
119
|
this.selectBox.render(append(container, selectBoxContainer));
|
|
125
120
|
this.toDispose.push(addDisposableListener(selectBoxContainer, EventType.KEY_DOWN, (e) => {
|
|
126
121
|
const event = ( (new StandardKeyboardEvent(e)));
|
|
127
|
-
if (event.equals(
|
|
122
|
+
if (event.equals(15 )) {
|
|
128
123
|
this.selectBox.setFocusable(false);
|
|
129
124
|
this.start.tabIndex = 0;
|
|
130
125
|
this.start.focus();
|
|
@@ -182,7 +177,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
182
177
|
this.selected = 0;
|
|
183
178
|
this.debugOptions = [];
|
|
184
179
|
const manager = this.debugService.getConfigurationManager();
|
|
185
|
-
const inWorkspace = this.contextService.getWorkbenchState() ===
|
|
180
|
+
const inWorkspace = this.contextService.getWorkbenchState() === 3 ;
|
|
186
181
|
let lastGroup;
|
|
187
182
|
const disabledIdxs = [];
|
|
188
183
|
manager.getAllConfigurations().forEach(({ launch, name, presentation }) => {
|
|
@@ -217,7 +212,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
217
212
|
});
|
|
218
213
|
});
|
|
219
214
|
if (this.debugOptions.length === 0) {
|
|
220
|
-
this.debugOptions.push({ label: ( localize(
|
|
215
|
+
this.debugOptions.push({ label: ( localize(10349, "No Configurations")), handler: async () => false });
|
|
221
216
|
}
|
|
222
217
|
this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
|
|
223
218
|
disabledIdxs.push(this.debugOptions.length - 1);
|
|
@@ -235,7 +230,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
235
230
|
});
|
|
236
231
|
});
|
|
237
232
|
manager.getLaunches().filter(l => !l.hidden).forEach(l => {
|
|
238
|
-
const label = inWorkspace ? ( localize(
|
|
233
|
+
const label = inWorkspace ? ( localize(10350, "Add Config ({0})...", l.name)) : ( localize(10351, "Add Configuration..."));
|
|
239
234
|
this.debugOptions.push({
|
|
240
235
|
label, handler: async () => {
|
|
241
236
|
await this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( (l.uri.toString())));
|
|
@@ -250,16 +245,16 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
|
|
|
250
245
|
_setAriaLabel(title) {
|
|
251
246
|
let ariaLabel = title;
|
|
252
247
|
let keybinding;
|
|
253
|
-
const verbose = this.configurationService.getValue(
|
|
248
|
+
const verbose = this.configurationService.getValue("accessibility.verbosity.debug" );
|
|
254
249
|
if (verbose) {
|
|
255
|
-
keybinding = this.keybindingService.lookupKeybinding(
|
|
250
|
+
keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" , this.contextKeyService)?.getLabel() ?? undefined;
|
|
256
251
|
}
|
|
257
252
|
if (keybinding) {
|
|
258
|
-
ariaLabel = ( localize(
|
|
253
|
+
ariaLabel = ( localize(10352, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
|
|
259
254
|
}
|
|
260
255
|
else {
|
|
261
256
|
ariaLabel = ( localize(
|
|
262
|
-
|
|
257
|
+
10353,
|
|
263
258
|
"{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
|
|
264
259
|
ariaLabel
|
|
265
260
|
));
|
|
@@ -279,7 +274,7 @@ StartDebugActionViewItem = StartDebugActionViewItem_1 = ( (__decorate([
|
|
|
279
274
|
], StartDebugActionViewItem)));
|
|
280
275
|
let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
|
|
281
276
|
constructor(action, session, debugService, contextViewService, configurationService) {
|
|
282
|
-
super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(
|
|
277
|
+
super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10354, 'Debug Session')) });
|
|
283
278
|
this.debugService = debugService;
|
|
284
279
|
this.configurationService = configurationService;
|
|
285
280
|
this._register(this.debugService.getViewModel().onDidFocusSession(() => {
|
|
@@ -26,7 +26,6 @@ import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/ta
|
|
|
26
26
|
import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
|
|
27
27
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
28
28
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
29
|
-
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
30
29
|
import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
|
|
31
30
|
|
|
32
31
|
const jsonRegistry = ( (Registry.as(Extensions.JSONContribution)));
|
|
@@ -73,7 +72,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
73
72
|
updateTaskScheduler.cancel();
|
|
74
73
|
updateTaskScheduler.schedule();
|
|
75
74
|
}));
|
|
76
|
-
this.lifecycleService.when(
|
|
75
|
+
this.lifecycleService.when(4 )
|
|
77
76
|
.then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0));
|
|
78
77
|
this._register(delegate.onDidNewSession(s => {
|
|
79
78
|
this.usedDebugTypes.add(s.configuration.type);
|
|
@@ -85,7 +84,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
85
84
|
delta.added.forEach(added => {
|
|
86
85
|
added.value.forEach(rawAdapter => {
|
|
87
86
|
if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
|
|
88
|
-
added.collector.error(( localize(
|
|
87
|
+
added.collector.error(( localize(5736, "Debugger 'type' can not be omitted and must be of type 'string'.")));
|
|
89
88
|
}
|
|
90
89
|
if (rawAdapter.type !== '*') {
|
|
91
90
|
const existing = this.getDebugger(rawAdapter.type);
|
|
@@ -135,7 +134,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
135
134
|
'name': {
|
|
136
135
|
type: 'string',
|
|
137
136
|
description: ( localize(
|
|
138
|
-
|
|
137
|
+
5737,
|
|
139
138
|
"Name of configuration; appears in the launch configuration dropdown menu."
|
|
140
139
|
)),
|
|
141
140
|
default: 'Launch'
|
|
@@ -143,7 +142,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
143
142
|
'debugServer': {
|
|
144
143
|
type: 'number',
|
|
145
144
|
description: ( localize(
|
|
146
|
-
|
|
145
|
+
5738,
|
|
147
146
|
"For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"
|
|
148
147
|
)),
|
|
149
148
|
default: 4711
|
|
@@ -154,7 +153,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
154
153
|
}],
|
|
155
154
|
default: '',
|
|
156
155
|
defaultSnippets: [{ body: { task: '', type: '' } }],
|
|
157
|
-
description: ( localize(
|
|
156
|
+
description: ( localize(5739, "Task to run before debug session starts.")),
|
|
158
157
|
examples: this.taskLabels,
|
|
159
158
|
},
|
|
160
159
|
'postDebugTask': {
|
|
@@ -163,7 +162,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
163
162
|
}],
|
|
164
163
|
default: '',
|
|
165
164
|
defaultSnippets: [{ body: { task: '', type: '' } }],
|
|
166
|
-
description: ( localize(
|
|
165
|
+
description: ( localize(5740, "Task to run after debug session ends.")),
|
|
167
166
|
examples: this.taskLabels,
|
|
168
167
|
},
|
|
169
168
|
'presentation': presentationSchema,
|
|
@@ -171,7 +170,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
171
170
|
'suppressMultipleSessionWarning': {
|
|
172
171
|
type: 'boolean',
|
|
173
172
|
description: ( localize(
|
|
174
|
-
|
|
173
|
+
5741,
|
|
175
174
|
"Disable the warning when trying to start the same debug configuration more than once."
|
|
176
175
|
)),
|
|
177
176
|
default: true
|
|
@@ -327,11 +326,11 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
327
326
|
const { confirmed } = await this.dialogService.confirm({
|
|
328
327
|
type: Severity$1.Warning,
|
|
329
328
|
message: ( localize(
|
|
330
|
-
|
|
329
|
+
5742,
|
|
331
330
|
"You don't have an extension for debugging {0}. Should we find a {0} extension in the Marketplace?",
|
|
332
331
|
languageLabel
|
|
333
332
|
)),
|
|
334
|
-
primaryButton: ( localize(
|
|
333
|
+
primaryButton: ( localize(5743, "&&Find {0} extension", languageLabel))
|
|
335
334
|
});
|
|
336
335
|
if (confirmed) {
|
|
337
336
|
await this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
|
|
@@ -357,7 +356,7 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
357
356
|
});
|
|
358
357
|
const picks = [];
|
|
359
358
|
if (suggestedCandidates.length > 0) {
|
|
360
|
-
picks.push({ type: 'separator', label: ( localize(
|
|
359
|
+
picks.push({ type: 'separator', label: ( localize(5744, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
|
|
361
360
|
}
|
|
362
361
|
if (otherCandidates.length > 0) {
|
|
363
362
|
if (picks.length > 0) {
|
|
@@ -365,14 +364,14 @@ let AdapterManager = class AdapterManager extends Disposable {
|
|
|
365
364
|
}
|
|
366
365
|
picks.push(...( (otherCandidates.map(c => ({ label: c.label, debugger: c })))));
|
|
367
366
|
}
|
|
368
|
-
picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(
|
|
367
|
+
picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5745, "Install an extension for {0}...", languageLabel)) : ( localize(5746, "Install extension...")) });
|
|
369
368
|
const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
|
|
370
369
|
for (const [, action] of contributed) {
|
|
371
370
|
for (const item of action) {
|
|
372
371
|
picks.push(item);
|
|
373
372
|
}
|
|
374
373
|
}
|
|
375
|
-
const placeHolder = ( localize(
|
|
374
|
+
const placeHolder = ( localize(5747, "Select debugger"));
|
|
376
375
|
return this.quickInputService.pick(picks, { activeItem: picks[0], placeHolder })
|
|
377
376
|
.then(async (picked) => {
|
|
378
377
|
if (picked && 'debugger' in picked && picked.debugger) {
|
|
@@ -10,7 +10,6 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
|
10
10
|
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
11
11
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
12
12
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
13
|
-
import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
14
13
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
15
14
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
16
15
|
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
|
|
@@ -19,10 +18,8 @@ import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonCon
|
|
|
19
18
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
20
19
|
import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
|
|
21
20
|
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
22
|
-
import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
23
21
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
24
22
|
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
25
|
-
import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
26
23
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
27
24
|
import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
28
25
|
import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
@@ -64,10 +61,10 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
64
61
|
this.initLaunches();
|
|
65
62
|
this.setCompoundSchemaValues();
|
|
66
63
|
this.registerListeners();
|
|
67
|
-
const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT,
|
|
68
|
-
const previousSelectedType = this.storageService.get(DEBUG_SELECTED_TYPE,
|
|
64
|
+
const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, 1 );
|
|
65
|
+
const previousSelectedType = this.storageService.get(DEBUG_SELECTED_TYPE, 1 );
|
|
69
66
|
const previousSelectedLaunch = this.launches.find(l => ( (l.uri.toString())) === previousSelectedRoot);
|
|
70
|
-
const previousSelectedName = this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY,
|
|
67
|
+
const previousSelectedName = this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, 1 );
|
|
71
68
|
this.debugConfigurationTypeContext = CONTEXT_DEBUG_CONFIGURATION_TYPE.bindTo(contextKeyService);
|
|
72
69
|
const dynamicConfig = previousSelectedType ? { type: previousSelectedType } : undefined;
|
|
73
70
|
if (previousSelectedLaunch && previousSelectedLaunch.getConfigurationNames().length) {
|
|
@@ -193,7 +190,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
193
190
|
config,
|
|
194
191
|
buttons: [{
|
|
195
192
|
iconClass: ThemeIcon.asClassName(debugConfigure),
|
|
196
|
-
tooltip: ( localize(
|
|
193
|
+
tooltip: ( localize(5789, "Edit Debug Configuration in launch.json"))
|
|
197
194
|
}],
|
|
198
195
|
launch
|
|
199
196
|
}))))));
|
|
@@ -202,7 +199,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
202
199
|
const disposables = ( (new DisposableStore()));
|
|
203
200
|
const input = disposables.add(this.quickInputService.createQuickPick());
|
|
204
201
|
input.busy = true;
|
|
205
|
-
input.placeholder = ( localize(
|
|
202
|
+
input.placeholder = ( localize(5790, "Select Launch Configuration"));
|
|
206
203
|
const chosenPromise = ( (new Promise(resolve => {
|
|
207
204
|
disposables.add(input.onDidAccept(() => resolve(input.activeItems[0])));
|
|
208
205
|
disposables.add(input.onDidTriggerItemButton(async (context) => {
|
|
@@ -254,7 +251,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
254
251
|
}
|
|
255
252
|
removeRecentDynamicConfigurations(name, type) {
|
|
256
253
|
const remaining = this.getRecentDynamicConfigurations().filter(c => c.name !== name || c.type !== type);
|
|
257
|
-
this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(remaining),
|
|
254
|
+
this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(remaining), 1 , 1 );
|
|
258
255
|
if (this.selectedConfiguration.name === name && this.selectedType === type && this.selectedDynamic) {
|
|
259
256
|
this.selectConfiguration(undefined, undefined);
|
|
260
257
|
}
|
|
@@ -263,7 +260,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
263
260
|
}
|
|
264
261
|
}
|
|
265
262
|
getRecentDynamicConfigurations() {
|
|
266
|
-
return JSON.parse(this.storageService.get(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS,
|
|
263
|
+
return JSON.parse(this.storageService.get(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, 1 , '[]'));
|
|
267
264
|
}
|
|
268
265
|
registerListeners() {
|
|
269
266
|
this.toDispose.push(Event.any(this.contextService.onDidChangeWorkspaceFolders, this.contextService.onDidChangeWorkbenchState)(() => {
|
|
@@ -285,7 +282,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
285
282
|
this.launches = ( (this.contextService.getWorkspace().folders.map(
|
|
286
283
|
folder => this.instantiationService.createInstance(Launch, this, this.adapterManager, folder)
|
|
287
284
|
)));
|
|
288
|
-
if (this.contextService.getWorkbenchState() ===
|
|
285
|
+
if (this.contextService.getWorkbenchState() === 3 ) {
|
|
289
286
|
this.launches.push(this.instantiationService.createInstance(WorkspaceLaunch, this, this.adapterManager));
|
|
290
287
|
}
|
|
291
288
|
this.launches.push(this.instantiationService.createInstance(UserLaunch, this, this.adapterManager));
|
|
@@ -323,7 +320,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
323
320
|
return this._onDidSelectConfigurationName.event;
|
|
324
321
|
}
|
|
325
322
|
getWorkspaceLaunch() {
|
|
326
|
-
if (this.contextService.getWorkbenchState() ===
|
|
323
|
+
if (this.contextService.getWorkbenchState() === 3 ) {
|
|
327
324
|
return this.launches[this.launches.length - 1];
|
|
328
325
|
}
|
|
329
326
|
return undefined;
|
|
@@ -341,10 +338,10 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
341
338
|
const previousSelectedDynamic = this.selectedDynamic;
|
|
342
339
|
this.selectedLaunch = launch;
|
|
343
340
|
if (this.selectedLaunch) {
|
|
344
|
-
this.storageService.store(DEBUG_SELECTED_ROOT, ( (this.selectedLaunch.uri.toString())),
|
|
341
|
+
this.storageService.store(DEBUG_SELECTED_ROOT, ( (this.selectedLaunch.uri.toString())), 1 , 1 );
|
|
345
342
|
}
|
|
346
343
|
else {
|
|
347
|
-
this.storageService.remove(DEBUG_SELECTED_ROOT,
|
|
344
|
+
this.storageService.remove(DEBUG_SELECTED_ROOT, 1 );
|
|
348
345
|
}
|
|
349
346
|
const names = launch ? launch.getConfigurationNames() : [];
|
|
350
347
|
this.getSelectedConfig = () => {
|
|
@@ -378,7 +375,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
378
375
|
if (name && dynamicConfig.type) {
|
|
379
376
|
recentDynamicProviders.unshift({ name, type: dynamicConfig.type });
|
|
380
377
|
recentDynamicProviders = distinct(recentDynamicProviders, t => `${t.name} : ${t.type}`);
|
|
381
|
-
this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(recentDynamicProviders),
|
|
378
|
+
this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(recentDynamicProviders), 1 , 1 );
|
|
382
379
|
}
|
|
383
380
|
}
|
|
384
381
|
else if (!this.selectedName || names.indexOf(this.selectedName) === -1) {
|
|
@@ -391,7 +388,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
391
388
|
}
|
|
392
389
|
this.selectedType = dynamicConfig?.type || config?.type;
|
|
393
390
|
this.selectedDynamic = !!dynamicConfig;
|
|
394
|
-
this.storageService.store(DEBUG_SELECTED_TYPE, dynamicConfig ? this.selectedType : undefined,
|
|
391
|
+
this.storageService.store(DEBUG_SELECTED_TYPE, dynamicConfig ? this.selectedType : undefined, 1 , 1 );
|
|
395
392
|
if (type) {
|
|
396
393
|
this.debugConfigurationTypeContext.set(type);
|
|
397
394
|
}
|
|
@@ -405,10 +402,10 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
405
402
|
setSelectedLaunchName(selectedName) {
|
|
406
403
|
this.selectedName = selectedName;
|
|
407
404
|
if (this.selectedName) {
|
|
408
|
-
this.storageService.store(DEBUG_SELECTED_CONFIG_NAME_KEY, this.selectedName,
|
|
405
|
+
this.storageService.store(DEBUG_SELECTED_CONFIG_NAME_KEY, this.selectedName, 1 , 1 );
|
|
409
406
|
}
|
|
410
407
|
else {
|
|
411
|
-
this.storageService.remove(DEBUG_SELECTED_CONFIG_NAME_KEY,
|
|
408
|
+
this.storageService.remove(DEBUG_SELECTED_CONFIG_NAME_KEY, 1 );
|
|
412
409
|
}
|
|
413
410
|
}
|
|
414
411
|
dispose() {
|
|
@@ -470,13 +467,13 @@ class AbstractLaunch {
|
|
|
470
467
|
const configuration = config.configurations.find(config => config && config.name === name);
|
|
471
468
|
if (configuration) {
|
|
472
469
|
if (this instanceof UserLaunch) {
|
|
473
|
-
configuration.__configurationTarget =
|
|
470
|
+
configuration.__configurationTarget = 2 ;
|
|
474
471
|
}
|
|
475
472
|
else if (this instanceof WorkspaceLaunch) {
|
|
476
|
-
configuration.__configurationTarget =
|
|
473
|
+
configuration.__configurationTarget = 5 ;
|
|
477
474
|
}
|
|
478
475
|
else {
|
|
479
|
-
configuration.__configurationTarget =
|
|
476
|
+
configuration.__configurationTarget = 6 ;
|
|
480
477
|
}
|
|
481
478
|
}
|
|
482
479
|
return configuration;
|
|
@@ -533,7 +530,7 @@ let Launch = class Launch extends AbstractLaunch {
|
|
|
533
530
|
}
|
|
534
531
|
catch (error) {
|
|
535
532
|
throw ( (new Error(localize(
|
|
536
|
-
|
|
533
|
+
5791,
|
|
537
534
|
"Unable to create 'launch.json' file inside the '.vscode' folder ({0}).",
|
|
538
535
|
error.message
|
|
539
536
|
))));
|
|
@@ -567,7 +564,7 @@ let Launch = class Launch extends AbstractLaunch {
|
|
|
567
564
|
fullConfig.configurations = [];
|
|
568
565
|
}
|
|
569
566
|
fullConfig.configurations.push(configuration);
|
|
570
|
-
await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri },
|
|
567
|
+
await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri }, 6 );
|
|
571
568
|
}
|
|
572
569
|
};
|
|
573
570
|
Launch = ( (__decorate([
|
|
@@ -590,7 +587,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
|
|
|
590
587
|
return this.contextService.getWorkspace().configuration;
|
|
591
588
|
}
|
|
592
589
|
get name() {
|
|
593
|
-
return ( localize(
|
|
590
|
+
return ( localize(5792, "workspace"));
|
|
594
591
|
}
|
|
595
592
|
getConfig() {
|
|
596
593
|
return this.configurationService.inspect('launch').workspaceValue;
|
|
@@ -600,7 +597,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
|
|
|
600
597
|
if (!launchExistInFile) {
|
|
601
598
|
const content = await this.getInitialConfigurationContent(undefined, type, useInitialConfigs, token);
|
|
602
599
|
if (content) {
|
|
603
|
-
await this.configurationService.updateValue('launch', parse(content),
|
|
600
|
+
await this.configurationService.updateValue('launch', parse(content), 5 );
|
|
604
601
|
}
|
|
605
602
|
else {
|
|
606
603
|
return { editor: null, created: false };
|
|
@@ -634,7 +631,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
|
|
|
634
631
|
return this.preferencesService.userSettingsResource;
|
|
635
632
|
}
|
|
636
633
|
get name() {
|
|
637
|
-
return ( localize(
|
|
634
|
+
return ( localize(5793, "user settings"));
|
|
638
635
|
}
|
|
639
636
|
get hidden() {
|
|
640
637
|
return true;
|
|
@@ -26,7 +26,7 @@ let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickA
|
|
|
26
26
|
if (debugConsolePicks.length > 0) {
|
|
27
27
|
debugConsolePicks.push({ type: 'separator' });
|
|
28
28
|
}
|
|
29
|
-
const createTerminalLabel = ( localize(
|
|
29
|
+
const createTerminalLabel = ( localize(5949, "Start a New Debug Session"));
|
|
30
30
|
debugConsolePicks.push({
|
|
31
31
|
label: `$(plus) ${createTerminalLabel}`,
|
|
32
32
|
ariaLabel: createTerminalLabel,
|