@codingame/monaco-vscode-debug-service-override 11.1.2 → 12.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/index.d.ts +2 -1
- package/index.js +27 -1
- package/package.json +42 -8
- package/service-override/tools/debugAssets.d.ts +1 -0
- package/service-override/tools/debugAssets.js +5 -0
- package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.d.ts +28 -0
- package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.d.ts +79 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +24 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.d.ts +45 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +108 -132
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +208 -264
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.d.ts +50 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +46 -40
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.d.ts +71 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +72 -54
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.d.ts +91 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +151 -148
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.d.ts +14 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +10 -9
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.d.ts +22 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +65 -107
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.d.ts +64 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +108 -105
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.d.ts +65 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +49 -37
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.d.ts +37 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.js +11 -10
- package/vscode/src/vs/workbench/contrib/debug/browser/debugProgress.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugProgress.js +4 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.d.ts +14 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +24 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.d.ts +160 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +194 -169
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.d.ts +206 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +150 -173
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSettingMigration.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSettingMigration.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.d.ts +14 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +14 -11
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.d.ts +36 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +76 -68
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.js +4 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.d.ts +54 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +70 -94
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.d.ts +45 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +59 -84
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.d.ts +64 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +61 -60
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.d.ts +18 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +19 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.d.ts +19 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js +7 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.d.ts +36 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +55 -53
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debugHover.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/media/debugToolBar.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/media/exceptionWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/media/repl.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.d.ts +120 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +62 -61
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.d.ts +107 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +148 -155
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.d.ts +26 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.js +39 -38
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.d.ts +39 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.js +8 -5
- package/vscode/src/vs/workbench/contrib/debug/browser/replFilter.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/replFilter.js +6 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.d.ts +131 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +42 -40
- package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.d.ts +28 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.js +74 -76
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +16 -14
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.d.ts +78 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +74 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.d.ts +57 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +63 -63
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.d.ts +26 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +53 -66
- package/vscode/src/vs/workbench/contrib/debug/common/breakpoints.d.ts +10 -0
- package/vscode/src/vs/workbench/contrib/debug/common/breakpoints.js +2 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.d.ts +16 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.js +3 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debugCompoundRoot.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugCompoundRoot.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.d.ts +21 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +16 -15
- package/vscode/src/vs/workbench/contrib/debug/common/debugContext.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugContext.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.d.ts +15 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +11 -10
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.d.ts +7 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +51 -50
- package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.d.ts +34 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js +26 -22
- package/vscode/src/vs/workbench/contrib/debug/common/debugTelemetry.d.ts +10 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugTelemetry.js +2 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugViewModel.d.ts +77 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugViewModel.js +1 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.d.ts +55 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.js +3 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.d.ts +52 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +83 -84
- package/vscode/src/vs/workbench/contrib/debug/common/replAccessibilityAnnouncer.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/debug/common/replAccessibilityAnnouncer.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +5 -4
- package/debug.js +0 -26
- package/tools/debugAssets.js +0 -4
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
4
|
import './media/debugViewlet.css.js';
|
|
4
5
|
import { localize, localize2 } from 'vscode/vscode/vs/nls';
|
|
@@ -15,16 +16,16 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
|
|
|
15
16
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
16
17
|
import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
|
|
17
18
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
18
|
-
import { ViewPaneContainer, ViewsSubMenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
|
|
19
|
+
import { ViewPaneContainer, ViewsSubMenu } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
|
|
19
20
|
import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
|
|
20
21
|
import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
|
|
21
22
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
22
23
|
import { StartDebugActionViewItem, FocusSessionActionViewItem } from './debugActionViewItems.js';
|
|
23
|
-
import { DEBUG_START_COMMAND_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, SELECT_AND_START_ID } from '@codingame/monaco-vscode-
|
|
24
|
-
import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
24
|
+
import { DEBUG_START_COMMAND_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, SELECT_AND_START_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
|
|
25
|
+
import { debugConfigure } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
25
26
|
import { createDisconnectMenuItemAction } from './debugToolBar.js';
|
|
26
27
|
import { WelcomeView } from './welcomeView.js';
|
|
27
|
-
import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUGGERS_AVAILABLE, REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
28
|
+
import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, State, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUGGERS_AVAILABLE, EDITOR_CONTRIBUTION_ID, REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
28
29
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
29
30
|
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
|
|
30
31
|
import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
@@ -36,11 +37,11 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
|
|
|
36
37
|
this.debugService = debugService;
|
|
37
38
|
this.contextViewService = contextViewService;
|
|
38
39
|
this.contextKeyService = contextKeyService;
|
|
39
|
-
this.paneListeners = (
|
|
40
|
-
this.stopActionViewItemDisposables = this._register((
|
|
40
|
+
this.paneListeners = ( new Map());
|
|
41
|
+
this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
|
|
41
42
|
this._register(this.debugService.onDidChangeState(state => this.onDebugServiceStateChange(state)));
|
|
42
43
|
this._register(this.contextKeyService.onDidChangeContext(e => {
|
|
43
|
-
if (e.affectsSome((
|
|
44
|
+
if (e.affectsSome(( new Set([CONTEXT_DEBUG_UX_KEY, 'inDebugMode'])))) {
|
|
44
45
|
this.updateTitleArea();
|
|
45
46
|
}
|
|
46
47
|
}));
|
|
@@ -70,15 +71,13 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
|
|
|
70
71
|
return this.startDebugActionViewItem;
|
|
71
72
|
}
|
|
72
73
|
if (action.id === FOCUS_SESSION_ID) {
|
|
73
|
-
return (
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
))
|
|
81
|
-
);
|
|
74
|
+
return ( new FocusSessionActionViewItem(
|
|
75
|
+
action,
|
|
76
|
+
undefined,
|
|
77
|
+
this.debugService,
|
|
78
|
+
this.contextViewService,
|
|
79
|
+
this.configurationService
|
|
80
|
+
));
|
|
82
81
|
}
|
|
83
82
|
if (action.id === STOP_ID || action.id === DISCONNECT_ID) {
|
|
84
83
|
this.stopActionViewItemDisposables.clear();
|
|
@@ -100,11 +99,9 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
|
|
|
100
99
|
this.progressResolve();
|
|
101
100
|
this.progressResolve = undefined;
|
|
102
101
|
}
|
|
103
|
-
if (state ===
|
|
102
|
+
if (state === State.Initializing) {
|
|
104
103
|
this.progressService.withProgress({ location: VIEWLET_ID, }, _progress => {
|
|
105
|
-
return (
|
|
106
|
-
(new Promise(resolve => this.progressResolve = resolve))
|
|
107
|
-
);
|
|
104
|
+
return ( new Promise(resolve => this.progressResolve = resolve));
|
|
108
105
|
});
|
|
109
106
|
}
|
|
110
107
|
}
|
|
@@ -134,40 +131,31 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
|
|
|
134
131
|
}
|
|
135
132
|
}
|
|
136
133
|
};
|
|
137
|
-
DebugViewPaneContainer = (
|
|
138
|
-
(
|
|
139
|
-
(
|
|
140
|
-
(
|
|
141
|
-
(
|
|
142
|
-
(
|
|
143
|
-
(
|
|
144
|
-
(
|
|
145
|
-
(
|
|
146
|
-
(
|
|
147
|
-
(
|
|
148
|
-
(
|
|
149
|
-
(
|
|
150
|
-
(
|
|
151
|
-
(
|
|
152
|
-
], DebugViewPaneContainer))
|
|
134
|
+
DebugViewPaneContainer = ( __decorate([
|
|
135
|
+
( __param(0, IWorkbenchLayoutService)),
|
|
136
|
+
( __param(1, ITelemetryService)),
|
|
137
|
+
( __param(2, IProgressService)),
|
|
138
|
+
( __param(3, IDebugService)),
|
|
139
|
+
( __param(4, IInstantiationService)),
|
|
140
|
+
( __param(5, IWorkspaceContextService)),
|
|
141
|
+
( __param(6, IStorageService)),
|
|
142
|
+
( __param(7, IThemeService)),
|
|
143
|
+
( __param(8, IContextMenuService)),
|
|
144
|
+
( __param(9, IExtensionService)),
|
|
145
|
+
( __param(10, IConfigurationService)),
|
|
146
|
+
( __param(11, IContextViewService)),
|
|
147
|
+
( __param(12, IContextKeyService)),
|
|
148
|
+
( __param(13, IViewDescriptorService))
|
|
149
|
+
], DebugViewPaneContainer));
|
|
153
150
|
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
|
|
154
|
-
when: (
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
(ContextKeyExpr.or(
|
|
159
|
-
(CONTEXT_DEBUG_STATE.isEqualTo('inactive')),
|
|
160
|
-
(ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked'))
|
|
161
|
-
)),
|
|
162
|
-
(ContextKeyExpr.or(
|
|
163
|
-
ContextKeyExpr.not('config.debug.hideLauncherWhileDebugging'),
|
|
164
|
-
ContextKeyExpr.not('inDebugMode')
|
|
165
|
-
))
|
|
166
|
-
))),
|
|
151
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_UX.notEqualsTo('simple')), ( WorkbenchStateContext.notEqualsTo('empty')), ( ContextKeyExpr.or(( CONTEXT_DEBUG_STATE.isEqualTo('inactive')), ( ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked')))), ( ContextKeyExpr.or(
|
|
152
|
+
ContextKeyExpr.not('config.debug.hideLauncherWhileDebugging'),
|
|
153
|
+
ContextKeyExpr.not('inDebugMode')
|
|
154
|
+
)))),
|
|
167
155
|
order: 10,
|
|
168
156
|
group: 'navigation',
|
|
169
157
|
command: {
|
|
170
|
-
precondition: (
|
|
158
|
+
precondition: ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
|
|
171
159
|
id: DEBUG_START_COMMAND_ID,
|
|
172
160
|
title: DEBUG_START_LABEL
|
|
173
161
|
}
|
|
@@ -179,35 +167,23 @@ registerAction2(class extends Action2 {
|
|
|
179
167
|
title: {
|
|
180
168
|
value: DEBUG_CONFIGURE_LABEL,
|
|
181
169
|
original: 'Open \'launch.json\'',
|
|
182
|
-
mnemonicTitle: ( localize(
|
|
170
|
+
mnemonicTitle: ( localize(5394, "Open &&Configurations"))
|
|
183
171
|
},
|
|
184
172
|
metadata: {
|
|
185
|
-
description: ( localize2(
|
|
173
|
+
description: ( localize2(5395, 'Opens the file used to configure how your program is debugged'))
|
|
186
174
|
},
|
|
187
175
|
f1: true,
|
|
188
176
|
icon: debugConfigure,
|
|
189
|
-
precondition: (
|
|
177
|
+
precondition: ( CONTEXT_DEBUG_UX.notEqualsTo('simple')),
|
|
190
178
|
menu: [{
|
|
191
179
|
id: MenuId.ViewContainerTitle,
|
|
192
180
|
group: 'navigation',
|
|
193
181
|
order: 20,
|
|
194
|
-
when: (
|
|
195
|
-
(ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
|
|
196
|
-
(CONTEXT_DEBUG_UX.notEqualsTo('simple')),
|
|
197
|
-
(WorkbenchStateContext.notEqualsTo('empty')),
|
|
198
|
-
(ContextKeyExpr.or(
|
|
199
|
-
(CONTEXT_DEBUG_STATE.isEqualTo('inactive')),
|
|
200
|
-
(ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked'))
|
|
201
|
-
))
|
|
202
|
-
)))
|
|
182
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_UX.notEqualsTo('simple')), ( WorkbenchStateContext.notEqualsTo('empty')), ( ContextKeyExpr.or(( CONTEXT_DEBUG_STATE.isEqualTo('inactive')), ( ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked'))))))
|
|
203
183
|
}, {
|
|
204
184
|
id: MenuId.ViewContainerTitle,
|
|
205
185
|
order: 20,
|
|
206
|
-
when: (
|
|
207
|
-
(ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
|
|
208
|
-
(CONTEXT_DEBUG_STATE.notEqualsTo('inactive')),
|
|
209
|
-
(ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))
|
|
210
|
-
)))
|
|
186
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))))
|
|
211
187
|
}, {
|
|
212
188
|
id: MenuId.MenubarDebugMenu,
|
|
213
189
|
group: '2_configuration',
|
|
@@ -216,7 +192,7 @@ registerAction2(class extends Action2 {
|
|
|
216
192
|
}]
|
|
217
193
|
});
|
|
218
194
|
}
|
|
219
|
-
async run(accessor) {
|
|
195
|
+
async run(accessor, opts) {
|
|
220
196
|
const debugService = accessor.get(IDebugService);
|
|
221
197
|
const quickInputService = accessor.get(IQuickInputService);
|
|
222
198
|
const configurationManager = debugService.getConfigurationManager();
|
|
@@ -230,11 +206,11 @@ registerAction2(class extends Action2 {
|
|
|
230
206
|
launch = launches[0];
|
|
231
207
|
}
|
|
232
208
|
else {
|
|
233
|
-
const picks = (
|
|
209
|
+
const picks = ( launches.map(l => ({ label: l.name, launch: l })));
|
|
234
210
|
const picked = await quickInputService.pick(picks, {
|
|
235
211
|
activeItem: picks[0],
|
|
236
212
|
placeHolder: ( localize(
|
|
237
|
-
|
|
213
|
+
5396,
|
|
238
214
|
"Select a workspace folder to create a launch.json file in or add it to the workspace config file"
|
|
239
215
|
))
|
|
240
216
|
});
|
|
@@ -244,7 +220,13 @@ registerAction2(class extends Action2 {
|
|
|
244
220
|
}
|
|
245
221
|
}
|
|
246
222
|
if (launch) {
|
|
247
|
-
await launch.openConfigFile({ preserveFocus: false });
|
|
223
|
+
const { editor } = await launch.openConfigFile({ preserveFocus: false });
|
|
224
|
+
if (editor && opts?.addNew) {
|
|
225
|
+
const codeEditor = editor.getControl();
|
|
226
|
+
if (codeEditor) {
|
|
227
|
+
await codeEditor.getContribution(EDITOR_CONTRIBUTION_ID)?.addLaunchConfiguration();
|
|
228
|
+
}
|
|
229
|
+
}
|
|
248
230
|
}
|
|
249
231
|
}
|
|
250
232
|
});
|
|
@@ -252,13 +234,13 @@ registerAction2(class extends Action2 {
|
|
|
252
234
|
constructor() {
|
|
253
235
|
super({
|
|
254
236
|
id: 'debug.toggleReplIgnoreFocus',
|
|
255
|
-
title: ( localize(
|
|
256
|
-
toggled: (
|
|
237
|
+
title: ( localize(5397, "Debug Console")),
|
|
238
|
+
toggled: ( ContextKeyExpr.has(`view.${REPL_VIEW_ID}.visible`)),
|
|
257
239
|
menu: [{
|
|
258
240
|
id: ViewsSubMenu,
|
|
259
241
|
group: '3_toggleRepl',
|
|
260
242
|
order: 30,
|
|
261
|
-
when: (
|
|
243
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID))))
|
|
262
244
|
}]
|
|
263
245
|
});
|
|
264
246
|
}
|
|
@@ -273,18 +255,11 @@ registerAction2(class extends Action2 {
|
|
|
273
255
|
}
|
|
274
256
|
});
|
|
275
257
|
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
|
|
276
|
-
when: (
|
|
277
|
-
(ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
|
|
278
|
-
(CONTEXT_DEBUG_STATE.notEqualsTo('inactive')),
|
|
279
|
-
(ContextKeyExpr.or(
|
|
280
|
-
(ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')),
|
|
281
|
-
(ContextKeyExpr.has('config.debug.hideLauncherWhileDebugging'))
|
|
282
|
-
))
|
|
283
|
-
))),
|
|
258
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')), ( ContextKeyExpr.has('config.debug.hideLauncherWhileDebugging')))))),
|
|
284
259
|
order: 10,
|
|
285
260
|
command: {
|
|
286
261
|
id: SELECT_AND_START_ID,
|
|
287
|
-
title: ( localize(
|
|
262
|
+
title: ( localize(5398, "Start Additional Session")),
|
|
288
263
|
}
|
|
289
264
|
});
|
|
290
265
|
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { Dimension } from "vscode/vscode/vs/base/browser/dom";
|
|
2
|
+
import { BareFontInfo } from "vscode/vscode/vs/editor/common/config/fontInfo";
|
|
3
|
+
import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
|
|
4
|
+
import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
5
|
+
import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
|
|
6
|
+
import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
|
|
7
|
+
import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
8
|
+
import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
|
|
9
|
+
import { EditorPane } from "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane";
|
|
10
|
+
import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
|
|
11
|
+
import { IDebugSession } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
|
|
12
|
+
import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
|
|
13
|
+
import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
|
|
14
|
+
import { IEditorGroup } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService";
|
|
15
|
+
export declare class DisassemblyView extends EditorPane {
|
|
16
|
+
private readonly _configurationService;
|
|
17
|
+
private readonly _instantiationService;
|
|
18
|
+
private readonly _debugService;
|
|
19
|
+
private static readonly NUM_INSTRUCTIONS_TO_LOAD;
|
|
20
|
+
private _fontInfo;
|
|
21
|
+
private _disassembledInstructions;
|
|
22
|
+
private _onDidChangeStackFrame;
|
|
23
|
+
private _previousDebuggingState;
|
|
24
|
+
private _instructionBpList;
|
|
25
|
+
private _enableSourceCodeRender;
|
|
26
|
+
private _loadingLock;
|
|
27
|
+
private readonly _referenceToMemoryAddress;
|
|
28
|
+
constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _debugService: IDebugService);
|
|
29
|
+
get fontInfo(): BareFontInfo;
|
|
30
|
+
private createFontInfo;
|
|
31
|
+
get currentInstructionAddresses(): (bigint | undefined)[];
|
|
32
|
+
get focusedCurrentInstructionReference(): string | undefined;
|
|
33
|
+
get focusedCurrentInstructionAddress(): bigint | undefined;
|
|
34
|
+
get focusedInstructionReference(): string | undefined;
|
|
35
|
+
get focusedInstructionAddress(): bigint | undefined;
|
|
36
|
+
get isSourceCodeRender(): boolean;
|
|
37
|
+
get debugSession(): IDebugSession | undefined;
|
|
38
|
+
get onDidChangeStackFrame(): import("vscode/vscode/vs/base/common/event").Event<void>;
|
|
39
|
+
get focusedAddressAndOffset(): {
|
|
40
|
+
reference: string;
|
|
41
|
+
offset: number;
|
|
42
|
+
address: bigint;
|
|
43
|
+
} | undefined;
|
|
44
|
+
protected createEditor(parent: HTMLElement): void;
|
|
45
|
+
layout(dimension: Dimension): void;
|
|
46
|
+
goToInstructionAndOffset(instructionReference: string, offset: number, focus?: boolean): Promise<void>;
|
|
47
|
+
getReferenceAddress(instructionReference: string): bigint | undefined;
|
|
48
|
+
private goToAddress;
|
|
49
|
+
private scrollUp_LoadDisassembledInstructions;
|
|
50
|
+
private scrollDown_LoadDisassembledInstructions;
|
|
51
|
+
private primeMemoryReference;
|
|
52
|
+
private loadDisassembledInstructions;
|
|
53
|
+
private getIndexFromReferenceAndOffset;
|
|
54
|
+
private getIndexFromAddress;
|
|
55
|
+
private reloadDisassembly;
|
|
56
|
+
private clear;
|
|
57
|
+
}
|
|
58
|
+
export declare class DisassemblyViewContribution implements IWorkbenchContribution {
|
|
59
|
+
private readonly _onDidActiveEditorChangeListener;
|
|
60
|
+
private _onDidChangeModelLanguage;
|
|
61
|
+
private _languageSupportsDisassembleRequest;
|
|
62
|
+
constructor(editorService: IEditorService, debugService: IDebugService, contextKeyService: IContextKeyService);
|
|
63
|
+
dispose(): void;
|
|
64
|
+
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
|
|
3
4
|
import { append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
|
|
4
5
|
import { binarySearch2 } from 'vscode/vscode/vs/base/common/arrays';
|
|
5
6
|
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
6
7
|
import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
7
8
|
import { isAbsolute } from 'vscode/vscode/vs/base/common/path';
|
|
9
|
+
import { Constants } from 'vscode/vscode/vs/base/common/uint';
|
|
8
10
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
9
11
|
import { applyFontInfo } from 'vscode/vscode/vs/editor/browser/config/domFontInfo';
|
|
10
12
|
import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
|
|
@@ -15,6 +17,7 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
|
|
|
15
17
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
16
18
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
17
19
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
20
|
+
import { TextEditorSelectionRevealType } from 'vscode/vscode/vs/platform/editor/common/editor';
|
|
18
21
|
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
19
22
|
import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
|
|
20
23
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
@@ -33,13 +36,13 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
|
33
36
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
34
37
|
import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
|
|
35
38
|
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
36
|
-
import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
|
|
37
|
-
import { topStackFrameColor, focusedStackFrameColor } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
|
|
38
|
-
import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
39
|
-
import { DISASSEMBLY_VIEW_ID, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
39
|
+
import { EditorPane } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane';
|
|
40
|
+
import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
|
|
41
|
+
import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
42
|
+
import { DISASSEMBLY_VIEW_ID, State, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
40
43
|
import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
|
|
41
|
-
import { InstructionBreakpoint } from '@codingame/monaco-vscode-
|
|
42
|
-
import { getUriFromSource } from '@codingame/monaco-vscode-
|
|
44
|
+
import { InstructionBreakpoint } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
|
|
45
|
+
import { getUriFromSource } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugSource';
|
|
43
46
|
import { sourcesEqual, isUri } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
|
|
44
47
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
45
48
|
|
|
@@ -54,7 +57,7 @@ const disassemblyNotAvailable = {
|
|
|
54
57
|
address: 0n,
|
|
55
58
|
instruction: {
|
|
56
59
|
address: '-1',
|
|
57
|
-
instruction: ( localize(
|
|
60
|
+
instruction: ( localize(5399, "Disassembly not available."))
|
|
58
61
|
},
|
|
59
62
|
};
|
|
60
63
|
let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
@@ -68,9 +71,9 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
68
71
|
this._instructionBpList = [];
|
|
69
72
|
this._enableSourceCodeRender = true;
|
|
70
73
|
this._loadingLock = false;
|
|
71
|
-
this._referenceToMemoryAddress = (
|
|
74
|
+
this._referenceToMemoryAddress = ( new Map());
|
|
72
75
|
this._disassembledInstructions = undefined;
|
|
73
|
-
this._onDidChangeStackFrame = this._register((
|
|
76
|
+
this._onDidChangeStackFrame = this._register(( new Emitter({ leakWarningThreshold: 1000 })));
|
|
74
77
|
this._previousDebuggingState = _debugService.state;
|
|
75
78
|
this._register(_configurationService.onDidChangeConfiguration(e => {
|
|
76
79
|
if (e.affectsConfiguration('debug')) {
|
|
@@ -99,14 +102,12 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
99
102
|
return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(this.window).value);
|
|
100
103
|
}
|
|
101
104
|
get currentInstructionAddresses() {
|
|
102
|
-
return (
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
map(ref => ref ? this.getReferenceAddress(ref) : undefined))
|
|
109
|
-
);
|
|
105
|
+
return ( ( ( ( this._debugService.getModel().getSessions(false).
|
|
106
|
+
map(session => session.getAllThreads())).
|
|
107
|
+
reduce((prev, curr) => prev.concat(curr), []).
|
|
108
|
+
map(thread => thread.getTopStackFrame())).
|
|
109
|
+
map(frame => frame?.instructionPointerReference)).
|
|
110
|
+
map(ref => ref ? this.getReferenceAddress(ref) : undefined));
|
|
110
111
|
}
|
|
111
112
|
get focusedCurrentInstructionReference() {
|
|
112
113
|
return this._debugService.getViewModel().focusedStackFrame?.thread.getTopStackFrame()?.instructionPointerReference;
|
|
@@ -168,7 +169,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
168
169
|
project(row) { return row; }
|
|
169
170
|
},
|
|
170
171
|
{
|
|
171
|
-
label: ( localize(
|
|
172
|
+
label: ( localize(5400, "instructions")),
|
|
172
173
|
tooltip: '',
|
|
173
174
|
weight: 0.3,
|
|
174
175
|
templateId: InstructionRenderer.TEMPLATE_ID,
|
|
@@ -186,7 +187,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
186
187
|
multipleSelectionSupport: false,
|
|
187
188
|
setRowLineHeight: false,
|
|
188
189
|
openOnSingleClick: false,
|
|
189
|
-
accessibilityProvider: (
|
|
190
|
+
accessibilityProvider: ( new AccessibilityProvider()),
|
|
190
191
|
mouseSupport: false
|
|
191
192
|
}));
|
|
192
193
|
this._disassembledInstructions.domNode.classList.add('disassembly-view');
|
|
@@ -261,8 +262,8 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
261
262
|
}
|
|
262
263
|
}));
|
|
263
264
|
this._register(this._debugService.onDidChangeState(e => {
|
|
264
|
-
if ((
|
|
265
|
-
(
|
|
265
|
+
if ((e === State.Running || e === State.Stopped) &&
|
|
266
|
+
(this._previousDebuggingState !== State.Running && this._previousDebuggingState !== State.Stopped)) {
|
|
266
267
|
this.clear();
|
|
267
268
|
this._enableSourceCodeRender = this._configurationService.getValue('debug').disassemblyView.showSourceCode;
|
|
268
269
|
}
|
|
@@ -319,7 +320,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
319
320
|
return 0;
|
|
320
321
|
}
|
|
321
322
|
async primeMemoryReference(instructionReference) {
|
|
322
|
-
if ((
|
|
323
|
+
if (( this._referenceToMemoryAddress.has(instructionReference))) {
|
|
323
324
|
return true;
|
|
324
325
|
}
|
|
325
326
|
const s = await this.debugSession?.disassemble(instructionReference, 0, 0, 1);
|
|
@@ -337,7 +338,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
337
338
|
async loadDisassembledInstructions(instructionReference, offset, instructionOffset, instructionCount) {
|
|
338
339
|
const session = this.debugSession;
|
|
339
340
|
const resultEntries = await session?.disassemble(instructionReference, offset, instructionOffset, instructionCount);
|
|
340
|
-
if (!(
|
|
341
|
+
if (!( this._referenceToMemoryAddress.has(instructionReference)) && instructionOffset !== 0) {
|
|
341
342
|
await this.loadDisassembledInstructions(instructionReference, 0, 0, DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD);
|
|
342
343
|
}
|
|
343
344
|
if (session && resultEntries && this._disassembledInstructions) {
|
|
@@ -390,7 +391,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
390
391
|
return 0;
|
|
391
392
|
}
|
|
392
393
|
const refBaseAddress = this._referenceToMemoryAddress.get(instructionReference);
|
|
393
|
-
const bps = (
|
|
394
|
+
const bps = ( this._instructionBpList.map(p => {
|
|
394
395
|
const base = this._referenceToMemoryAddress.get(p.instructionReference);
|
|
395
396
|
if (!base) {
|
|
396
397
|
return undefined;
|
|
@@ -399,7 +400,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
399
400
|
enabled: p.enabled,
|
|
400
401
|
address: base + BigInt(p.offset || 0),
|
|
401
402
|
};
|
|
402
|
-
}))
|
|
403
|
+
}));
|
|
403
404
|
if (refBaseAddress !== undefined) {
|
|
404
405
|
for (const entry of newEntries) {
|
|
405
406
|
const bp = bps.find(p => p?.address === entry.address);
|
|
@@ -480,14 +481,14 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
|
|
|
480
481
|
this._disassembledInstructions?.splice(0, this._disassembledInstructions.length, [disassemblyNotAvailable]);
|
|
481
482
|
}
|
|
482
483
|
};
|
|
483
|
-
DisassemblyView = DisassemblyView_1 = (
|
|
484
|
-
(
|
|
485
|
-
(
|
|
486
|
-
(
|
|
487
|
-
(
|
|
488
|
-
(
|
|
489
|
-
(
|
|
490
|
-
], DisassemblyView))
|
|
484
|
+
DisassemblyView = DisassemblyView_1 = ( __decorate([
|
|
485
|
+
( __param(1, ITelemetryService)),
|
|
486
|
+
( __param(2, IThemeService)),
|
|
487
|
+
( __param(3, IStorageService)),
|
|
488
|
+
( __param(4, IConfigurationService)),
|
|
489
|
+
( __param(5, IInstantiationService)),
|
|
490
|
+
( __param(6, IDebugService))
|
|
491
|
+
], DisassemblyView));
|
|
491
492
|
let BreakpointRenderer = class BreakpointRenderer {
|
|
492
493
|
static { BreakpointRenderer_1 = this; }
|
|
493
494
|
static { this.TEMPLATE_ID = 'breakpoint'; }
|
|
@@ -573,9 +574,9 @@ let BreakpointRenderer = class BreakpointRenderer {
|
|
|
573
574
|
}
|
|
574
575
|
}
|
|
575
576
|
};
|
|
576
|
-
BreakpointRenderer = BreakpointRenderer_1 = (
|
|
577
|
-
(
|
|
578
|
-
], BreakpointRenderer))
|
|
577
|
+
BreakpointRenderer = BreakpointRenderer_1 = ( __decorate([
|
|
578
|
+
( __param(1, IDebugService))
|
|
579
|
+
], BreakpointRenderer));
|
|
579
580
|
let InstructionRenderer = class InstructionRenderer extends Disposable {
|
|
580
581
|
static { InstructionRenderer_1 = this; }
|
|
581
582
|
static { this.TEMPLATE_ID = 'instruction'; }
|
|
@@ -616,12 +617,12 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
|
|
|
616
617
|
templateData.currentElement.element = element;
|
|
617
618
|
const instruction = element.instruction;
|
|
618
619
|
templateData.sourcecode.innerText = '';
|
|
619
|
-
const sb = (
|
|
620
|
+
const sb = ( new StringBuilder(1000));
|
|
620
621
|
if (this._disassemblyView.isSourceCodeRender && element.showSourceLocation && instruction.location?.path && instruction.line !== undefined) {
|
|
621
622
|
const sourceURI = this.getUriFromSource(instruction);
|
|
622
623
|
if (sourceURI) {
|
|
623
624
|
let textModel = undefined;
|
|
624
|
-
const sourceSB = (
|
|
625
|
+
const sourceSB = ( new StringBuilder(10000));
|
|
625
626
|
const ref = await this.textModelService.createModelReference(sourceURI);
|
|
626
627
|
if (templateData.currentElement.element !== element) {
|
|
627
628
|
return;
|
|
@@ -694,21 +695,21 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
|
|
|
694
695
|
startLineNumber: instruction.line,
|
|
695
696
|
endLineNumber: instruction.endLine,
|
|
696
697
|
startColumn: instruction.column || 1,
|
|
697
|
-
endColumn: instruction.endColumn ||
|
|
698
|
+
endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
|
|
698
699
|
} : {
|
|
699
700
|
startLineNumber: instruction.line,
|
|
700
701
|
endLineNumber: instruction.line,
|
|
701
702
|
startColumn: instruction.column || 1,
|
|
702
|
-
endColumn: instruction.endColumn ||
|
|
703
|
+
endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
|
|
703
704
|
};
|
|
704
705
|
this.editorService.openEditor({
|
|
705
706
|
resource: sourceURI,
|
|
706
|
-
description: ( localize(
|
|
707
|
+
description: ( localize(5401, "from disassembly")),
|
|
707
708
|
options: {
|
|
708
709
|
preserveFocus: false,
|
|
709
710
|
selection: selection,
|
|
710
711
|
revealIfOpened: true,
|
|
711
|
-
selectionRevealType:
|
|
712
|
+
selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
|
|
712
713
|
pinned: false,
|
|
713
714
|
}
|
|
714
715
|
});
|
|
@@ -717,7 +718,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
|
|
|
717
718
|
getUriFromSource(instruction) {
|
|
718
719
|
const path = instruction.location.path;
|
|
719
720
|
if (path && isUri(path)) {
|
|
720
|
-
return this.uriService.asCanonicalUri((
|
|
721
|
+
return this.uriService.asCanonicalUri(( URI.parse(path)));
|
|
721
722
|
}
|
|
722
723
|
if (path && isAbsolute(path)) {
|
|
723
724
|
return this.uriService.asCanonicalUri(URI.file(path));
|
|
@@ -729,27 +730,27 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
|
|
|
729
730
|
element.style.whiteSpace = 'pre';
|
|
730
731
|
}
|
|
731
732
|
};
|
|
732
|
-
InstructionRenderer = InstructionRenderer_1 = (
|
|
733
|
-
(
|
|
734
|
-
(
|
|
735
|
-
(
|
|
736
|
-
(
|
|
737
|
-
(
|
|
738
|
-
], InstructionRenderer))
|
|
733
|
+
InstructionRenderer = InstructionRenderer_1 = ( __decorate([
|
|
734
|
+
( __param(1, IThemeService)),
|
|
735
|
+
( __param(2, IEditorService)),
|
|
736
|
+
( __param(3, ITextModelService)),
|
|
737
|
+
( __param(4, IUriIdentityService)),
|
|
738
|
+
( __param(5, ILogService))
|
|
739
|
+
], InstructionRenderer));
|
|
739
740
|
class AccessibilityProvider {
|
|
740
741
|
getWidgetAriaLabel() {
|
|
741
|
-
return
|
|
742
|
+
return localize(5402, "Disassembly View");
|
|
742
743
|
}
|
|
743
744
|
getAriaLabel(element) {
|
|
744
745
|
let label = '';
|
|
745
746
|
const instruction = element.instruction;
|
|
746
747
|
if (instruction.address !== '-1') {
|
|
747
|
-
label += `${( localize(
|
|
748
|
+
label += `${( localize(5403, "Address"))}: ${instruction.address}`;
|
|
748
749
|
}
|
|
749
750
|
if (instruction.instructionBytes) {
|
|
750
|
-
label += `, ${( localize(
|
|
751
|
+
label += `, ${( localize(5404, "Bytes"))}: ${instruction.instructionBytes}`;
|
|
751
752
|
}
|
|
752
|
-
label += `, ${( localize(
|
|
753
|
+
label += `, ${( localize(5405, "Instruction"))}: ${instruction.instruction}`;
|
|
753
754
|
return label;
|
|
754
755
|
}
|
|
755
756
|
}
|
|
@@ -783,10 +784,10 @@ let DisassemblyViewContribution = class DisassemblyViewContribution {
|
|
|
783
784
|
this._onDidChangeModelLanguage?.dispose();
|
|
784
785
|
}
|
|
785
786
|
};
|
|
786
|
-
DisassemblyViewContribution = (
|
|
787
|
-
(
|
|
788
|
-
(
|
|
789
|
-
(
|
|
790
|
-
], DisassemblyViewContribution))
|
|
787
|
+
DisassemblyViewContribution = ( __decorate([
|
|
788
|
+
( __param(0, IEditorService)),
|
|
789
|
+
( __param(1, IDebugService)),
|
|
790
|
+
( __param(2, IContextKeyService))
|
|
791
|
+
], DisassemblyViewContribution));
|
|
791
792
|
|
|
792
793
|
export { DisassemblyView, DisassemblyViewContribution };
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { ZoneWidget } from "vscode/vscode/vs/editor/contrib/zoneWidget/browser/zoneWidget";
|
|
2
|
+
import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
|
|
3
|
+
import { IExceptionInfo, IDebugSession } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
|
|
4
|
+
import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
|
|
5
|
+
import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
|
|
6
|
+
export declare class ExceptionWidget extends ZoneWidget {
|
|
7
|
+
private exceptionInfo;
|
|
8
|
+
private debugSession;
|
|
9
|
+
private readonly instantiationService;
|
|
10
|
+
private backgroundColor;
|
|
11
|
+
constructor(editor: ICodeEditor, exceptionInfo: IExceptionInfo, debugSession: IDebugSession | undefined, themeService: IThemeService, instantiationService: IInstantiationService);
|
|
12
|
+
private applyTheme;
|
|
13
|
+
protected _applyStyles(): void;
|
|
14
|
+
protected _fillContainer(container: HTMLElement): void;
|
|
15
|
+
protected _doLayout(_heightInPixel: number | undefined, _widthInPixel: number | undefined): void;
|
|
16
|
+
focus(): void;
|
|
17
|
+
hasFocus(): boolean;
|
|
18
|
+
}
|