@codingame/monaco-vscode-debug-service-override 1.85.6 → 2.0.0-v2.1
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/debug.js +3 -3
- package/package.json +5 -5
- package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +24 -24
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +46 -46
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +97 -97
- package/vscode/src/vs/workbench/contrib/debug/browser/debugANSIHandling.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +28 -28
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +27 -27
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +46 -46
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +30 -30
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +36 -36
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +41 -41
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +26 -26
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.js +7 -7
- package/vscode/src/vs/workbench/contrib/debug/browser/debugProgress.js +4 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +46 -46
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +28 -28
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +8 -8
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +23 -23
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +37 -48
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +17 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +24 -24
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +23 -23
- package/vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +24 -24
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +28 -28
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +19 -19
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/replFilter.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +30 -30
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +27 -27
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +15 -15
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +12 -12
- package/vscode/src/vs/workbench/contrib/debug/common/breakpoints.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugCompoundRoot.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +11 -11
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +5 -5
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +42 -42
- package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/common/debugTelemetry.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugViewModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +19 -19
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +10 -10
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +6 -6
- package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +20 -20
- package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js +5 -5
- package/vscode/src/vs/editor/common/services/languageFeaturesService.js +0 -45
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { flatten, distinct } from '
|
|
3
|
-
import { sequence } from '
|
|
4
|
-
import { CancellationTokenSource, CancellationToken } from '
|
|
5
|
-
import { Emitter, Event } from '
|
|
6
|
-
import
|
|
7
|
-
import { DisposableStore, dispose } from '
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import { URI } from '
|
|
11
|
-
import
|
|
12
|
-
import { IConfigurationService } from '
|
|
13
|
-
import { IContextKeyService } from '
|
|
14
|
-
import { IFileService } from '
|
|
15
|
-
import { IInstantiationService } from '
|
|
16
|
-
import { Extensions } from '
|
|
17
|
-
import { IQuickInputService } from '
|
|
18
|
-
import { Registry } from '
|
|
19
|
-
import { IStorageService } from '
|
|
20
|
-
import { ThemeIcon } from '
|
|
21
|
-
import { IUriIdentityService } from '
|
|
22
|
-
import { IWorkspaceContextService } from '
|
|
2
|
+
import { flatten, distinct } from 'vscode/vscode/vs/base/common/arrays';
|
|
3
|
+
import { sequence } from 'vscode/vscode/vs/base/common/async';
|
|
4
|
+
import { CancellationTokenSource, CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
|
|
5
|
+
import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
|
|
6
|
+
import { parse } from 'vscode/vscode/vs/base/common/json';
|
|
7
|
+
import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
8
|
+
import { deepClone } from 'vscode/vscode/vs/base/common/objects';
|
|
9
|
+
import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
10
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
11
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
12
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
13
|
+
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
14
|
+
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
|
|
15
|
+
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
16
|
+
import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
|
|
17
|
+
import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
|
|
18
|
+
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
19
|
+
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
20
|
+
import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
|
|
21
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
22
|
+
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
|
|
23
23
|
import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
|
|
24
24
|
import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
25
25
|
import { launchSchema } from '../common/debugSchemas.js';
|
|
@@ -175,7 +175,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
175
175
|
config,
|
|
176
176
|
buttons: [{
|
|
177
177
|
iconClass: ThemeIcon.asClassName(debugConfigure),
|
|
178
|
-
tooltip: (
|
|
178
|
+
tooltip: ( localizeWithPath(
|
|
179
179
|
'vs/workbench/contrib/debug/browser/debugConfigurationManager',
|
|
180
180
|
'editLaunchConfig',
|
|
181
181
|
"Edit Debug Configuration in launch.json"
|
|
@@ -188,7 +188,7 @@ let ConfigurationManager = class ConfigurationManager {
|
|
|
188
188
|
const disposables = ( new DisposableStore());
|
|
189
189
|
const input = disposables.add(this.quickInputService.createQuickPick());
|
|
190
190
|
input.busy = true;
|
|
191
|
-
input.placeholder = (
|
|
191
|
+
input.placeholder = ( localizeWithPath(
|
|
192
192
|
'vs/workbench/contrib/debug/browser/debugConfigurationManager',
|
|
193
193
|
'selectConfiguration',
|
|
194
194
|
"Select Launch Configuration"
|
|
@@ -439,7 +439,7 @@ class AbstractLaunch {
|
|
|
439
439
|
}
|
|
440
440
|
}
|
|
441
441
|
getConfiguration(name) {
|
|
442
|
-
const config =
|
|
442
|
+
const config = deepClone(this.getConfig());
|
|
443
443
|
if (!config || !config.configurations) {
|
|
444
444
|
return undefined;
|
|
445
445
|
}
|
|
@@ -482,7 +482,7 @@ let Launch = class Launch extends AbstractLaunch {
|
|
|
482
482
|
this.configurationService = configurationService;
|
|
483
483
|
}
|
|
484
484
|
get uri() {
|
|
485
|
-
return
|
|
485
|
+
return joinPath(this.workspace.uri, '/.vscode/launch.json');
|
|
486
486
|
}
|
|
487
487
|
get name() {
|
|
488
488
|
return this.workspace.name;
|
|
@@ -508,7 +508,7 @@ let Launch = class Launch extends AbstractLaunch {
|
|
|
508
508
|
await this.textFileService.write(resource, content);
|
|
509
509
|
}
|
|
510
510
|
catch (error) {
|
|
511
|
-
throw new Error(
|
|
511
|
+
throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugConfigurationManager', 'DebugConfig.failed', "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).", error.message));
|
|
512
512
|
}
|
|
513
513
|
}
|
|
514
514
|
const index = content.indexOf(`"${this.configurationManager.selectedConfiguration.name}"`);
|
|
@@ -534,7 +534,7 @@ let Launch = class Launch extends AbstractLaunch {
|
|
|
534
534
|
});
|
|
535
535
|
}
|
|
536
536
|
async writeConfiguration(configuration) {
|
|
537
|
-
const fullConfig =
|
|
537
|
+
const fullConfig = deepClone(this.getConfig());
|
|
538
538
|
if (!fullConfig.configurations) {
|
|
539
539
|
fullConfig.configurations = [];
|
|
540
540
|
}
|
|
@@ -562,7 +562,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
|
|
|
562
562
|
return this.contextService.getWorkspace().configuration;
|
|
563
563
|
}
|
|
564
564
|
get name() {
|
|
565
|
-
return (
|
|
565
|
+
return ( localizeWithPath(
|
|
566
566
|
'vs/workbench/contrib/debug/browser/debugConfigurationManager',
|
|
567
567
|
'workspace',
|
|
568
568
|
"workspace"
|
|
@@ -576,7 +576,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
|
|
|
576
576
|
if (!launchExistInFile) {
|
|
577
577
|
const content = await this.getInitialConfigurationContent(undefined, type, useInitialConfigs, token);
|
|
578
578
|
if (content) {
|
|
579
|
-
await this.configurationService.updateValue('launch',
|
|
579
|
+
await this.configurationService.updateValue('launch', parse(content), 5 );
|
|
580
580
|
}
|
|
581
581
|
else {
|
|
582
582
|
return { editor: null, created: false };
|
|
@@ -610,7 +610,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
|
|
|
610
610
|
return this.preferencesService.userSettingsResource;
|
|
611
611
|
}
|
|
612
612
|
get name() {
|
|
613
|
-
return (
|
|
613
|
+
return ( localizeWithPath(
|
|
614
614
|
'vs/workbench/contrib/debug/browser/debugConfigurationManager',
|
|
615
615
|
'user settings',
|
|
616
616
|
"user settings"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { matchesFuzzy } from '
|
|
3
|
-
import { localizeWithPath } from '
|
|
4
|
-
import { ICommandService } from '
|
|
2
|
+
import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
|
|
3
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
4
|
+
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
|
|
5
5
|
import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
|
|
6
6
|
import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
|
|
7
7
|
import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from './debugCommands.js';
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { getDomNodePagePosition } from '
|
|
2
|
-
import { Action } from '
|
|
3
|
-
import { KeyChord } from '
|
|
4
|
-
import { EditorAction, registerEditorAction } from '
|
|
5
|
-
import { ICodeEditorService } from '
|
|
6
|
-
import { Position } from '
|
|
7
|
-
import { EditorContextKeys } from '
|
|
8
|
-
import { ILanguageFeaturesService } from '
|
|
9
|
-
import { MessageController } from '
|
|
10
|
-
import
|
|
11
|
-
import { Action2, MenuId, registerAction2 } from '
|
|
12
|
-
import { IConfigurationService } from '
|
|
13
|
-
import { ContextKeyExpr } from '
|
|
14
|
-
import { IContextMenuService } from '
|
|
15
|
-
import { IUriIdentityService } from '
|
|
1
|
+
import { getDomNodePagePosition } from 'vscode/vscode/vs/base/browser/dom';
|
|
2
|
+
import { Action } from 'vscode/vscode/vs/base/common/actions';
|
|
3
|
+
import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
4
|
+
import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
|
|
5
|
+
import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
|
|
6
|
+
import { Position } from 'vscode/vscode/vs/editor/common/core/position';
|
|
7
|
+
import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
|
|
8
|
+
import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
|
|
9
|
+
import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
|
|
10
|
+
import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
|
|
11
|
+
import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
|
|
12
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
13
|
+
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
14
|
+
import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
|
|
15
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
16
16
|
import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
|
|
17
17
|
import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
|
|
18
18
|
import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
|
|
@@ -27,13 +27,13 @@ class ToggleBreakpointAction extends Action2 {
|
|
|
27
27
|
super({
|
|
28
28
|
id: 'editor.debug.action.toggleBreakpoint',
|
|
29
29
|
title: {
|
|
30
|
-
value: (
|
|
30
|
+
value: ( localizeWithPath(
|
|
31
31
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
32
32
|
'toggleBreakpointAction',
|
|
33
33
|
"Debug: Toggle Breakpoint"
|
|
34
34
|
)),
|
|
35
35
|
original: 'Debug: Toggle Breakpoint',
|
|
36
|
-
mnemonicTitle: (
|
|
36
|
+
mnemonicTitle: ( localizeWithPath(
|
|
37
37
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
38
38
|
{ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] },
|
|
39
39
|
"Toggle &&Breakpoint"
|
|
@@ -93,7 +93,7 @@ class ConditionalBreakpointAction extends EditorAction {
|
|
|
93
93
|
constructor() {
|
|
94
94
|
super({
|
|
95
95
|
id: 'editor.debug.action.conditionalBreakpoint',
|
|
96
|
-
label: (
|
|
96
|
+
label: ( localizeWithPath(
|
|
97
97
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
98
98
|
'conditionalBreakpointEditorAction',
|
|
99
99
|
"Debug: Add Conditional Breakpoint..."
|
|
@@ -102,7 +102,7 @@ class ConditionalBreakpointAction extends EditorAction {
|
|
|
102
102
|
precondition: CONTEXT_DEBUGGERS_AVAILABLE,
|
|
103
103
|
menuOpts: {
|
|
104
104
|
menuId: MenuId.MenubarNewBreakpointMenu,
|
|
105
|
-
title: (
|
|
105
|
+
title: ( localizeWithPath(
|
|
106
106
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
107
107
|
{ key: 'miConditionalBreakpoint', comment: ['&& denotes a mnemonic'] },
|
|
108
108
|
"&&Conditional Breakpoint..."
|
|
@@ -125,7 +125,7 @@ class LogPointAction extends EditorAction {
|
|
|
125
125
|
constructor() {
|
|
126
126
|
super({
|
|
127
127
|
id: 'editor.debug.action.addLogPoint',
|
|
128
|
-
label: (
|
|
128
|
+
label: ( localizeWithPath(
|
|
129
129
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
130
130
|
'logPointEditorAction',
|
|
131
131
|
"Debug: Add Logpoint..."
|
|
@@ -135,7 +135,7 @@ class LogPointAction extends EditorAction {
|
|
|
135
135
|
menuOpts: [
|
|
136
136
|
{
|
|
137
137
|
menuId: MenuId.MenubarNewBreakpointMenu,
|
|
138
|
-
title: (
|
|
138
|
+
title: ( localizeWithPath(
|
|
139
139
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
140
140
|
{ key: 'miLogPoint', comment: ['&& denotes a mnemonic'] },
|
|
141
141
|
"&&Logpoint..."
|
|
@@ -159,7 +159,7 @@ class EditBreakpointAction extends EditorAction {
|
|
|
159
159
|
constructor() {
|
|
160
160
|
super({
|
|
161
161
|
id: 'editor.debug.action.editBreakpoint',
|
|
162
|
-
label: (
|
|
162
|
+
label: ( localizeWithPath(
|
|
163
163
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
164
164
|
'EditBreakpointEditorAction',
|
|
165
165
|
"Debug: Edit Breakpoint"
|
|
@@ -168,7 +168,7 @@ class EditBreakpointAction extends EditorAction {
|
|
|
168
168
|
precondition: CONTEXT_DEBUGGERS_AVAILABLE,
|
|
169
169
|
menuOpts: {
|
|
170
170
|
menuId: MenuId.MenubarNewBreakpointMenu,
|
|
171
|
-
title: (
|
|
171
|
+
title: ( localizeWithPath(
|
|
172
172
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
173
173
|
{ key: 'miEditBreakpoint', comment: ['&& denotes a mnemonic'] },
|
|
174
174
|
"&&Edit Breakpoint"
|
|
@@ -207,13 +207,13 @@ class OpenDisassemblyViewAction extends Action2 {
|
|
|
207
207
|
super({
|
|
208
208
|
id: OpenDisassemblyViewAction.ID,
|
|
209
209
|
title: {
|
|
210
|
-
value: (
|
|
210
|
+
value: ( localizeWithPath(
|
|
211
211
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
212
212
|
'openDisassemblyView',
|
|
213
213
|
"Open Disassembly View"
|
|
214
214
|
)),
|
|
215
215
|
original: 'Open Disassembly View',
|
|
216
|
-
mnemonicTitle: (
|
|
216
|
+
mnemonicTitle: ( localizeWithPath(
|
|
217
217
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
218
218
|
{ key: 'miDisassemblyView', comment: ['&& denotes a mnemonic'] },
|
|
219
219
|
"&&DisassemblyView"
|
|
@@ -252,13 +252,13 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
|
|
|
252
252
|
super({
|
|
253
253
|
id: ToggleDisassemblyViewSourceCodeAction.ID,
|
|
254
254
|
title: {
|
|
255
|
-
value: (
|
|
255
|
+
value: ( localizeWithPath(
|
|
256
256
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
257
257
|
'toggleDisassemblyViewSourceCode',
|
|
258
258
|
"Toggle Source Code in Disassembly View"
|
|
259
259
|
)),
|
|
260
260
|
original: 'Toggle Source Code in Disassembly View',
|
|
261
|
-
mnemonicTitle: (
|
|
261
|
+
mnemonicTitle: ( localizeWithPath(
|
|
262
262
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
263
263
|
{ key: 'mitogglesource', comment: ['&& denotes a mnemonic'] },
|
|
264
264
|
"&&ToggleSource"
|
|
@@ -277,7 +277,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
|
|
|
277
277
|
}
|
|
278
278
|
class RunToCursorAction extends EditorAction {
|
|
279
279
|
static { this.ID = 'editor.debug.action.runToCursor'; }
|
|
280
|
-
static { this.LABEL = (
|
|
280
|
+
static { this.LABEL = ( localize2WithPath(
|
|
281
281
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
282
282
|
'runToCursor',
|
|
283
283
|
"Run to Cursor"
|
|
@@ -314,7 +314,7 @@ class RunToCursorAction extends EditorAction {
|
|
|
314
314
|
}
|
|
315
315
|
class SelectionToReplAction extends EditorAction {
|
|
316
316
|
static { this.ID = 'editor.debug.action.selectionToRepl'; }
|
|
317
|
-
static { this.LABEL = (
|
|
317
|
+
static { this.LABEL = ( localize2WithPath(
|
|
318
318
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
319
319
|
'evaluateInDebugConsole',
|
|
320
320
|
"Evaluate in Debug Console"
|
|
@@ -353,7 +353,7 @@ class SelectionToReplAction extends EditorAction {
|
|
|
353
353
|
}
|
|
354
354
|
class SelectionToWatchExpressionsAction extends EditorAction {
|
|
355
355
|
static { this.ID = 'editor.debug.action.selectionToWatch'; }
|
|
356
|
-
static { this.LABEL = (
|
|
356
|
+
static { this.LABEL = ( localize2WithPath(
|
|
357
357
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
358
358
|
'addToWatch',
|
|
359
359
|
"Add to Watch"
|
|
@@ -402,7 +402,7 @@ class ShowDebugHoverAction extends EditorAction {
|
|
|
402
402
|
constructor() {
|
|
403
403
|
super({
|
|
404
404
|
id: 'editor.debug.action.showDebugHover',
|
|
405
|
-
label: (
|
|
405
|
+
label: ( localizeWithPath(
|
|
406
406
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
407
407
|
'showDebugHover',
|
|
408
408
|
"Debug: Show Hover"
|
|
@@ -424,14 +424,14 @@ class ShowDebugHoverAction extends EditorAction {
|
|
|
424
424
|
return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
|
|
425
425
|
}
|
|
426
426
|
}
|
|
427
|
-
const NO_TARGETS_MESSAGE = (
|
|
427
|
+
const NO_TARGETS_MESSAGE = ( localizeWithPath(
|
|
428
428
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
429
429
|
'editor.debug.action.stepIntoTargets.notAvailable',
|
|
430
430
|
"Step targets are not available here"
|
|
431
431
|
));
|
|
432
432
|
class StepIntoTargetsAction extends EditorAction {
|
|
433
433
|
static { this.ID = 'editor.debug.action.stepIntoTargets'; }
|
|
434
|
-
static { this.LABEL = (
|
|
434
|
+
static { this.LABEL = ( localizeWithPath(
|
|
435
435
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
436
436
|
{ key: 'stepIntoTargets', comment: ['Step Into Targets lets the user step into an exact function he or she is interested in.'] },
|
|
437
437
|
"Step Into Target"
|
|
@@ -540,7 +540,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
|
|
|
540
540
|
constructor() {
|
|
541
541
|
super(true, {
|
|
542
542
|
id: 'editor.debug.action.goToNextBreakpoint',
|
|
543
|
-
label: (
|
|
543
|
+
label: ( localizeWithPath(
|
|
544
544
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
545
545
|
'goToNextBreakpoint',
|
|
546
546
|
"Debug: Go to Next Breakpoint"
|
|
@@ -554,7 +554,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
|
|
|
554
554
|
constructor() {
|
|
555
555
|
super(false, {
|
|
556
556
|
id: 'editor.debug.action.goToPreviousBreakpoint',
|
|
557
|
-
label: (
|
|
557
|
+
label: ( localizeWithPath(
|
|
558
558
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
559
559
|
'goToPreviousBreakpoint',
|
|
560
560
|
"Debug: Go to Previous Breakpoint"
|
|
@@ -568,7 +568,7 @@ class CloseExceptionWidgetAction extends EditorAction {
|
|
|
568
568
|
constructor() {
|
|
569
569
|
super({
|
|
570
570
|
id: 'editor.debug.action.closeExceptionWidget',
|
|
571
|
-
label: (
|
|
571
|
+
label: ( localizeWithPath(
|
|
572
572
|
'vs/workbench/contrib/debug/browser/debugEditorActions',
|
|
573
573
|
'closeExceptionWidget',
|
|
574
574
|
"Close Exception Widget"
|
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { addDisposableListener, isKeyboardEvent } from '
|
|
3
|
-
import { DomEmitter } from '
|
|
4
|
-
import { StandardKeyboardEvent } from '
|
|
5
|
-
import { flatten, distinct } from '
|
|
6
|
-
import { RunOnceScheduler } from '
|
|
7
|
-
import { CancellationToken, CancellationTokenSource } from '
|
|
8
|
-
import { memoize } from '
|
|
9
|
-
import { illegalArgument, onUnexpectedExternalError } from '
|
|
10
|
-
import { Event } from '
|
|
11
|
-
import { visit } from '
|
|
2
|
+
import { addDisposableListener, isKeyboardEvent } from 'vscode/vscode/vs/base/browser/dom';
|
|
3
|
+
import { DomEmitter } from 'vscode/vscode/vs/base/browser/event';
|
|
4
|
+
import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
|
|
5
|
+
import { flatten, distinct } from 'vscode/vscode/vs/base/common/arrays';
|
|
6
|
+
import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
|
|
7
|
+
import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
|
|
8
|
+
import { memoize } from 'vscode/vscode/vs/base/common/decorators';
|
|
9
|
+
import { illegalArgument, onUnexpectedExternalError } from 'vscode/vscode/vs/base/common/errors';
|
|
10
|
+
import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
11
|
+
import { visit } from 'vscode/vscode/vs/base/common/json';
|
|
12
12
|
import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
|
|
13
|
-
import { dispose } from '
|
|
14
|
-
import { basename } from '
|
|
15
|
-
import
|
|
16
|
-
import
|
|
17
|
-
import { assertType, isDefined } from '
|
|
18
|
-
import { URI } from '
|
|
19
|
-
import { CoreEditingCommands } from '
|
|
20
|
-
import { EditOperation } from '
|
|
21
|
-
import { Position } from '
|
|
22
|
-
import { Range } from '
|
|
23
|
-
import { DEFAULT_WORD_REGEXP } from '
|
|
24
|
-
import { InjectedTextCursorStops } from '
|
|
25
|
-
import { ILanguageFeatureDebounceService } from '
|
|
26
|
-
import { ILanguageFeaturesService } from '
|
|
27
|
-
import { IModelService } from '
|
|
28
|
-
import { ModesHoverController } from '
|
|
29
|
-
import
|
|
30
|
-
import { CommandsRegistry, ICommandService } from '
|
|
31
|
-
import { IConfigurationService } from '
|
|
32
|
-
import { IContextKeyService } from '
|
|
33
|
-
import { IInstantiationService } from '
|
|
34
|
-
import { registerColor } from '
|
|
35
|
-
import { IUriIdentityService } from '
|
|
13
|
+
import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
14
|
+
import { basename } from 'vscode/vscode/vs/base/common/path';
|
|
15
|
+
import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
|
|
16
|
+
import { format, noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
|
|
17
|
+
import { assertType, isDefined } from 'vscode/vscode/vs/base/common/types';
|
|
18
|
+
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
19
|
+
import { CoreEditingCommands } from 'vscode/vscode/vs/editor/browser/coreCommands';
|
|
20
|
+
import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
|
|
21
|
+
import { Position } from 'vscode/vscode/vs/editor/common/core/position';
|
|
22
|
+
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
23
|
+
import { DEFAULT_WORD_REGEXP } from 'vscode/vscode/vs/editor/common/core/wordHelper';
|
|
24
|
+
import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
|
|
25
|
+
import { ILanguageFeatureDebounceService } from 'vscode/vscode/vs/editor/common/services/languageFeatureDebounce';
|
|
26
|
+
import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
|
|
27
|
+
import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
|
|
28
|
+
import { ModesHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hover';
|
|
29
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
30
|
+
import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
|
|
31
|
+
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
|
|
32
|
+
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
33
|
+
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
34
|
+
import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
|
|
35
|
+
import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
|
|
36
36
|
import { DebugHoverWidget } from './debugHover.js';
|
|
37
37
|
import { ExceptionWidget } from './exceptionWidget.js';
|
|
38
38
|
import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
|
|
@@ -48,7 +48,7 @@ registerColor('editor.inlineValuesForeground', {
|
|
|
48
48
|
light: '#00000080',
|
|
49
49
|
hcDark: '#ffffff80',
|
|
50
50
|
hcLight: '#00000080'
|
|
51
|
-
}, (
|
|
51
|
+
}, ( localizeWithPath(
|
|
52
52
|
'vs/workbench/contrib/debug/browser/debugEditorContribution',
|
|
53
53
|
'editor.inlineValuesForeground',
|
|
54
54
|
"Color for the debug inline value text."
|
|
@@ -58,7 +58,7 @@ registerColor('editor.inlineValuesBackground', {
|
|
|
58
58
|
light: '#ffc80033',
|
|
59
59
|
hcDark: '#ffc80033',
|
|
60
60
|
hcLight: '#ffc80033'
|
|
61
|
-
}, (
|
|
61
|
+
}, ( localizeWithPath(
|
|
62
62
|
'vs/workbench/contrib/debug/browser/debugEditorContribution',
|
|
63
63
|
'editor.inlineValuesBackground',
|
|
64
64
|
"Color for the debug inline value background."
|
|
@@ -84,7 +84,7 @@ function createInlineValueDecoration(lineNumber, contentText, column = 107374182
|
|
|
84
84
|
options: {
|
|
85
85
|
description: 'debug-inline-value-decoration-spacer',
|
|
86
86
|
after: {
|
|
87
|
-
content:
|
|
87
|
+
content: noBreakWhitespace,
|
|
88
88
|
cursorStops: InjectedTextCursorStops.None
|
|
89
89
|
},
|
|
90
90
|
showIfCollapsed: true,
|
|
@@ -111,7 +111,7 @@ function createInlineValueDecoration(lineNumber, contentText, column = 107374182
|
|
|
111
111
|
];
|
|
112
112
|
}
|
|
113
113
|
function replaceWsWithNoBreakWs(str) {
|
|
114
|
-
return str.replace(/[ \t]/g,
|
|
114
|
+
return str.replace(/[ \t]/g, noBreakWhitespace);
|
|
115
115
|
}
|
|
116
116
|
function createInlineValueDecorationsInsideRange(expressions, range, model, wordToLineNumbersMap) {
|
|
117
117
|
const nameValueMap = ( new Map());
|
|
@@ -382,7 +382,7 @@ let DebugEditorContribution = class DebugEditorContribution {
|
|
|
382
382
|
return;
|
|
383
383
|
}
|
|
384
384
|
const target = mouseEvent.target;
|
|
385
|
-
const stopKey =
|
|
385
|
+
const stopKey = isMacintosh ? 'metaKey' : 'ctrlKey';
|
|
386
386
|
if (!this.altPressed) {
|
|
387
387
|
if (target.type === 2 ) {
|
|
388
388
|
this.editor.updateOptions({ hover: { enabled: true } });
|
|
@@ -408,7 +408,7 @@ let DebugEditorContribution = class DebugEditorContribution {
|
|
|
408
408
|
}
|
|
409
409
|
}
|
|
410
410
|
onKeyDown(e) {
|
|
411
|
-
const stopKey =
|
|
411
|
+
const stopKey = isMacintosh ? 57 : 5 ;
|
|
412
412
|
if (e.keyCode !== stopKey) {
|
|
413
413
|
this.hideHoverWidget();
|
|
414
414
|
}
|
|
@@ -590,7 +590,7 @@ let DebugEditorContribution = class DebugEditorContribution {
|
|
|
590
590
|
}
|
|
591
591
|
const value = await findVariable(va, iv.caseSensitiveLookup);
|
|
592
592
|
if (value) {
|
|
593
|
-
text =
|
|
593
|
+
text = format(var_value_format, va, value);
|
|
594
594
|
}
|
|
595
595
|
break;
|
|
596
596
|
}
|
|
@@ -604,7 +604,7 @@ let DebugEditorContribution = class DebugEditorContribution {
|
|
|
604
604
|
const expression = ( new Expression(expr));
|
|
605
605
|
await expression.evaluate(stackFrame.thread.session, stackFrame, 'watch', true);
|
|
606
606
|
if (expression.available) {
|
|
607
|
-
text =
|
|
607
|
+
text = format(var_value_format, expr, expression.value);
|
|
608
608
|
}
|
|
609
609
|
}
|
|
610
610
|
break;
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import
|
|
3
|
-
import { DomScrollableElement } from '
|
|
4
|
-
import { coalesce } from '
|
|
5
|
-
import { CancellationTokenSource } from '
|
|
6
|
-
import
|
|
7
|
-
import { clamp } from '
|
|
8
|
-
import { isMacintosh } from '
|
|
9
|
-
import { Range } from '
|
|
10
|
-
import { ModelDecorationOptions } from '
|
|
11
|
-
import { ILanguageFeaturesService } from '
|
|
12
|
-
import
|
|
13
|
-
import { IInstantiationService } from '
|
|
14
|
-
import { WorkbenchAsyncDataTree } from '
|
|
15
|
-
import { ILogService } from '
|
|
16
|
-
import { editorHoverBackground, asCssVariable, editorHoverBorder, editorHoverForeground } from '
|
|
2
|
+
import { append, addStandardDisposableListener, isAncestorOfActiveElement, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
|
|
3
|
+
import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
|
|
4
|
+
import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
|
|
5
|
+
import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
|
|
6
|
+
import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
7
|
+
import { clamp } from 'vscode/vscode/vs/base/common/numbers';
|
|
8
|
+
import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
|
|
9
|
+
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
10
|
+
import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
|
|
11
|
+
import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
|
|
12
|
+
import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
13
|
+
import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
14
|
+
import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
|
|
15
|
+
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
|
|
16
|
+
import { editorHoverBackground, asCssVariable, editorHoverBorder, editorHoverForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
|
|
17
17
|
import { renderExpressionValue } from './baseDebugView.js';
|
|
18
18
|
import { LinkDetector } from './linkDetector.js';
|
|
19
19
|
import { VariablesRenderer } from './variablesView.js';
|
|
@@ -22,7 +22,7 @@ import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/c
|
|
|
22
22
|
import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
|
|
23
23
|
|
|
24
24
|
var DebugHoverWidget_1;
|
|
25
|
-
const $ =
|
|
25
|
+
const $ = $$1;
|
|
26
26
|
async function doFindExpression(container, namesToFind) {
|
|
27
27
|
if (!container) {
|
|
28
28
|
return null;
|
|
@@ -63,12 +63,12 @@ let DebugHoverWidget = class DebugHoverWidget {
|
|
|
63
63
|
}
|
|
64
64
|
create() {
|
|
65
65
|
this.domNode = $('.debug-hover-widget');
|
|
66
|
-
this.complexValueContainer =
|
|
67
|
-
this.complexValueTitle =
|
|
68
|
-
this.treeContainer =
|
|
66
|
+
this.complexValueContainer = append(this.domNode, $('.complex-value'));
|
|
67
|
+
this.complexValueTitle = append(this.complexValueContainer, $('.title'));
|
|
68
|
+
this.treeContainer = append(this.complexValueContainer, $('.debug-hover-tree'));
|
|
69
69
|
this.treeContainer.setAttribute('role', 'tree');
|
|
70
|
-
const tip =
|
|
71
|
-
tip.textContent = (
|
|
70
|
+
const tip = append(this.complexValueContainer, $('.tip'));
|
|
71
|
+
tip.textContent = ( localizeWithPath(
|
|
72
72
|
'vs/workbench/contrib/debug/browser/debugHover',
|
|
73
73
|
{ key: 'quickTip', comment: ['"switch to editor language hover" means to show the programming language hover widget instead of the debug hover'] },
|
|
74
74
|
'Hold {0} key to switch to editor language hover',
|
|
@@ -110,7 +110,7 @@ let DebugHoverWidget = class DebugHoverWidget {
|
|
|
110
110
|
this.editor.addContentWidget(this);
|
|
111
111
|
}
|
|
112
112
|
registerListeners() {
|
|
113
|
-
this.toDispose.push(
|
|
113
|
+
this.toDispose.push(addStandardDisposableListener(this.domNode, 'keydown', (e) => {
|
|
114
114
|
if (e.equals(9 )) {
|
|
115
115
|
this.hide();
|
|
116
116
|
}
|
|
@@ -253,7 +253,7 @@ let DebugHoverWidget = class DebugHoverWidget {
|
|
|
253
253
|
if (!this._isVisible) {
|
|
254
254
|
return;
|
|
255
255
|
}
|
|
256
|
-
if (
|
|
256
|
+
if (isAncestorOfActiveElement(this.domNode)) {
|
|
257
257
|
this.editor.focus();
|
|
258
258
|
}
|
|
259
259
|
this._isVisible = false;
|
|
@@ -268,7 +268,7 @@ let DebugHoverWidget = class DebugHoverWidget {
|
|
|
268
268
|
} : null;
|
|
269
269
|
}
|
|
270
270
|
dispose() {
|
|
271
|
-
this.toDispose =
|
|
271
|
+
this.toDispose = dispose(this.toDispose);
|
|
272
272
|
}
|
|
273
273
|
};
|
|
274
274
|
DebugHoverWidget = DebugHoverWidget_1 = ( __decorate([
|
|
@@ -277,14 +277,14 @@ DebugHoverWidget = DebugHoverWidget_1 = ( __decorate([
|
|
|
277
277
|
], DebugHoverWidget));
|
|
278
278
|
class DebugHoverAccessibilityProvider {
|
|
279
279
|
getWidgetAriaLabel() {
|
|
280
|
-
return (
|
|
280
|
+
return ( localizeWithPath(
|
|
281
281
|
'vs/workbench/contrib/debug/browser/debugHover',
|
|
282
282
|
'treeAriaLabel',
|
|
283
283
|
"Debug Hover"
|
|
284
284
|
));
|
|
285
285
|
}
|
|
286
286
|
getAriaLabel(element) {
|
|
287
|
-
return (
|
|
287
|
+
return ( localizeWithPath(
|
|
288
288
|
'vs/workbench/contrib/debug/browser/debugHover',
|
|
289
289
|
{ key: 'variableAriaLabel', comment: ['Do not translate placeholders. Placeholders are name and value of a variable.'] },
|
|
290
290
|
"{0}, value {1}, variables, debug",
|