@codingame/monaco-vscode-debug-service-override 4.5.1 → 5.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/platform/debug/common/extensionHostDebugIpc.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +140 -177
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +260 -531
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +34 -52
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +44 -71
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +116 -120
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +8 -11
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +81 -140
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +73 -76
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +30 -30
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +17 -49
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +143 -135
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +220 -177
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +9 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +70 -111
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +84 -65
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +85 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +50 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +13 -29
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +22 -51
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +52 -78
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +60 -76
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +29 -54
- package/vscode/src/vs/workbench/contrib/debug/browser/replFilter.js +4 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +42 -55
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +17 -16
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +84 -110
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +50 -88
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +60 -60
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +14 -28
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +12 -15
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +71 -146
- package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +92 -111
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +5 -12
- package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +42 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +0 -1042
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +0 -116
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +0 -87
|
@@ -10,6 +10,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
|
|
|
10
10
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
11
11
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
12
12
|
import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
|
|
13
|
+
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
13
14
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
14
15
|
import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
|
|
15
16
|
import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
|
|
@@ -27,20 +28,21 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
|
|
|
27
28
|
import { Expression, Variable, VisualizedExpression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
|
|
28
29
|
|
|
29
30
|
var WatchExpressionsRenderer_1;
|
|
31
|
+
const _moduleId = "vs/workbench/contrib/debug/browser/watchExpressionsView";
|
|
30
32
|
const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
|
|
31
33
|
let ignoreViewUpdates = false;
|
|
32
34
|
let useCachedEvaluation = false;
|
|
33
35
|
let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
|
|
34
|
-
constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, menuService) {
|
|
35
|
-
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
|
36
|
+
constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, hoverService, menuService) {
|
|
37
|
+
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
|
|
36
38
|
this.debugService = debugService;
|
|
37
39
|
this.needsRefresh = false;
|
|
38
40
|
this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
|
|
39
41
|
this._register(this.menu);
|
|
40
|
-
this.watchExpressionsUpdatedScheduler = ( new RunOnceScheduler(() => {
|
|
42
|
+
this.watchExpressionsUpdatedScheduler = ( (new RunOnceScheduler(() => {
|
|
41
43
|
this.needsRefresh = false;
|
|
42
44
|
this.tree.updateChildren();
|
|
43
|
-
}, 50));
|
|
45
|
+
}, 50)));
|
|
44
46
|
this.watchExpressionsExist = CONTEXT_WATCH_EXPRESSIONS_EXIST.bindTo(contextKeyService);
|
|
45
47
|
this.variableReadonly = CONTEXT_VARIABLE_IS_READONLY.bindTo(contextKeyService);
|
|
46
48
|
this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
|
|
@@ -53,12 +55,12 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
|
|
|
53
55
|
const treeContainer = renderViewTree(container);
|
|
54
56
|
const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer);
|
|
55
57
|
const linkDetector = this.instantiationService.createInstance(LinkDetector);
|
|
56
|
-
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, ( new WatchExpressionsDelegate()), [
|
|
58
|
+
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, ( (new WatchExpressionsDelegate())), [
|
|
57
59
|
expressionsRenderer,
|
|
58
60
|
this.instantiationService.createInstance(VariablesRenderer, linkDetector),
|
|
59
61
|
this.instantiationService.createInstance(VisualizedVariableRenderer, linkDetector),
|
|
60
62
|
], this.instantiationService.createInstance(WatchExpressionsDataSource), {
|
|
61
|
-
accessibilityProvider: ( new WatchExpressionsAccessibilityProvider()),
|
|
63
|
+
accessibilityProvider: ( (new WatchExpressionsAccessibilityProvider())),
|
|
62
64
|
identityProvider: { getId: (element) => element.getId() },
|
|
63
65
|
keyboardNavigationLabelProvider: {
|
|
64
66
|
getKeyboardNavigationLabel: (e) => {
|
|
@@ -68,10 +70,8 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
|
|
|
68
70
|
return e.name;
|
|
69
71
|
}
|
|
70
72
|
},
|
|
71
|
-
dnd: ( new WatchExpressionsDragAndDrop(this.debugService)),
|
|
72
|
-
overrideStyles:
|
|
73
|
-
listBackground: this.getBackgroundColor()
|
|
74
|
-
}
|
|
73
|
+
dnd: ( (new WatchExpressionsDragAndDrop(this.debugService))),
|
|
74
|
+
overrideStyles: this.getLocationBasedColors().listOverrideStyles
|
|
75
75
|
});
|
|
76
76
|
this.tree.setInput(this.debugService);
|
|
77
77
|
CONTEXT_WATCH_EXPRESSIONS_FOCUSED.bindTo(this.tree.contextKeyService);
|
|
@@ -176,19 +176,20 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
|
|
|
176
176
|
});
|
|
177
177
|
}
|
|
178
178
|
};
|
|
179
|
-
WatchExpressionsView = ( __decorate([
|
|
180
|
-
( __param(1, IContextMenuService)),
|
|
181
|
-
( __param(2, IDebugService)),
|
|
182
|
-
( __param(3, IKeybindingService)),
|
|
183
|
-
( __param(4, IInstantiationService)),
|
|
184
|
-
( __param(5, IViewDescriptorService)),
|
|
185
|
-
( __param(6, IConfigurationService)),
|
|
186
|
-
( __param(7, IContextKeyService)),
|
|
187
|
-
( __param(8, IOpenerService)),
|
|
188
|
-
( __param(9, IThemeService)),
|
|
189
|
-
( __param(10, ITelemetryService)),
|
|
190
|
-
( __param(11,
|
|
191
|
-
|
|
179
|
+
WatchExpressionsView = ( (__decorate([
|
|
180
|
+
( (__param(1, IContextMenuService))),
|
|
181
|
+
( (__param(2, IDebugService))),
|
|
182
|
+
( (__param(3, IKeybindingService))),
|
|
183
|
+
( (__param(4, IInstantiationService))),
|
|
184
|
+
( (__param(5, IViewDescriptorService))),
|
|
185
|
+
( (__param(6, IConfigurationService))),
|
|
186
|
+
( (__param(7, IContextKeyService))),
|
|
187
|
+
( (__param(8, IOpenerService))),
|
|
188
|
+
( (__param(9, IThemeService))),
|
|
189
|
+
( (__param(10, ITelemetryService))),
|
|
190
|
+
( (__param(11, IHoverService))),
|
|
191
|
+
( (__param(12, IMenuService)))
|
|
192
|
+
], WatchExpressionsView)));
|
|
192
193
|
class WatchExpressionsDelegate {
|
|
193
194
|
getHeight(_element) {
|
|
194
195
|
return 22;
|
|
@@ -215,9 +216,9 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
|
|
|
215
216
|
const debugService = element;
|
|
216
217
|
const watchExpressions = debugService.getModel().getWatchExpressions();
|
|
217
218
|
const viewModel = debugService.getViewModel();
|
|
218
|
-
return Promise.all(( watchExpressions.map(we => !!we.name && !useCachedEvaluation
|
|
219
|
+
return Promise.all(( (watchExpressions.map(we => !!we.name && !useCachedEvaluation
|
|
219
220
|
? we.evaluate(viewModel.focusedSession, viewModel.focusedStackFrame, 'watch').then(() => we)
|
|
220
|
-
: Promise.resolve(we))));
|
|
221
|
+
: Promise.resolve(we)))));
|
|
221
222
|
}
|
|
222
223
|
return element.getChildren();
|
|
223
224
|
}
|
|
@@ -225,8 +226,8 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
|
|
|
225
226
|
let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
|
|
226
227
|
static { WatchExpressionsRenderer_1 = this; }
|
|
227
228
|
static { this.ID = 'watchexpression'; }
|
|
228
|
-
constructor(menuService, contextKeyService, debugService, contextViewService) {
|
|
229
|
-
super(debugService, contextViewService);
|
|
229
|
+
constructor(menuService, contextKeyService, debugService, contextViewService, hoverService) {
|
|
230
|
+
super(debugService, contextViewService, hoverService);
|
|
230
231
|
this.menuService = menuService;
|
|
231
232
|
this.contextKeyService = contextKeyService;
|
|
232
233
|
}
|
|
@@ -251,19 +252,15 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
|
|
|
251
252
|
renderExpressionValue(expression, data.value, {
|
|
252
253
|
showChanged: true,
|
|
253
254
|
maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
|
|
254
|
-
|
|
255
|
+
hover: data.elementDisposable,
|
|
255
256
|
colorize: true
|
|
256
|
-
});
|
|
257
|
+
}, this.hoverService);
|
|
257
258
|
}
|
|
258
259
|
getInputBoxOptions(expression, settingValue) {
|
|
259
260
|
if (settingValue) {
|
|
260
261
|
return {
|
|
261
262
|
initialValue: expression.value,
|
|
262
|
-
ariaLabel: ( localizeWithPath(
|
|
263
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
264
|
-
'typeNewValue',
|
|
265
|
-
"Type new value"
|
|
266
|
-
)),
|
|
263
|
+
ariaLabel: ( localizeWithPath(_moduleId, 0, "Type new value")),
|
|
267
264
|
onFinish: async (value, success) => {
|
|
268
265
|
if (success && value) {
|
|
269
266
|
const focusedFrame = this.debugService.getViewModel().focusedStackFrame;
|
|
@@ -277,16 +274,8 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
|
|
|
277
274
|
}
|
|
278
275
|
return {
|
|
279
276
|
initialValue: expression.name ? expression.name : '',
|
|
280
|
-
ariaLabel: ( localizeWithPath(
|
|
281
|
-
|
|
282
|
-
'watchExpressionInputAriaLabel',
|
|
283
|
-
"Type watch expression"
|
|
284
|
-
)),
|
|
285
|
-
placeholder: ( localizeWithPath(
|
|
286
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
287
|
-
'watchExpressionPlaceholder',
|
|
288
|
-
"Expression to watch"
|
|
289
|
-
)),
|
|
277
|
+
ariaLabel: ( localizeWithPath(_moduleId, 1, "Type watch expression")),
|
|
278
|
+
placeholder: ( localizeWithPath(_moduleId, 2, "Expression to watch")),
|
|
290
279
|
onFinish: (value, success) => {
|
|
291
280
|
if (success && value) {
|
|
292
281
|
this.debugService.renameWatchExpression(expression.getId(), value);
|
|
@@ -311,12 +300,13 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
|
|
|
311
300
|
actionBar.push(primary, { icon: true, label: false });
|
|
312
301
|
}
|
|
313
302
|
};
|
|
314
|
-
WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( __decorate([
|
|
315
|
-
( __param(0, IMenuService)),
|
|
316
|
-
( __param(1, IContextKeyService)),
|
|
317
|
-
( __param(2, IDebugService)),
|
|
318
|
-
( __param(3, IContextViewService))
|
|
319
|
-
|
|
303
|
+
WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( (__decorate([
|
|
304
|
+
( (__param(0, IMenuService))),
|
|
305
|
+
( (__param(1, IContextKeyService))),
|
|
306
|
+
( (__param(2, IDebugService))),
|
|
307
|
+
( (__param(3, IContextViewService))),
|
|
308
|
+
( (__param(4, IHoverService)))
|
|
309
|
+
], WatchExpressionsRenderer)));
|
|
320
310
|
function getContextForWatchExpressionMenu(parentContext, expression) {
|
|
321
311
|
return parentContext.createOverlay([
|
|
322
312
|
[CONTEXT_CAN_VIEW_MEMORY.key, expression.memoryReference !== undefined],
|
|
@@ -325,29 +315,13 @@ function getContextForWatchExpressionMenu(parentContext, expression) {
|
|
|
325
315
|
}
|
|
326
316
|
class WatchExpressionsAccessibilityProvider {
|
|
327
317
|
getWidgetAriaLabel() {
|
|
328
|
-
return ( localizeWithPath(
|
|
329
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
330
|
-
{ comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' },
|
|
331
|
-
"Debug Watch Expressions"
|
|
332
|
-
));
|
|
318
|
+
return ( localizeWithPath(_moduleId, 3, "Debug Watch Expressions"));
|
|
333
319
|
}
|
|
334
320
|
getAriaLabel(element) {
|
|
335
321
|
if (element instanceof Expression) {
|
|
336
|
-
return ( localizeWithPath(
|
|
337
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
338
|
-
'watchExpressionAriaLabel',
|
|
339
|
-
"{0}, value {1}",
|
|
340
|
-
element.name,
|
|
341
|
-
element.value
|
|
342
|
-
));
|
|
322
|
+
return ( localizeWithPath(_moduleId, 4, "{0}, value {1}", element.name, element.value));
|
|
343
323
|
}
|
|
344
|
-
return ( localizeWithPath(
|
|
345
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
346
|
-
'watchVariableAriaLabel',
|
|
347
|
-
"{0}, value {1}",
|
|
348
|
-
element.name,
|
|
349
|
-
element.value
|
|
350
|
-
));
|
|
324
|
+
return ( localizeWithPath(_moduleId, 5, "{0}, value {1}", element.name, element.value));
|
|
351
325
|
}
|
|
352
326
|
}
|
|
353
327
|
class WatchExpressionsDragAndDrop {
|
|
@@ -399,7 +373,7 @@ class WatchExpressionsDragAndDrop {
|
|
|
399
373
|
}
|
|
400
374
|
const draggedElement = data.elements[0];
|
|
401
375
|
if (!(draggedElement instanceof Expression)) {
|
|
402
|
-
throw new Error('Invalid dragged element');
|
|
376
|
+
throw ( (new Error('Invalid dragged element')));
|
|
403
377
|
}
|
|
404
378
|
const watches = this.debugService.getModel().getWatchExpressions();
|
|
405
379
|
const sourcePosition = watches.indexOf(draggedElement);
|
|
@@ -428,11 +402,7 @@ registerAction2(class Collapse extends ViewAction {
|
|
|
428
402
|
super({
|
|
429
403
|
id: 'watch.collapse',
|
|
430
404
|
viewId: WATCH_VIEW_ID,
|
|
431
|
-
title: ( localizeWithPath(
|
|
432
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
433
|
-
'collapse',
|
|
434
|
-
"Collapse All"
|
|
435
|
-
)),
|
|
405
|
+
title: ( localizeWithPath(_moduleId, 6, "Collapse All")),
|
|
436
406
|
f1: false,
|
|
437
407
|
icon: Codicon.collapseAll,
|
|
438
408
|
precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
|
|
@@ -440,7 +410,7 @@ registerAction2(class Collapse extends ViewAction {
|
|
|
440
410
|
id: MenuId.ViewTitle,
|
|
441
411
|
order: 30,
|
|
442
412
|
group: 'navigation',
|
|
443
|
-
when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
|
|
413
|
+
when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
|
|
444
414
|
}
|
|
445
415
|
});
|
|
446
416
|
}
|
|
@@ -449,11 +419,7 @@ registerAction2(class Collapse extends ViewAction {
|
|
|
449
419
|
}
|
|
450
420
|
});
|
|
451
421
|
const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression';
|
|
452
|
-
const ADD_WATCH_LABEL = ( localizeWithPath(
|
|
453
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
454
|
-
'addWatchExpression',
|
|
455
|
-
"Add Expression"
|
|
456
|
-
));
|
|
422
|
+
const ADD_WATCH_LABEL = ( localizeWithPath(_moduleId, 7, "Add Expression"));
|
|
457
423
|
registerAction2(class AddWatchExpressionAction extends Action2 {
|
|
458
424
|
constructor() {
|
|
459
425
|
super({
|
|
@@ -464,7 +430,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
|
|
|
464
430
|
menu: {
|
|
465
431
|
id: MenuId.ViewTitle,
|
|
466
432
|
group: 'navigation',
|
|
467
|
-
when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
|
|
433
|
+
when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
|
|
468
434
|
}
|
|
469
435
|
});
|
|
470
436
|
}
|
|
@@ -474,11 +440,7 @@ registerAction2(class AddWatchExpressionAction extends Action2 {
|
|
|
474
440
|
}
|
|
475
441
|
});
|
|
476
442
|
const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
|
|
477
|
-
const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localizeWithPath(
|
|
478
|
-
'vs/workbench/contrib/debug/browser/watchExpressionsView',
|
|
479
|
-
'removeAllWatchExpressions',
|
|
480
|
-
"Remove All Expressions"
|
|
481
|
-
));
|
|
443
|
+
const REMOVE_WATCH_EXPRESSIONS_LABEL = ( localizeWithPath(_moduleId, 8, "Remove All Expressions"));
|
|
482
444
|
registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
|
|
483
445
|
constructor() {
|
|
484
446
|
super({
|
|
@@ -491,7 +453,7 @@ registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
|
|
|
491
453
|
id: MenuId.ViewTitle,
|
|
492
454
|
order: 20,
|
|
493
455
|
group: 'navigation',
|
|
494
|
-
when: ( ContextKeyExpr.equals('view', WATCH_VIEW_ID))
|
|
456
|
+
when: ( (ContextKeyExpr.equals('view', WATCH_VIEW_ID)))
|
|
495
457
|
}
|
|
496
458
|
});
|
|
497
459
|
}
|
|
@@ -22,16 +22,18 @@ import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/edit
|
|
|
22
22
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
23
23
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
24
24
|
import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
25
|
-
import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from '
|
|
25
|
+
import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
|
|
26
|
+
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
26
27
|
|
|
28
|
+
const _moduleId = "vs/workbench/contrib/debug/browser/welcomeView";
|
|
27
29
|
const debugStartLanguageKey = 'debugStartLanguage';
|
|
28
|
-
const CONTEXT_DEBUG_START_LANGUAGE = ( new RawContextKey(debugStartLanguageKey, undefined));
|
|
29
|
-
const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( new RawContextKey('debuggerInterestedInActiveEditor', false));
|
|
30
|
+
const CONTEXT_DEBUG_START_LANGUAGE = ( (new RawContextKey(debugStartLanguageKey, undefined)));
|
|
31
|
+
const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( (new RawContextKey('debuggerInterestedInActiveEditor', false)));
|
|
30
32
|
let WelcomeView = class WelcomeView extends ViewPane {
|
|
31
33
|
static { this.ID = 'workbench.debug.welcome'; }
|
|
32
|
-
static { this.LABEL = ( localize2WithPath(
|
|
33
|
-
constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService) {
|
|
34
|
-
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
|
34
|
+
static { this.LABEL = ( localize2WithPath(_moduleId, 0, "Run")); }
|
|
35
|
+
constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService, hoverService) {
|
|
36
|
+
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
|
|
35
37
|
this.debugService = debugService;
|
|
36
38
|
this.editorService = editorService;
|
|
37
39
|
this.debugStartLanguageContext = CONTEXT_DEBUG_START_LANGUAGE.bindTo(contextKeyService);
|
|
@@ -55,7 +57,7 @@ let WelcomeView = class WelcomeView extends ViewPane {
|
|
|
55
57
|
}
|
|
56
58
|
this.debuggerInterestedContext.set(false);
|
|
57
59
|
};
|
|
58
|
-
const disposables = ( new DisposableStore());
|
|
60
|
+
const disposables = ( (new DisposableStore()));
|
|
59
61
|
this._register(disposables);
|
|
60
62
|
this._register(editorService.onDidActiveEditorChange(() => {
|
|
61
63
|
disposables.clear();
|
|
@@ -82,83 +84,81 @@ let WelcomeView = class WelcomeView extends ViewPane {
|
|
|
82
84
|
return true;
|
|
83
85
|
}
|
|
84
86
|
};
|
|
85
|
-
WelcomeView = ( __decorate([
|
|
86
|
-
( __param(1, IThemeService)),
|
|
87
|
-
( __param(2, IKeybindingService)),
|
|
88
|
-
( __param(3, IContextMenuService)),
|
|
89
|
-
( __param(4, IConfigurationService)),
|
|
90
|
-
( __param(5, IContextKeyService)),
|
|
91
|
-
( __param(6, IDebugService)),
|
|
92
|
-
( __param(7, IEditorService)),
|
|
93
|
-
( __param(8, IInstantiationService)),
|
|
94
|
-
( __param(9, IViewDescriptorService)),
|
|
95
|
-
( __param(10, IOpenerService)),
|
|
96
|
-
( __param(11, IStorageService)),
|
|
97
|
-
( __param(12, ITelemetryService))
|
|
98
|
-
|
|
99
|
-
|
|
87
|
+
WelcomeView = ( (__decorate([
|
|
88
|
+
( (__param(1, IThemeService))),
|
|
89
|
+
( (__param(2, IKeybindingService))),
|
|
90
|
+
( (__param(3, IContextMenuService))),
|
|
91
|
+
( (__param(4, IConfigurationService))),
|
|
92
|
+
( (__param(5, IContextKeyService))),
|
|
93
|
+
( (__param(6, IDebugService))),
|
|
94
|
+
( (__param(7, IEditorService))),
|
|
95
|
+
( (__param(8, IInstantiationService))),
|
|
96
|
+
( (__param(9, IViewDescriptorService))),
|
|
97
|
+
( (__param(10, IOpenerService))),
|
|
98
|
+
( (__param(11, IStorageService))),
|
|
99
|
+
( (__param(12, ITelemetryService))),
|
|
100
|
+
( (__param(13, IHoverService)))
|
|
101
|
+
], WelcomeView)));
|
|
102
|
+
const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
|
|
100
103
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
101
|
-
content: ( localizeWithPath(
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
104
|
+
content: ( localizeWithPath(
|
|
105
|
+
_moduleId,
|
|
106
|
+
1,
|
|
107
|
+
"[Open a file](command:{0}) which can be debugged or run.",
|
|
108
|
+
(isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID
|
|
109
|
+
)),
|
|
110
|
+
when: ( (ContextKeyExpr.and(
|
|
111
|
+
CONTEXT_DEBUGGERS_AVAILABLE,
|
|
112
|
+
(CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.toNegated())
|
|
113
|
+
))),
|
|
109
114
|
group: ViewContentGroups.Open,
|
|
110
115
|
});
|
|
111
116
|
let debugKeybindingLabel = '';
|
|
112
117
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
113
|
-
content: `[${( localizeWithPath(
|
|
114
|
-
'vs/workbench/contrib/debug/browser/welcomeView',
|
|
115
|
-
'runAndDebugAction',
|
|
116
|
-
"Run and Debug"
|
|
117
|
-
))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
|
|
118
|
+
content: `[${( localizeWithPath(_moduleId, 2, "Run and Debug"))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
|
|
118
119
|
when: CONTEXT_DEBUGGERS_AVAILABLE,
|
|
119
120
|
group: ViewContentGroups.Debug,
|
|
120
121
|
order: 1
|
|
121
122
|
});
|
|
122
123
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
123
|
-
content: `[${( localizeWithPath(
|
|
124
|
-
'vs/workbench/contrib/debug/browser/welcomeView',
|
|
125
|
-
'detectThenRunAndDebug',
|
|
126
|
-
"Show all automatic debug configurations"
|
|
127
|
-
))}](command:${SELECT_AND_START_ID}).`,
|
|
124
|
+
content: `[${( localizeWithPath(_moduleId, 3, "Show all automatic debug configurations"))}](command:${SELECT_AND_START_ID}).`,
|
|
128
125
|
when: CONTEXT_DEBUGGERS_AVAILABLE,
|
|
129
126
|
group: ViewContentGroups.Debug,
|
|
130
127
|
order: 10
|
|
131
128
|
});
|
|
132
129
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
133
|
-
content: ( localizeWithPath(
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
130
|
+
content: ( localizeWithPath(
|
|
131
|
+
_moduleId,
|
|
132
|
+
4,
|
|
133
|
+
"To customize Run and Debug [create a launch.json file](command:{0}).",
|
|
134
|
+
DEBUG_CONFIGURE_COMMAND_ID
|
|
135
|
+
)),
|
|
136
|
+
when: ( (ContextKeyExpr.and(
|
|
137
|
+
CONTEXT_DEBUGGERS_AVAILABLE,
|
|
138
|
+
(WorkbenchStateContext.notEqualsTo('empty'))
|
|
139
|
+
))),
|
|
141
140
|
group: ViewContentGroups.Debug
|
|
142
141
|
});
|
|
143
142
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
144
|
-
content: ( localizeWithPath(
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
143
|
+
content: ( localizeWithPath(
|
|
144
|
+
_moduleId,
|
|
145
|
+
5,
|
|
146
|
+
"To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.",
|
|
147
|
+
(isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID
|
|
148
|
+
)),
|
|
149
|
+
when: ( (ContextKeyExpr.and(
|
|
150
|
+
CONTEXT_DEBUGGERS_AVAILABLE,
|
|
151
|
+
(WorkbenchStateContext.isEqualTo('empty'))
|
|
152
|
+
))),
|
|
153
153
|
group: ViewContentGroups.Debug
|
|
154
154
|
});
|
|
155
155
|
viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
|
|
156
156
|
content: ( localizeWithPath(
|
|
157
|
-
|
|
158
|
-
|
|
157
|
+
_moduleId,
|
|
158
|
+
6,
|
|
159
159
|
"All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."
|
|
160
160
|
)),
|
|
161
|
-
when: ( CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated()),
|
|
161
|
+
when: ( (CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated())),
|
|
162
162
|
group: ViewContentGroups.Debug
|
|
163
163
|
});
|
|
164
164
|
|
|
@@ -15,6 +15,7 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/
|
|
|
15
15
|
import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
|
|
16
16
|
|
|
17
17
|
var DebugContentProvider_1;
|
|
18
|
+
const _moduleId = "vs/workbench/contrib/debug/common/debugContentProvider";
|
|
18
19
|
let DebugContentProvider = class DebugContentProvider {
|
|
19
20
|
static { DebugContentProvider_1 = this; }
|
|
20
21
|
constructor(textModelResolverService, debugService, modelService, languageService, editorWorkerService) {
|
|
@@ -22,7 +23,7 @@ let DebugContentProvider = class DebugContentProvider {
|
|
|
22
23
|
this.modelService = modelService;
|
|
23
24
|
this.languageService = languageService;
|
|
24
25
|
this.editorWorkerService = editorWorkerService;
|
|
25
|
-
this.pendingUpdates = ( new Map());
|
|
26
|
+
this.pendingUpdates = ( (new Map()));
|
|
26
27
|
textModelResolverService.registerTextModelContentProvider(DEBUG_SCHEME, this);
|
|
27
28
|
DebugContentProvider_1.INSTANCE = this;
|
|
28
29
|
}
|
|
@@ -49,29 +50,14 @@ let DebugContentProvider = class DebugContentProvider {
|
|
|
49
50
|
session = this.debugService.getViewModel().focusedSession;
|
|
50
51
|
}
|
|
51
52
|
if (!session) {
|
|
52
|
-
return Promise.reject(( new ErrorNoTelemetry(( localizeWithPath(
|
|
53
|
-
'vs/workbench/contrib/debug/common/debugContentProvider',
|
|
54
|
-
'unable',
|
|
55
|
-
"Unable to resolve the resource without a debug session"
|
|
56
|
-
)))));
|
|
53
|
+
return Promise.reject(( (new ErrorNoTelemetry(( localizeWithPath(_moduleId, 0, "Unable to resolve the resource without a debug session"))))));
|
|
57
54
|
}
|
|
58
55
|
const createErrModel = (errMsg) => {
|
|
59
56
|
this.debugService.sourceIsNotAvailable(resource);
|
|
60
57
|
const languageSelection = this.languageService.createById(PLAINTEXT_LANGUAGE_ID);
|
|
61
58
|
const message = errMsg
|
|
62
|
-
? ( localizeWithPath(
|
|
63
|
-
'
|
|
64
|
-
'canNotResolveSourceWithError',
|
|
65
|
-
"Could not load source '{0}': {1}.",
|
|
66
|
-
resource.path,
|
|
67
|
-
errMsg
|
|
68
|
-
))
|
|
69
|
-
: ( localizeWithPath(
|
|
70
|
-
'vs/workbench/contrib/debug/common/debugContentProvider',
|
|
71
|
-
'canNotResolveSource',
|
|
72
|
-
"Could not load source '{0}'.",
|
|
73
|
-
resource.path
|
|
74
|
-
));
|
|
59
|
+
? ( localizeWithPath(_moduleId, 1, "Could not load source '{0}': {1}.", resource.path, errMsg))
|
|
60
|
+
: ( localizeWithPath(_moduleId, 2, "Could not load source '{0}'.", resource.path));
|
|
75
61
|
return this.modelService.createModel(message, languageSelection, resource);
|
|
76
62
|
};
|
|
77
63
|
return session.loadSource(resource).then(response => {
|
|
@@ -80,12 +66,12 @@ let DebugContentProvider = class DebugContentProvider {
|
|
|
80
66
|
const newContent = response.body.content;
|
|
81
67
|
const cancellationSource = this.pendingUpdates.get(model.id);
|
|
82
68
|
cancellationSource?.cancel();
|
|
83
|
-
const myToken = ( new CancellationTokenSource());
|
|
69
|
+
const myToken = ( (new CancellationTokenSource()));
|
|
84
70
|
this.pendingUpdates.set(model.id, myToken);
|
|
85
71
|
return this.editorWorkerService.computeMoreMinimalEdits(model.uri, [{ text: newContent, range: model.getFullModelRange() }]).then(edits => {
|
|
86
72
|
this.pendingUpdates.delete(model.id);
|
|
87
73
|
if (!myToken.token.isCancellationRequested && edits && edits.length > 0) {
|
|
88
|
-
model.applyEdits(( edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text))));
|
|
74
|
+
model.applyEdits(( (edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)))));
|
|
89
75
|
}
|
|
90
76
|
return model;
|
|
91
77
|
});
|
|
@@ -100,12 +86,12 @@ let DebugContentProvider = class DebugContentProvider {
|
|
|
100
86
|
}, (err) => createErrModel(err.message));
|
|
101
87
|
}
|
|
102
88
|
};
|
|
103
|
-
DebugContentProvider = DebugContentProvider_1 = ( __decorate([
|
|
104
|
-
( __param(0, ITextModelService)),
|
|
105
|
-
( __param(1, IDebugService)),
|
|
106
|
-
( __param(2, IModelService)),
|
|
107
|
-
( __param(3, ILanguageService)),
|
|
108
|
-
( __param(4, IEditorWorkerService))
|
|
109
|
-
], DebugContentProvider));
|
|
89
|
+
DebugContentProvider = DebugContentProvider_1 = ( (__decorate([
|
|
90
|
+
( (__param(0, ITextModelService))),
|
|
91
|
+
( (__param(1, IDebugService))),
|
|
92
|
+
( (__param(2, IModelService))),
|
|
93
|
+
( (__param(3, ILanguageService))),
|
|
94
|
+
( (__param(4, IEditorWorkerService)))
|
|
95
|
+
], DebugContentProvider)));
|
|
110
96
|
|
|
111
97
|
export { DebugContentProvider };
|
|
@@ -5,6 +5,7 @@ import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs
|
|
|
5
5
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
6
6
|
import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
|
|
7
7
|
|
|
8
|
+
const _moduleId = "vs/workbench/contrib/debug/common/debugLifecycle";
|
|
8
9
|
let DebugLifecycle = class DebugLifecycle {
|
|
9
10
|
constructor(lifecycleService, debugService, configurationService, dialogService) {
|
|
10
11
|
this.debugService = debugService;
|
|
@@ -27,35 +28,31 @@ let DebugLifecycle = class DebugLifecycle {
|
|
|
27
28
|
let message;
|
|
28
29
|
if (numSessions === 1) {
|
|
29
30
|
message = ( localizeWithPath(
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
_moduleId,
|
|
32
|
+
0,
|
|
32
33
|
"There is an active debug session, are you sure you want to stop it?"
|
|
33
34
|
));
|
|
34
35
|
}
|
|
35
36
|
else {
|
|
36
37
|
message = ( localizeWithPath(
|
|
37
|
-
|
|
38
|
-
|
|
38
|
+
_moduleId,
|
|
39
|
+
1,
|
|
39
40
|
"There are active debug sessions, are you sure you want to stop them?"
|
|
40
41
|
));
|
|
41
42
|
}
|
|
42
43
|
const res = await this.dialogService.confirm({
|
|
43
44
|
message,
|
|
44
45
|
type: 'warning',
|
|
45
|
-
primaryButton: ( localizeWithPath(
|
|
46
|
-
'vs/workbench/contrib/debug/common/debugLifecycle',
|
|
47
|
-
{ key: 'debug.stop', comment: ['&& denotes a mnemonic'] },
|
|
48
|
-
"&&Stop Debugging"
|
|
49
|
-
))
|
|
46
|
+
primaryButton: ( localizeWithPath(_moduleId, 2, "&&Stop Debugging"))
|
|
50
47
|
});
|
|
51
48
|
return !res.confirmed;
|
|
52
49
|
}
|
|
53
50
|
};
|
|
54
|
-
DebugLifecycle = ( __decorate([
|
|
55
|
-
( __param(0, ILifecycleService)),
|
|
56
|
-
( __param(1, IDebugService)),
|
|
57
|
-
( __param(2, IConfigurationService)),
|
|
58
|
-
( __param(3, IDialogService))
|
|
59
|
-
], DebugLifecycle));
|
|
51
|
+
DebugLifecycle = ( (__decorate([
|
|
52
|
+
( (__param(0, ILifecycleService))),
|
|
53
|
+
( (__param(1, IDebugService))),
|
|
54
|
+
( (__param(2, IConfigurationService))),
|
|
55
|
+
( (__param(3, IDialogService)))
|
|
56
|
+
], DebugLifecycle)));
|
|
60
57
|
|
|
61
58
|
export { DebugLifecycle };
|