@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,9 +1,7 @@
|
|
|
1
|
-
import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
|
|
2
1
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
3
2
|
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
4
3
|
import { getReplView } from './repl.js';
|
|
5
4
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
6
|
-
import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
7
5
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
8
6
|
|
|
9
7
|
class ReplAccessibilityHelp {
|
|
@@ -11,7 +9,7 @@ class ReplAccessibilityHelp {
|
|
|
11
9
|
this.priority = 120;
|
|
12
10
|
this.name = 'replHelp';
|
|
13
11
|
this.when = ( (ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')));
|
|
14
|
-
this.type =
|
|
12
|
+
this.type = "help" ;
|
|
15
13
|
}
|
|
16
14
|
getProvider(accessor) {
|
|
17
15
|
const viewsService = accessor.get(IViewsService);
|
|
@@ -28,9 +26,9 @@ class ReplAccessibilityHelpProvider extends Disposable {
|
|
|
28
26
|
constructor(_replView) {
|
|
29
27
|
super();
|
|
30
28
|
this._replView = _replView;
|
|
31
|
-
this.id =
|
|
32
|
-
this.verbositySettingKey =
|
|
33
|
-
this.options = { type:
|
|
29
|
+
this.id = "replHelp" ;
|
|
30
|
+
this.verbositySettingKey = "accessibility.verbosity.debug" ;
|
|
31
|
+
this.options = { type: "help" };
|
|
34
32
|
this._treeHadFocus = false;
|
|
35
33
|
this._treeHadFocus = !!_replView.getFocusedElement();
|
|
36
34
|
}
|
|
@@ -43,41 +41,41 @@ class ReplAccessibilityHelpProvider extends Disposable {
|
|
|
43
41
|
provideContent() {
|
|
44
42
|
return [
|
|
45
43
|
( localize(
|
|
46
|
-
|
|
44
|
+
6119,
|
|
47
45
|
"The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.",
|
|
48
46
|
'<keybinding:workbench.panel.repl.view.focus>'
|
|
49
47
|
)),
|
|
50
48
|
( localize(
|
|
51
|
-
|
|
49
|
+
6120,
|
|
52
50
|
"The debug console output can be navigated to from the input field with the Focus Previous Widget command{0}.",
|
|
53
51
|
'<keybinding:widgetNavigation.focusPrevious>'
|
|
54
52
|
)),
|
|
55
53
|
( localize(
|
|
56
|
-
|
|
54
|
+
6121,
|
|
57
55
|
"The debug console input can be navigated to from the output with the Focus Next Widget command{0}.",
|
|
58
56
|
'<keybinding:widgetNavigation.focusNext>'
|
|
59
57
|
)),
|
|
60
58
|
( localize(
|
|
61
|
-
|
|
59
|
+
6122,
|
|
62
60
|
"The debug console output history can be navigated with the up and down arrow keys."
|
|
63
61
|
)),
|
|
64
62
|
( localize(
|
|
65
|
-
|
|
63
|
+
6123,
|
|
66
64
|
"The Open Accessible View command{0} will allow character by character navigation of the console output.",
|
|
67
65
|
'<keybinding:editor.action.accessibleView>'
|
|
68
66
|
)),
|
|
69
67
|
( localize(
|
|
70
|
-
|
|
68
|
+
6124,
|
|
71
69
|
"The Show Run and Debug view command{0} will open the Run and Debug view and provides more information about debugging.",
|
|
72
70
|
'<keybinding:workbench.view.debug>'
|
|
73
71
|
)),
|
|
74
72
|
( localize(
|
|
75
|
-
|
|
73
|
+
6125,
|
|
76
74
|
"The Debug: Clear Console command{0} will clear the console output.",
|
|
77
75
|
'<keybinding:workbench.debug.panel.action.clearReplAction>'
|
|
78
76
|
)),
|
|
79
77
|
( localize(
|
|
80
|
-
|
|
78
|
+
6126,
|
|
81
79
|
"The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."
|
|
82
80
|
)),
|
|
83
81
|
].join('\n');
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
|
|
3
2
|
import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
|
|
4
|
-
import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
5
3
|
import { getReplView } from './repl.js';
|
|
6
4
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
7
5
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
@@ -14,7 +12,7 @@ class ReplAccessibleView {
|
|
|
14
12
|
this.priority = 70;
|
|
15
13
|
this.name = 'debugConsole';
|
|
16
14
|
this.when = ( ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view'));
|
|
17
|
-
this.type =
|
|
15
|
+
this.type = "view" ;
|
|
18
16
|
}
|
|
19
17
|
getProvider(accessor) {
|
|
20
18
|
const viewsService = accessor.get(IViewsService);
|
|
@@ -33,14 +31,14 @@ let ReplOutputAccessibleViewProvider = class ReplOutputAccessibleViewProvider ex
|
|
|
33
31
|
this._replView = _replView;
|
|
34
32
|
this._focusedElement = _focusedElement;
|
|
35
33
|
this._accessibleViewService = _accessibleViewService;
|
|
36
|
-
this.id =
|
|
34
|
+
this.id = "repl" ;
|
|
37
35
|
this._onDidChangeContent = this._register(( new Emitter()));
|
|
38
36
|
this.onDidChangeContent = this._onDidChangeContent.event;
|
|
39
37
|
this._onDidResolveChildren = this._register(( new Emitter()));
|
|
40
38
|
this.onDidResolveChildren = this._onDidResolveChildren.event;
|
|
41
|
-
this.verbositySettingKey =
|
|
39
|
+
this.verbositySettingKey = "accessibility.verbosity.debug" ;
|
|
42
40
|
this.options = {
|
|
43
|
-
type:
|
|
41
|
+
type: "view"
|
|
44
42
|
};
|
|
45
43
|
this._elementPositionMap = ( new Map());
|
|
46
44
|
this._treeHadFocus = false;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
|
|
2
2
|
import { splitGlobAware } from 'vscode/vscode/vs/base/common/glob';
|
|
3
|
-
import { TreeVisibility } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
|
|
4
3
|
import { ReplEvaluationInput, ReplEvaluationResult } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
|
|
5
4
|
import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
|
|
6
5
|
|
|
@@ -29,7 +28,7 @@ class ReplFilter {
|
|
|
29
28
|
}
|
|
30
29
|
filter(element, parentVisibility) {
|
|
31
30
|
if (element instanceof ReplEvaluationInput || element instanceof ReplEvaluationResult || element instanceof Variable) {
|
|
32
|
-
return
|
|
31
|
+
return 1 ;
|
|
33
32
|
}
|
|
34
33
|
let includeQueryPresent = false;
|
|
35
34
|
let includeQueryMatched = false;
|
|
@@ -45,7 +44,7 @@ class ReplFilter {
|
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
}
|
|
48
|
-
return includeQueryPresent ? includeQueryMatched : (typeof parentVisibility !== 'undefined' ? parentVisibility :
|
|
47
|
+
return includeQueryPresent ? includeQueryMatched : ((typeof parentVisibility !== 'undefined' ? parentVisibility : 1) );
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
|
|
@@ -10,20 +10,17 @@ import { basename } from 'vscode/vscode/vs/base/common/path';
|
|
|
10
10
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
11
11
|
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
12
12
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
13
|
-
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
14
13
|
import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
|
|
15
14
|
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
16
15
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
17
16
|
import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
|
|
18
17
|
import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
|
|
19
|
-
import {
|
|
20
|
-
import { renderExpressionValue, AbstractExpressionsRenderer, renderVariable } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
|
|
21
|
-
import { handleANSIOutput } from './debugANSIHandling.js';
|
|
22
|
-
import { debugConsoleEvaluationInput } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
18
|
+
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
23
19
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
24
20
|
import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
|
|
25
21
|
import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
|
|
26
|
-
import {
|
|
22
|
+
import { AbstractExpressionsRenderer } from './baseDebugView.js';
|
|
23
|
+
import { debugConsoleEvaluationInput } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
27
24
|
|
|
28
25
|
var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
|
|
29
26
|
const $ = $$1;
|
|
@@ -49,9 +46,8 @@ class ReplEvaluationInputsRenderer {
|
|
|
49
46
|
let ReplGroupRenderer = class ReplGroupRenderer {
|
|
50
47
|
static { ReplGroupRenderer_1 = this; }
|
|
51
48
|
static { this.ID = 'replGroup'; }
|
|
52
|
-
constructor(
|
|
53
|
-
this.
|
|
54
|
-
this.themeService = themeService;
|
|
49
|
+
constructor(expressionRenderer, instaService) {
|
|
50
|
+
this.expressionRenderer = expressionRenderer;
|
|
55
51
|
this.instaService = instaService;
|
|
56
52
|
}
|
|
57
53
|
get templateId() {
|
|
@@ -65,28 +61,27 @@ let ReplGroupRenderer = class ReplGroupRenderer {
|
|
|
65
61
|
return { label, source };
|
|
66
62
|
}
|
|
67
63
|
renderElement(element, _index, templateData) {
|
|
64
|
+
templateData.elementDisposable?.dispose();
|
|
68
65
|
const replGroup = element.element;
|
|
69
66
|
clearNode(templateData.label);
|
|
70
|
-
|
|
71
|
-
templateData.label.appendChild(result);
|
|
67
|
+
templateData.elementDisposable = this.expressionRenderer.renderValue(templateData.label, replGroup.name, { wasANSI: true, session: element.element.session });
|
|
72
68
|
templateData.source.setSource(replGroup.sourceData);
|
|
73
69
|
}
|
|
74
70
|
disposeTemplate(templateData) {
|
|
71
|
+
templateData.elementDisposable?.dispose();
|
|
75
72
|
templateData.source.dispose();
|
|
76
73
|
}
|
|
77
74
|
};
|
|
78
75
|
ReplGroupRenderer = ReplGroupRenderer_1 = ( (__decorate([
|
|
79
|
-
( (__param(1,
|
|
80
|
-
( (__param(2, IInstantiationService)))
|
|
76
|
+
( (__param(1, IInstantiationService)))
|
|
81
77
|
], ReplGroupRenderer)));
|
|
82
78
|
class ReplEvaluationResultsRenderer {
|
|
83
79
|
static { this.ID = 'replEvaluationResult'; }
|
|
84
80
|
get templateId() {
|
|
85
81
|
return ReplEvaluationResultsRenderer.ID;
|
|
86
82
|
}
|
|
87
|
-
constructor(
|
|
88
|
-
this.
|
|
89
|
-
this.hoverService = hoverService;
|
|
83
|
+
constructor(expressionRenderer) {
|
|
84
|
+
this.expressionRenderer = expressionRenderer;
|
|
90
85
|
}
|
|
91
86
|
renderTemplate(container) {
|
|
92
87
|
const output = append(container, $('.evaluation-result.expression'));
|
|
@@ -96,11 +91,11 @@ class ReplEvaluationResultsRenderer {
|
|
|
96
91
|
renderElement(element, index, templateData) {
|
|
97
92
|
templateData.elementStore.clear();
|
|
98
93
|
const expression = element.element;
|
|
99
|
-
|
|
94
|
+
templateData.elementStore.add(this.expressionRenderer.renderValue(templateData.value, expression, {
|
|
100
95
|
colorize: true,
|
|
101
96
|
hover: false,
|
|
102
|
-
|
|
103
|
-
}
|
|
97
|
+
session: element.element.getSession(),
|
|
98
|
+
}));
|
|
104
99
|
}
|
|
105
100
|
disposeTemplate(templateData) {
|
|
106
101
|
templateData.elementStore.dispose();
|
|
@@ -109,9 +104,8 @@ class ReplEvaluationResultsRenderer {
|
|
|
109
104
|
let ReplOutputElementRenderer = class ReplOutputElementRenderer {
|
|
110
105
|
static { ReplOutputElementRenderer_1 = this; }
|
|
111
106
|
static { this.ID = 'outputReplElement'; }
|
|
112
|
-
constructor(
|
|
113
|
-
this.
|
|
114
|
-
this.themeService = themeService;
|
|
107
|
+
constructor(expressionRenderer, instaService) {
|
|
108
|
+
this.expressionRenderer = expressionRenderer;
|
|
115
109
|
this.instaService = instaService;
|
|
116
110
|
}
|
|
117
111
|
get templateId() {
|
|
@@ -126,14 +120,17 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
|
|
|
126
120
|
data.count = ( (new CountBadge(data.countContainer, {}, defaultCountBadgeStyles)));
|
|
127
121
|
data.value = append(expression, $('span.value.label'));
|
|
128
122
|
data.source = this.instaService.createInstance(SourceWidget, expression);
|
|
123
|
+
data.elementDisposable = ( (new DisposableStore()));
|
|
129
124
|
return data;
|
|
130
125
|
}
|
|
131
126
|
renderElement({ element }, index, templateData) {
|
|
127
|
+
templateData.elementDisposable.clear();
|
|
132
128
|
this.setElementCount(element, templateData);
|
|
133
|
-
templateData.
|
|
129
|
+
templateData.elementDisposable.add(element.onDidChangeCount(() => this.setElementCount(element, templateData)));
|
|
134
130
|
clearNode(templateData.value);
|
|
135
131
|
templateData.value.className = 'value';
|
|
136
|
-
|
|
132
|
+
const locationReference = element.expression?.valueLocationReference;
|
|
133
|
+
templateData.elementDisposable.add(this.expressionRenderer.renderValue(templateData.value, element.value, { wasANSI: true, session: element.session, locationReference }));
|
|
137
134
|
templateData.value.classList.add((element.severity === Severity$1.Warning) ? 'warn' : (element.severity === Severity$1.Error) ? 'error' : (element.severity === Severity$1.Ignore) ? 'ignore' : 'info');
|
|
138
135
|
templateData.source.setSource(element.sourceData);
|
|
139
136
|
templateData.getReplElementSource = () => element.sourceData;
|
|
@@ -149,14 +146,14 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
|
|
|
149
146
|
}
|
|
150
147
|
disposeTemplate(templateData) {
|
|
151
148
|
templateData.source.dispose();
|
|
149
|
+
templateData.elementDisposable.dispose();
|
|
152
150
|
}
|
|
153
151
|
disposeElement(_element, _index, templateData) {
|
|
154
|
-
templateData.
|
|
152
|
+
templateData.elementDisposable.clear();
|
|
155
153
|
}
|
|
156
154
|
};
|
|
157
155
|
ReplOutputElementRenderer = ReplOutputElementRenderer_1 = ( (__decorate([
|
|
158
|
-
( (__param(1,
|
|
159
|
-
( (__param(2, IInstantiationService)))
|
|
156
|
+
( (__param(1, IInstantiationService)))
|
|
160
157
|
], ReplOutputElementRenderer)));
|
|
161
158
|
let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressionsRenderer {
|
|
162
159
|
static { ReplVariablesRenderer_1 = this; }
|
|
@@ -164,10 +161,9 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
|
|
|
164
161
|
get templateId() {
|
|
165
162
|
return ReplVariablesRenderer_1.ID;
|
|
166
163
|
}
|
|
167
|
-
constructor(
|
|
164
|
+
constructor(expressionRenderer, debugService, contextViewService, hoverService) {
|
|
168
165
|
super(debugService, contextViewService, hoverService);
|
|
169
|
-
this.
|
|
170
|
-
this.commandService = commandService;
|
|
166
|
+
this.expressionRenderer = expressionRenderer;
|
|
171
167
|
}
|
|
172
168
|
renderElement(node, _index, data) {
|
|
173
169
|
const element = node.element;
|
|
@@ -178,11 +174,12 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
|
|
|
178
174
|
const isReplVariable = expression instanceof ReplVariableElement;
|
|
179
175
|
if (isReplVariable || !expression.name) {
|
|
180
176
|
data.label.set('');
|
|
181
|
-
|
|
177
|
+
const value = isReplVariable ? expression.expression : expression;
|
|
178
|
+
data.elementDisposable.add(this.expressionRenderer.renderValue(data.value, value, { colorize: true, hover: false, session: expression.getSession() }));
|
|
182
179
|
data.expression.classList.remove('nested-variable');
|
|
183
180
|
}
|
|
184
181
|
else {
|
|
185
|
-
|
|
182
|
+
data.elementDisposable.add(this.expressionRenderer.renderVariable(data, expression, { showChanged: true, highlights }));
|
|
186
183
|
data.expression.classList.toggle('nested-variable', isNestedVariable(expression));
|
|
187
184
|
}
|
|
188
185
|
}
|
|
@@ -193,14 +190,12 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
|
|
|
193
190
|
ReplVariablesRenderer = ReplVariablesRenderer_1 = ( (__decorate([
|
|
194
191
|
( (__param(1, IDebugService))),
|
|
195
192
|
( (__param(2, IContextViewService))),
|
|
196
|
-
( (__param(3,
|
|
197
|
-
( (__param(4, IHoverService)))
|
|
193
|
+
( (__param(3, IHoverService)))
|
|
198
194
|
], ReplVariablesRenderer)));
|
|
199
195
|
class ReplRawObjectsRenderer {
|
|
200
196
|
static { this.ID = 'rawObject'; }
|
|
201
|
-
constructor(
|
|
202
|
-
this.
|
|
203
|
-
this.hoverService = hoverService;
|
|
197
|
+
constructor(expressionRenderer) {
|
|
198
|
+
this.expressionRenderer = expressionRenderer;
|
|
204
199
|
}
|
|
205
200
|
get templateId() {
|
|
206
201
|
return ReplRawObjectsRenderer.ID;
|
|
@@ -223,10 +218,10 @@ class ReplRawObjectsRenderer {
|
|
|
223
218
|
else {
|
|
224
219
|
templateData.name.textContent = '';
|
|
225
220
|
}
|
|
226
|
-
|
|
227
|
-
linkDetector: this.linkDetector,
|
|
221
|
+
templateData.elementStore.add(this.expressionRenderer.renderValue(templateData.value, element.value, {
|
|
228
222
|
hover: false,
|
|
229
|
-
|
|
223
|
+
session: node.element.getSession(),
|
|
224
|
+
}));
|
|
230
225
|
}
|
|
231
226
|
disposeTemplate(templateData) {
|
|
232
227
|
templateData.elementStore.dispose();
|
|
@@ -306,25 +301,25 @@ class ReplDataSource {
|
|
|
306
301
|
}
|
|
307
302
|
class ReplAccessibilityProvider {
|
|
308
303
|
getWidgetAriaLabel() {
|
|
309
|
-
return ( localize(
|
|
304
|
+
return ( localize(10355, "Debug Console"));
|
|
310
305
|
}
|
|
311
306
|
getAriaLabel(element) {
|
|
312
307
|
if (element instanceof Variable) {
|
|
313
|
-
return ( localize(
|
|
308
|
+
return ( localize(10356, "Variable {0}, value {1}", element.name, element.value));
|
|
314
309
|
}
|
|
315
310
|
if (element instanceof ReplOutputElement || element instanceof ReplEvaluationInput || element instanceof ReplEvaluationResult) {
|
|
316
|
-
return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(
|
|
311
|
+
return element.value + (element instanceof ReplOutputElement && element.count > 1 ? ( localize(10357, ", occurred {0} times", element.count)) : '');
|
|
317
312
|
}
|
|
318
313
|
if (element instanceof RawObjectReplElement) {
|
|
319
314
|
return ( localize(
|
|
320
|
-
|
|
315
|
+
10358,
|
|
321
316
|
"Debug console variable {0}, value {1}",
|
|
322
317
|
element.name,
|
|
323
318
|
element.value
|
|
324
319
|
));
|
|
325
320
|
}
|
|
326
321
|
if (element instanceof ReplGroup) {
|
|
327
|
-
return ( localize(
|
|
322
|
+
return ( localize(10359, "Debug console group {0}", element.name));
|
|
328
323
|
}
|
|
329
324
|
return '';
|
|
330
325
|
}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
|
|
3
2
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
4
3
|
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
|
-
import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
6
4
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
7
5
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
8
6
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
@@ -18,7 +16,7 @@ class RunAndDebugAccessibilityHelp {
|
|
|
18
16
|
(ContextKeyExpr.equals('activeViewlet', 'workbench.view.debug')),
|
|
19
17
|
SidebarFocusContext
|
|
20
18
|
)), (ContextKeyExpr.equals(FocusedViewContext.key, VARIABLES_VIEW_ID)), (ContextKeyExpr.equals(FocusedViewContext.key, WATCH_VIEW_ID)), (ContextKeyExpr.equals(FocusedViewContext.key, CALLSTACK_VIEW_ID)), (ContextKeyExpr.equals(FocusedViewContext.key, LOADED_SCRIPTS_VIEW_ID)), (ContextKeyExpr.equals(FocusedViewContext.key, BREAKPOINTS_VIEW_ID)))));
|
|
21
|
-
this.type =
|
|
19
|
+
this.type = "help" ;
|
|
22
20
|
}
|
|
23
21
|
getProvider(accessor) {
|
|
24
22
|
return (
|
|
@@ -31,9 +29,9 @@ let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpPro
|
|
|
31
29
|
super();
|
|
32
30
|
this._commandService = _commandService;
|
|
33
31
|
this._viewsService = _viewsService;
|
|
34
|
-
this.id =
|
|
35
|
-
this.verbositySettingKey =
|
|
36
|
-
this.options = { type:
|
|
32
|
+
this.id = "runAndDebug" ;
|
|
33
|
+
this.verbositySettingKey = "accessibility.verbosity.debug" ;
|
|
34
|
+
this.options = { type: "help" };
|
|
37
35
|
this._focusedView = this._viewsService.getFocusedViewName();
|
|
38
36
|
}
|
|
39
37
|
onClose() {
|
|
@@ -57,79 +55,79 @@ let RunAndDebugAccessibilityHelpProvider = class RunAndDebugAccessibilityHelpPro
|
|
|
57
55
|
provideContent() {
|
|
58
56
|
return [
|
|
59
57
|
( localize(
|
|
60
|
-
|
|
58
|
+
6127,
|
|
61
59
|
"The Show Run and Debug view command{0} will open the current view.",
|
|
62
60
|
'<keybinding:workbench.view.debug>'
|
|
63
61
|
)),
|
|
64
62
|
( localize(
|
|
65
|
-
|
|
63
|
+
6128,
|
|
66
64
|
"The Debug: Start Debugging command{0} will start a debug session.",
|
|
67
65
|
'<keybinding:workbench.action.debug.start>'
|
|
68
66
|
)),
|
|
69
67
|
( localize(
|
|
70
|
-
|
|
68
|
+
6129,
|
|
71
69
|
"Access debug output and evaluate expressions in the debug console, which can be focused with{0}.",
|
|
72
70
|
'<keybinding:workbench.panel.repl.view.focus>'
|
|
73
71
|
)),
|
|
74
72
|
AccessibilityHelpNLS.setBreakpoint,
|
|
75
73
|
AccessibilityHelpNLS.addToWatch,
|
|
76
|
-
( localize(
|
|
74
|
+
( localize(6130, "Once debugging, the following commands will be available:")),
|
|
77
75
|
( localize(
|
|
78
|
-
|
|
76
|
+
6131,
|
|
79
77
|
"- Debug: Restart Debugging command{0} will restart the current debug session.",
|
|
80
78
|
'<keybinding:workbench.action.debug.restart>'
|
|
81
79
|
)),
|
|
82
80
|
( localize(
|
|
83
|
-
|
|
81
|
+
6132,
|
|
84
82
|
"- Debug: Stop Debugging command{0} will stop the current debugging session.",
|
|
85
83
|
'<keybinding:workbench.action.debug.stop>'
|
|
86
84
|
)),
|
|
87
85
|
( localize(
|
|
88
|
-
|
|
86
|
+
6133,
|
|
89
87
|
"- Debug: Continue command{0} will continue execution until the next breakpoint.",
|
|
90
88
|
'<keybinding:workbench.action.debug.continue>'
|
|
91
89
|
)),
|
|
92
90
|
( localize(
|
|
93
|
-
|
|
91
|
+
6134,
|
|
94
92
|
"- Debug: Step Into command{0} will step into the next function call.",
|
|
95
93
|
'<keybinding:workbench.action.debug.stepInto>'
|
|
96
94
|
)),
|
|
97
95
|
( localize(
|
|
98
|
-
|
|
96
|
+
6135,
|
|
99
97
|
"- Debug: Step Over command{0} will step over the current function call.",
|
|
100
98
|
'<keybinding:workbench.action.debug.stepOver>'
|
|
101
99
|
)),
|
|
102
100
|
( localize(
|
|
103
|
-
|
|
101
|
+
6136,
|
|
104
102
|
"- Debug: Step Out command{0} will step out of the current function call.",
|
|
105
103
|
'<keybinding:workbench.action.debug.stepOut>'
|
|
106
104
|
)),
|
|
107
105
|
( localize(
|
|
108
|
-
|
|
106
|
+
6137,
|
|
109
107
|
'The debug viewlet is comprised of several views that can be focused with the following commands or navigated to via tab then arrow keys:'
|
|
110
108
|
)),
|
|
111
109
|
( localize(
|
|
112
|
-
|
|
110
|
+
6138,
|
|
113
111
|
"- Debug: Focus Breakpoints View command{0} will focus the breakpoints view.",
|
|
114
112
|
'<keybinding:workbench.debug.action.focusBreakpointsView>'
|
|
115
113
|
)),
|
|
116
114
|
( localize(
|
|
117
|
-
|
|
115
|
+
6139,
|
|
118
116
|
"- Debug: Focus Call Stack View command{0} will focus the call stack view.",
|
|
119
117
|
'<keybinding:workbench.debug.action.focusCallStackView>'
|
|
120
118
|
)),
|
|
121
119
|
( localize(
|
|
122
|
-
|
|
120
|
+
6140,
|
|
123
121
|
"- Debug: Focus Variables View command{0} will focus the variables view.",
|
|
124
122
|
'<keybinding:workbench.debug.action.focusVariablesView>'
|
|
125
123
|
)),
|
|
126
124
|
( localize(
|
|
127
|
-
|
|
125
|
+
6141,
|
|
128
126
|
"- Debug: Focus Watch View command{0} will focus the watch view.",
|
|
129
127
|
'<keybinding:workbench.debug.action.focusWatchView>'
|
|
130
128
|
)),
|
|
131
129
|
( localize(
|
|
132
|
-
|
|
130
|
+
6142,
|
|
133
131
|
"The setting {0} controls whether watch variable changes are announced.",
|
|
134
132
|
'accessibility.debugWatchVariableAnnouncements'
|
|
135
133
|
)),
|
|
@@ -11,7 +11,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
|
|
|
11
11
|
import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
|
|
12
12
|
import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
13
13
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
14
|
-
import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
15
14
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
16
15
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
17
16
|
import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER, COMMAND_CENTER_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
|
|
@@ -26,7 +25,7 @@ const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackgr
|
|
|
26
25
|
hcDark: '#BA592C',
|
|
27
26
|
hcLight: '#B5200D'
|
|
28
27
|
}, ( localize(
|
|
29
|
-
|
|
28
|
+
6083,
|
|
30
29
|
"Status bar background color when a program is being debugged. The status bar is shown in the bottom of the window"
|
|
31
30
|
)));
|
|
32
31
|
const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForeground', {
|
|
@@ -35,14 +34,14 @@ const STATUS_BAR_DEBUGGING_FOREGROUND = registerColor('statusBar.debuggingForegr
|
|
|
35
34
|
hcDark: STATUS_BAR_FOREGROUND,
|
|
36
35
|
hcLight: '#FFFFFF'
|
|
37
36
|
}, ( localize(
|
|
38
|
-
|
|
37
|
+
6084,
|
|
39
38
|
"Status bar foreground color when a program is being debugged. The status bar is shown in the bottom of the window"
|
|
40
39
|
)));
|
|
41
40
|
const STATUS_BAR_DEBUGGING_BORDER = registerColor('statusBar.debuggingBorder', STATUS_BAR_BORDER, ( localize(
|
|
42
|
-
|
|
41
|
+
6085,
|
|
43
42
|
"Status bar border color separating to the sidebar and editor when a program is being debugged. The status bar is shown in the bottom of the window"
|
|
44
43
|
)));
|
|
45
|
-
const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( (transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258))), ( localize(
|
|
44
|
+
const COMMAND_CENTER_DEBUGGING_BACKGROUND = registerColor('commandCenter.debuggingBackground', ( (transparent(STATUS_BAR_DEBUGGING_BACKGROUND, 0.258))), ( localize(6086, "Command center background color when a program is being debugged")), true);
|
|
46
45
|
let StatusBarColorProvider = class StatusBarColorProvider {
|
|
47
46
|
set enabled(enabled) {
|
|
48
47
|
if (enabled === !!this.disposable) {
|
|
@@ -104,7 +103,7 @@ StatusBarColorProvider = ( (__decorate([
|
|
|
104
103
|
( (__param(4, IConfigurationService)))
|
|
105
104
|
], StatusBarColorProvider)));
|
|
106
105
|
function isStatusbarInDebugMode(state, sessions) {
|
|
107
|
-
if (state ===
|
|
106
|
+
if (state === 0 || state === 1 || sessions.every(s => s.suppressDebugStatusbar || s.configuration?.noDebug)) {
|
|
108
107
|
return false;
|
|
109
108
|
}
|
|
110
109
|
return true;
|