@theia/debug 1.25.0-next.12 → 1.25.0-next.13
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/lib/browser/console/debug-console-contribution.d.ts +3 -2
- package/lib/browser/console/debug-console-contribution.d.ts.map +1 -1
- package/lib/browser/console/debug-console-contribution.js +14 -10
- package/lib/browser/console/debug-console-contribution.js.map +1 -1
- package/lib/browser/editor/debug-breakpoint-widget.d.ts +2 -3
- package/lib/browser/editor/debug-breakpoint-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-breakpoint-widget.js +11 -12
- package/lib/browser/editor/debug-breakpoint-widget.js.map +1 -1
- package/lib/browser/view/debug-configuration-widget.d.ts +3 -2
- package/lib/browser/view/debug-configuration-widget.d.ts.map +1 -1
- package/lib/browser/view/debug-configuration-widget.js +22 -7
- package/lib/browser/view/debug-configuration-widget.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/console/debug-console-contribution.tsx +25 -28
- package/src/browser/editor/debug-breakpoint-widget.tsx +15 -16
- package/src/browser/style/index.css +2 -1
- package/src/browser/view/debug-configuration-widget.tsx +23 -11
|
@@ -7,6 +7,7 @@ import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/li
|
|
|
7
7
|
import { Command, CommandRegistry } from '@theia/core/lib/common/command';
|
|
8
8
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
9
9
|
import * as React from '@theia/core/shared/react';
|
|
10
|
+
import { SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
10
11
|
import { DebugSessionManager, DidChangeActiveDebugSession } from '../debug-session-manager';
|
|
11
12
|
import { DebugConsoleSessionFactory } from './debug-console-session';
|
|
12
13
|
export declare type InDebugReplContextKey = ContextKey<boolean>;
|
|
@@ -29,8 +30,8 @@ export declare class DebugConsoleContribution extends AbstractViewContribution<C
|
|
|
29
30
|
static bindContribution(bind: interfaces.Bind): void;
|
|
30
31
|
protected renderSeveritySelector(widget: Widget | undefined): React.ReactNode;
|
|
31
32
|
protected renderDebugConsoleSelector(widget: Widget | undefined): React.ReactNode;
|
|
32
|
-
protected changeDebugConsole: (
|
|
33
|
-
protected changeSeverity: (
|
|
33
|
+
protected changeDebugConsole: (option: SelectOption) => void;
|
|
34
|
+
protected changeSeverity: (option: SelectOption) => void;
|
|
34
35
|
protected withWidget<T>(widget: Widget | undefined, fn: (widget: ConsoleWidget) => T): T | false;
|
|
35
36
|
/**
|
|
36
37
|
* Clear the console widget.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-console-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAiC,MAAM,EAAiB,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,UAAU,EAAqB,MAAM,6CAA6C,CAAC;AAE5F,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-console-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAiC,MAAM,EAAiB,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,UAAU,EAAqB,MAAM,6CAA6C,CAAC;AAE5F,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAEjG,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAuB,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1F,oBAAY,qBAAqB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;AACxD,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE,yBAAiB,oBAAoB,CAAC;IAE3B,MAAM,cAAc,UAAU,CAAC;IAE/B,MAAM,KAAK,SAKhB,CAAC;CACN;AAED,qBACa,wBAAyB,SAAQ,wBAAwB,CAAC,aAAa,CAAE,YAAW,yBAAyB;IAGtH,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAGjE,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;;IAenD,SAAS,CAAC,IAAI,IAAI,IAAI;IAoBtB,SAAS,CAAC,+BAA+B,CAAC,KAAK,EAAE,2BAA2B,GAAG,IAAI;IAc1E,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAWpD,oBAAoB,CAAC,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBjF,MAAM,CAAC,OAAO,EAAE,cAAc,CAc5B;IAEF,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,aAAa;IAU1D,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI;IAmBpD,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS;IAY7E,SAAS,CAAC,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS;IAkBjF,SAAS,CAAC,kBAAkB,WAAY,YAAY,UAIlD;IAEF,SAAS,CAAC,cAAc,WAAY,YAAY,UAE9C;IAEF,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,oBAA0C,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK;IAOtH;;OAEG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKhD"}
|
|
@@ -36,6 +36,7 @@ const command_1 = require("@theia/core/lib/common/command");
|
|
|
36
36
|
const severity_1 = require("@theia/core/lib/common/severity");
|
|
37
37
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
38
38
|
const React = require("@theia/core/shared/react");
|
|
39
|
+
const select_component_1 = require("@theia/core/lib/browser/widgets/select-component");
|
|
39
40
|
const debug_session_manager_1 = require("../debug-session-manager");
|
|
40
41
|
const debug_console_session_1 = require("./debug-console-session");
|
|
41
42
|
exports.InDebugReplContextKey = Symbol('inDebugReplContextKey');
|
|
@@ -60,13 +61,13 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
|
|
|
60
61
|
toggleCommandId: 'debug:console:toggle',
|
|
61
62
|
toggleKeybinding: 'ctrlcmd+shift+y'
|
|
62
63
|
});
|
|
63
|
-
this.changeDebugConsole = (
|
|
64
|
-
const id =
|
|
64
|
+
this.changeDebugConsole = (option) => {
|
|
65
|
+
const id = option.value;
|
|
65
66
|
const session = this.consoleSessionManager.get(id);
|
|
66
67
|
this.consoleSessionManager.selectedSession = session;
|
|
67
68
|
};
|
|
68
|
-
this.changeSeverity = (
|
|
69
|
-
this.consoleSessionManager.severity = severity_1.Severity.fromValue(
|
|
69
|
+
this.changeSeverity = (option) => {
|
|
70
|
+
this.consoleSessionManager.severity = severity_1.Severity.fromValue(option.value);
|
|
70
71
|
};
|
|
71
72
|
}
|
|
72
73
|
init() {
|
|
@@ -155,19 +156,22 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
|
|
|
155
156
|
}));
|
|
156
157
|
}
|
|
157
158
|
renderSeveritySelector(widget) {
|
|
158
|
-
const severityElements =
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
return React.createElement(
|
|
159
|
+
const severityElements = severity_1.Severity.toArray().map(e => ({
|
|
160
|
+
value: e
|
|
161
|
+
}));
|
|
162
|
+
return React.createElement(select_component_1.SelectComponent, { key: "debugConsoleSeverity", options: severityElements, value: this.consoleSessionManager.severity || severity_1.Severity.Ignore, onChange: this.changeSeverity });
|
|
162
163
|
}
|
|
163
164
|
renderDebugConsoleSelector(widget) {
|
|
164
165
|
const availableConsoles = [];
|
|
165
166
|
this.consoleSessionManager.all.forEach(e => {
|
|
166
167
|
if (e instanceof debug_console_session_1.DebugConsoleSession) {
|
|
167
|
-
availableConsoles.push(
|
|
168
|
+
availableConsoles.push({
|
|
169
|
+
value: e.id,
|
|
170
|
+
label: e.debugSession.label
|
|
171
|
+
});
|
|
168
172
|
}
|
|
169
173
|
});
|
|
170
|
-
return React.createElement(
|
|
174
|
+
return React.createElement(select_component_1.SelectComponent, { key: "debugConsoleSelector", options: availableConsoles, value: 0, onChange: this.changeDebugConsole });
|
|
171
175
|
}
|
|
172
176
|
withWidget(widget = this.tryGetWidget(), fn) {
|
|
173
177
|
if (widget instanceof console_widget_1.ConsoleWidget && widget.id === DebugConsoleContribution_1.options.id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-console-contribution.js","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,gGAA2F;AAC3F,8EAA0F;AAC1F,qDAAyH;AACzH,qFAA4F;AAC5F,oDAAiD;AACjD,mFAAiH;AACjH,4DAA0E;AAC1E,8DAA2D;AAC3D,4DAA6F;AAC7F,kDAAkD;
|
|
1
|
+
{"version":3,"file":"debug-console-contribution.js","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as React from '@theia/core/shared/react';
|
|
2
1
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
3
2
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
4
3
|
import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
|
|
@@ -8,6 +7,7 @@ import { DebugEditor } from './debug-editor';
|
|
|
8
7
|
import { DebugSourceBreakpoint } from '../model/debug-source-breakpoint';
|
|
9
8
|
import { Dimension } from '@theia/editor/lib/browser';
|
|
10
9
|
import * as monaco from '@theia/monaco-editor-core';
|
|
10
|
+
import { SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
11
11
|
export declare type ShowDebugBreakpointOptions = DebugSourceBreakpoint | {
|
|
12
12
|
position: monaco.Position;
|
|
13
13
|
context: DebugBreakpointWidget.Context;
|
|
@@ -39,8 +39,7 @@ export declare class DebugBreakpointWidget implements Disposable {
|
|
|
39
39
|
protected layout(dimension: monaco.editor.IDimension): void;
|
|
40
40
|
protected createInput(node: HTMLElement): Promise<MonacoEditor>;
|
|
41
41
|
protected render(): void;
|
|
42
|
-
protected
|
|
43
|
-
protected readonly updateInput: (e: React.ChangeEvent<HTMLSelectElement>) => void;
|
|
42
|
+
protected readonly updateInput: (option: SelectOption) => void;
|
|
44
43
|
static PLACEHOLDER_DECORATION: string;
|
|
45
44
|
protected updatePlaceholder(): void;
|
|
46
45
|
protected get placeholder(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-breakpoint-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-breakpoint-widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debug-breakpoint-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-breakpoint-widget.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AASpD,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAEjG,oBAAY,0BAA0B,GAAG,qBAAqB,GAAG;IAC7D,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAA;CACzC,GAAG;IACA,UAAU,EAAE,qBAAqB,CAAC;IAClC,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAA;CACzC,CAAC;AAEF,qBACa,qBAAsB,YAAW,UAAU;IAGpD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAG7B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAExD,SAAS,CAAC,UAAU,EAAE,cAAc,CAAC;IAErC,SAAS,CAAC,IAAI,EAAE,sBAAsB,CAAC;IAEvC,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAE1D,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAe;IAC/D,SAAS,CAAC,OAAO,EAAE;SACd,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM;KACtD,CAAM;IACP,IAAI,MAAM,IAAI;SACT,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM;KACtD,GAAG,SAAS,CAQZ;IAED,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAC3C,IAAI,KAAK,IAAI,YAAY,GAAG,SAAS,CAEpC;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAQxC;cAGe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA2DrC,OAAO,IAAI,IAAI;IAIf,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,SAAS,CAG1C;IAED,IAAI,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAgC/C,IAAI,IAAI,IAAI;IAKZ,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI;IAM3D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAM/D,SAAS,CAAC,MAAM,IAAI,IAAI;IAcxB,SAAS,CAAC,QAAQ,CAAC,WAAW,WAAY,YAAY,UASpD;IAEF,MAAM,CAAC,sBAAsB,SAA2B;IACxD,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAqBnC,SAAS,KAAK,WAAW,IAAI,MAAM,CAQlC;CAEJ;AACD,yBAAiB,qBAAqB,CAAC;IACnC,KAAY,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,WAAW,GAAG,cAAc,GAAG,YAAY,CAAC,CAAC;CACjH"}
|
|
@@ -39,16 +39,17 @@ const monaco = require("@theia/monaco-editor-core");
|
|
|
39
39
|
const suggest_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggest");
|
|
40
40
|
const languageFeatures_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures");
|
|
41
41
|
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
42
|
+
const select_component_1 = require("@theia/core/lib/browser/widgets/select-component");
|
|
42
43
|
let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidget {
|
|
43
44
|
constructor() {
|
|
44
45
|
this.toDispose = new core_1.DisposableCollection();
|
|
45
46
|
this.context = 'condition';
|
|
46
47
|
this._values = {};
|
|
47
|
-
this.updateInput = (
|
|
48
|
+
this.updateInput = (option) => {
|
|
48
49
|
if (this._input) {
|
|
49
50
|
this._values[this.context] = this._input.getControl().getValue();
|
|
50
51
|
}
|
|
51
|
-
this.context =
|
|
52
|
+
this.context = option.value;
|
|
52
53
|
this.render();
|
|
53
54
|
if (this._input) {
|
|
54
55
|
this._input.focus();
|
|
@@ -184,13 +185,11 @@ let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidge
|
|
|
184
185
|
if (this._input) {
|
|
185
186
|
this._input.getControl().setValue(this._values[this.context] || '');
|
|
186
187
|
}
|
|
187
|
-
ReactDOM.render(React.createElement(
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
renderOption(context, label) {
|
|
193
|
-
return React.createElement("option", { value: context }, label);
|
|
188
|
+
ReactDOM.render(React.createElement(select_component_1.SelectComponent, { value: this.context, onChange: this.updateInput, options: [
|
|
189
|
+
{ value: 'condition', label: core_1.nls.localizeByDefault('Expression') },
|
|
190
|
+
{ value: 'hitCondition', label: core_1.nls.localizeByDefault('Hit Count') },
|
|
191
|
+
{ value: 'logMessage', label: core_1.nls.localizeByDefault('Log Message') },
|
|
192
|
+
] }), this.selectNode);
|
|
194
193
|
}
|
|
195
194
|
updatePlaceholder() {
|
|
196
195
|
if (!this._input) {
|
|
@@ -215,12 +214,12 @@ let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidge
|
|
|
215
214
|
}
|
|
216
215
|
get placeholder() {
|
|
217
216
|
if (this.context === 'logMessage') {
|
|
218
|
-
return "Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.";
|
|
217
|
+
return core_1.nls.localizeByDefault("Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.");
|
|
219
218
|
}
|
|
220
219
|
if (this.context === 'hitCondition') {
|
|
221
|
-
return "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.";
|
|
220
|
+
return core_1.nls.localizeByDefault("Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
|
|
222
221
|
}
|
|
223
|
-
return "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.";
|
|
222
|
+
return core_1.nls.localizeByDefault("Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
|
|
224
223
|
}
|
|
225
224
|
};
|
|
226
225
|
DebugBreakpointWidget.PLACEHOLDER_DECORATION = 'placeholderDecoration';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-breakpoint-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-breakpoint-widget.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,kDAAkD;AAClD,yDAAyD;AAEzD,4DAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"debug-breakpoint-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-breakpoint-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import * as React from '@theia/core/shared/react';
|
|
3
3
|
import { CommandRegistry } from '@theia/core/lib/common';
|
|
4
|
+
import { SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
4
5
|
import { ReactWidget } from '@theia/core/lib/browser';
|
|
5
6
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
6
7
|
import { DebugConsoleContribution } from '../console/debug-console-contribution';
|
|
@@ -23,10 +24,10 @@ export declare class DebugConfigurationWidget extends ReactWidget {
|
|
|
23
24
|
protected setStepRef: (stepRef: DebugAction | null) => DebugAction | undefined;
|
|
24
25
|
render(): React.ReactNode;
|
|
25
26
|
protected get currentValue(): string;
|
|
26
|
-
protected get options():
|
|
27
|
+
protected get options(): SelectOption[];
|
|
27
28
|
protected toValue({ configuration, workspaceFolderUri }: DebugSessionOptions): string;
|
|
28
29
|
protected toName({ configuration, workspaceFolderUri }: DebugSessionOptions): string;
|
|
29
|
-
protected readonly setCurrentConfiguration: (
|
|
30
|
+
protected readonly setCurrentConfiguration: (option: SelectOption) => void;
|
|
30
31
|
protected readonly start: () => void;
|
|
31
32
|
protected readonly openConfiguration: () => Promise<void>;
|
|
32
33
|
protected readonly openConsole: () => Promise<import("@theia/console/lib/browser/console-widget").ConsoleWidget>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,eAAe,EAAc,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-configuration-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,eAAe,EAAc,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAEjG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D,qBACa,wBAAyB,SAAQ,WAAW;IAGrD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,wBAAwB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,IAAI,IAAI,IAAI;IAStB,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,OAAO,IAAI,OAAO;IAO5B,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,UAAU,YAAa,WAAW,GAAG,IAAI,6BAAyC;IAE5F,MAAM,IAAI,KAAK,CAAC,SAAS;IAUzB,SAAS,KAAK,YAAY,IAAI,MAAM,CAGnC;IACD,SAAS,KAAK,OAAO,IAAI,YAAY,EAAE,CAmBtC;IACD,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,mBAAmB,GAAG,MAAM;IAMrF,SAAS,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,mBAAmB,GAAG,MAAM;IAOpF,SAAS,CAAC,QAAQ,CAAC,uBAAuB,WAAY,YAAY,UAQhE;IAEF,SAAS,CAAC,QAAQ,CAAC,KAAK,aAGtB;IAEF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,sBAA0C;IAC9E,SAAS,CAAC,QAAQ,CAAC,WAAW,mFAE3B;CAEN"}
|
|
@@ -28,6 +28,7 @@ exports.DebugConfigurationWidget = void 0;
|
|
|
28
28
|
const React = require("@theia/core/shared/react");
|
|
29
29
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
30
30
|
const common_1 = require("@theia/core/lib/common");
|
|
31
|
+
const select_component_1 = require("@theia/core/lib/browser/widgets/select-component");
|
|
31
32
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
32
33
|
const browser_1 = require("@theia/core/lib/browser");
|
|
33
34
|
const browser_2 = require("@theia/workspace/lib/browser");
|
|
@@ -42,8 +43,8 @@ let DebugConfigurationWidget = class DebugConfigurationWidget extends browser_1.
|
|
|
42
43
|
constructor() {
|
|
43
44
|
super(...arguments);
|
|
44
45
|
this.setStepRef = (stepRef) => this.stepRef = stepRef || undefined;
|
|
45
|
-
this.setCurrentConfiguration = (
|
|
46
|
-
const value =
|
|
46
|
+
this.setCurrentConfiguration = (option) => {
|
|
47
|
+
const value = option.value;
|
|
47
48
|
if (value === '__ADD_CONF__') {
|
|
48
49
|
this.manager.addConfiguration();
|
|
49
50
|
}
|
|
@@ -86,10 +87,7 @@ let DebugConfigurationWidget = class DebugConfigurationWidget extends browser_1.
|
|
|
86
87
|
const { options } = this;
|
|
87
88
|
return React.createElement(React.Fragment, null,
|
|
88
89
|
React.createElement(debug_action_1.DebugAction, { run: this.start, label: nls_1.nls.localizeByDefault('Start Debugging'), iconClass: 'debug-start', ref: this.setStepRef }),
|
|
89
|
-
React.createElement(
|
|
90
|
-
options.length ? options : React.createElement("option", { value: '__NO_CONF__' }, nls_1.nls.localizeByDefault('No Configurations')),
|
|
91
|
-
React.createElement("option", { disabled: true }, 'Add Configuration...'.replace(/./g, '-')),
|
|
92
|
-
React.createElement("option", { value: '__ADD_CONF__' }, nls_1.nls.localizeByDefault('Add Configuration...'))),
|
|
90
|
+
React.createElement(select_component_1.SelectComponent, { options: options, value: this.currentValue, onChange: option => this.setCurrentConfiguration(option) }),
|
|
93
91
|
React.createElement(debug_action_1.DebugAction, { run: this.openConfiguration, label: nls_1.nls.localizeByDefault('Open {0}', '"launch.json"'), iconClass: 'settings-gear' }),
|
|
94
92
|
React.createElement(debug_action_1.DebugAction, { run: this.openConsole, label: nls_1.nls.localizeByDefault('Debug Console'), iconClass: 'terminal' }));
|
|
95
93
|
}
|
|
@@ -98,7 +96,24 @@ let DebugConfigurationWidget = class DebugConfigurationWidget extends browser_1.
|
|
|
98
96
|
return current ? this.toValue(current) : '__NO_CONF__';
|
|
99
97
|
}
|
|
100
98
|
get options() {
|
|
101
|
-
|
|
99
|
+
const items = Array.from(this.manager.all).map(option => ({
|
|
100
|
+
value: this.toValue(option),
|
|
101
|
+
label: this.toName(option)
|
|
102
|
+
}));
|
|
103
|
+
if (items.length === 0) {
|
|
104
|
+
items.push({
|
|
105
|
+
value: '__NO_CONF__',
|
|
106
|
+
label: nls_1.nls.localizeByDefault('No Configurations')
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
items.push({
|
|
110
|
+
separator: true
|
|
111
|
+
});
|
|
112
|
+
items.push({
|
|
113
|
+
value: '__ADD_CONF__',
|
|
114
|
+
label: nls_1.nls.localizeByDefault('Add Configuration...')
|
|
115
|
+
});
|
|
116
|
+
return items;
|
|
102
117
|
}
|
|
103
118
|
toValue({ configuration, workspaceFolderUri }) {
|
|
104
119
|
if (!workspaceFolderUri) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,kDAAkD;AAClD,4DAAiF;AACjF,mDAAqE;AACrE,oDAA6C;AAC7C,qDAAsD;AACtD,0DAAgE;AAChE,sFAAiF;AACjF,gFAA2E;AAC3E,oEAA+D;AAC/D,iDAA6C;AAC7C,yDAAoD;AAEpD,wGAA2E;AAC3E,oDAAiD;AAGjD,IAAa,wBAAwB,GAArC,MAAa,wBAAyB,SAAQ,qBAAW;IAAzD;;QA4Cc,eAAU,GAAG,CAAC,OAA2B,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-configuration-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.25.0-next.
|
|
3
|
+
"version": "1.25.0-next.13+a26657ad4fe",
|
|
4
4
|
"description": "Theia - Debug Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/console": "1.25.0-next.
|
|
7
|
-
"@theia/core": "1.25.0-next.
|
|
8
|
-
"@theia/editor": "1.25.0-next.
|
|
9
|
-
"@theia/filesystem": "1.25.0-next.
|
|
10
|
-
"@theia/markers": "1.25.0-next.
|
|
11
|
-
"@theia/monaco": "1.25.0-next.
|
|
6
|
+
"@theia/console": "1.25.0-next.13+a26657ad4fe",
|
|
7
|
+
"@theia/core": "1.25.0-next.13+a26657ad4fe",
|
|
8
|
+
"@theia/editor": "1.25.0-next.13+a26657ad4fe",
|
|
9
|
+
"@theia/filesystem": "1.25.0-next.13+a26657ad4fe",
|
|
10
|
+
"@theia/markers": "1.25.0-next.13+a26657ad4fe",
|
|
11
|
+
"@theia/monaco": "1.25.0-next.13+a26657ad4fe",
|
|
12
12
|
"@theia/monaco-editor-core": "1.65.2",
|
|
13
|
-
"@theia/output": "1.25.0-next.
|
|
14
|
-
"@theia/process": "1.25.0-next.
|
|
15
|
-
"@theia/task": "1.25.0-next.
|
|
16
|
-
"@theia/terminal": "1.25.0-next.
|
|
17
|
-
"@theia/variable-resolver": "1.25.0-next.
|
|
18
|
-
"@theia/workspace": "1.25.0-next.
|
|
13
|
+
"@theia/output": "1.25.0-next.13+a26657ad4fe",
|
|
14
|
+
"@theia/process": "1.25.0-next.13+a26657ad4fe",
|
|
15
|
+
"@theia/task": "1.25.0-next.13+a26657ad4fe",
|
|
16
|
+
"@theia/terminal": "1.25.0-next.13+a26657ad4fe",
|
|
17
|
+
"@theia/variable-resolver": "1.25.0-next.13+a26657ad4fe",
|
|
18
|
+
"@theia/workspace": "1.25.0-next.13+a26657ad4fe",
|
|
19
19
|
"jsonc-parser": "^2.2.0",
|
|
20
20
|
"mkdirp": "^0.5.0",
|
|
21
21
|
"p-debounce": "^2.1.0",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"nyc": {
|
|
69
69
|
"extends": "../../configs/nyc.json"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "a26657ad4feac81c3ba1e233512813319f96052b"
|
|
72
72
|
}
|
|
@@ -24,6 +24,7 @@ import { Command, CommandRegistry } from '@theia/core/lib/common/command';
|
|
|
24
24
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
25
25
|
import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
|
|
26
26
|
import * as React from '@theia/core/shared/react';
|
|
27
|
+
import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
27
28
|
import { DebugSession } from '../debug-session';
|
|
28
29
|
import { DebugSessionManager, DidChangeActiveDebugSession } from '../debug-session-manager';
|
|
29
30
|
import { DebugConsoleSession, DebugConsoleSessionFactory } from './debug-console-session';
|
|
@@ -181,47 +182,43 @@ export class DebugConsoleContribution extends AbstractViewContribution<ConsoleWi
|
|
|
181
182
|
}
|
|
182
183
|
|
|
183
184
|
protected renderSeveritySelector(widget: Widget | undefined): React.ReactNode {
|
|
184
|
-
const severityElements:
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
return <
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
onChange={this.changeSeverity}
|
|
194
|
-
>
|
|
195
|
-
{severityElements}
|
|
196
|
-
</select>;
|
|
185
|
+
const severityElements: SelectOption[] = Severity.toArray().map(e => ({
|
|
186
|
+
value: e
|
|
187
|
+
}));
|
|
188
|
+
|
|
189
|
+
return <SelectComponent
|
|
190
|
+
key="debugConsoleSeverity"
|
|
191
|
+
options={severityElements}
|
|
192
|
+
value={this.consoleSessionManager.severity || Severity.Ignore}
|
|
193
|
+
onChange={this.changeSeverity} />;
|
|
197
194
|
}
|
|
198
195
|
|
|
199
196
|
protected renderDebugConsoleSelector(widget: Widget | undefined): React.ReactNode {
|
|
200
|
-
const availableConsoles:
|
|
197
|
+
const availableConsoles: SelectOption[] = [];
|
|
201
198
|
this.consoleSessionManager.all.forEach(e => {
|
|
202
199
|
if (e instanceof DebugConsoleSession) {
|
|
203
|
-
availableConsoles.push(
|
|
200
|
+
availableConsoles.push({
|
|
201
|
+
value: e.id,
|
|
202
|
+
label: e.debugSession.label
|
|
203
|
+
});
|
|
204
204
|
}
|
|
205
205
|
});
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
value={
|
|
211
|
-
onChange={this.changeDebugConsole}
|
|
212
|
-
>
|
|
213
|
-
{availableConsoles}
|
|
214
|
-
</select>;
|
|
206
|
+
|
|
207
|
+
return <SelectComponent
|
|
208
|
+
key="debugConsoleSelector"
|
|
209
|
+
options={availableConsoles}
|
|
210
|
+
value={0}
|
|
211
|
+
onChange={this.changeDebugConsole} />;
|
|
215
212
|
}
|
|
216
213
|
|
|
217
|
-
protected changeDebugConsole = (
|
|
218
|
-
const id =
|
|
214
|
+
protected changeDebugConsole = (option: SelectOption) => {
|
|
215
|
+
const id = option.value!;
|
|
219
216
|
const session = this.consoleSessionManager.get(id);
|
|
220
217
|
this.consoleSessionManager.selectedSession = session;
|
|
221
218
|
};
|
|
222
219
|
|
|
223
|
-
protected changeSeverity = (
|
|
224
|
-
this.consoleSessionManager.severity = Severity.fromValue(
|
|
220
|
+
protected changeSeverity = (option: SelectOption) => {
|
|
221
|
+
this.consoleSessionManager.severity = Severity.fromValue(option.value);
|
|
225
222
|
};
|
|
226
223
|
|
|
227
224
|
protected withWidget<T>(widget: Widget | undefined = this.tryGetWidget(), fn: (widget: ConsoleWidget) => T): T | false {
|
|
@@ -18,7 +18,7 @@ import * as React from '@theia/core/shared/react';
|
|
|
18
18
|
import * as ReactDOM from '@theia/core/shared/react-dom';
|
|
19
19
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
20
20
|
import { injectable, postConstruct, inject } from '@theia/core/shared/inversify';
|
|
21
|
-
import { Disposable, DisposableCollection } from '@theia/core';
|
|
21
|
+
import { Disposable, DisposableCollection, nls } from '@theia/core';
|
|
22
22
|
import URI from '@theia/core/lib/common/uri';
|
|
23
23
|
import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
|
|
24
24
|
import { MonacoEditorZoneWidget } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
|
|
@@ -35,6 +35,7 @@ import { CompletionItemKind, CompletionContext } from '@theia/monaco-editor-core
|
|
|
35
35
|
import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
|
|
36
36
|
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
37
37
|
import { TextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model/textModel';
|
|
38
|
+
import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
38
39
|
|
|
39
40
|
export type ShowDebugBreakpointOptions = DebugSourceBreakpoint | {
|
|
40
41
|
position: monaco.Position,
|
|
@@ -212,23 +213,21 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
212
213
|
if (this._input) {
|
|
213
214
|
this._input.getControl().setValue(this._values[this.context] || '');
|
|
214
215
|
}
|
|
215
|
-
ReactDOM.render(<
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
216
|
+
ReactDOM.render(<SelectComponent
|
|
217
|
+
value={this.context} onChange={this.updateInput}
|
|
218
|
+
options={[
|
|
219
|
+
{ value: 'condition', label: nls.localizeByDefault('Expression') },
|
|
220
|
+
{ value: 'hitCondition', label: nls.localizeByDefault('Hit Count') },
|
|
221
|
+
{ value: 'logMessage', label: nls.localizeByDefault('Log Message') },
|
|
222
|
+
]}
|
|
223
|
+
/>, this.selectNode);
|
|
222
224
|
}
|
|
223
225
|
|
|
224
|
-
protected
|
|
225
|
-
return <option value={context}>{label}</option>;
|
|
226
|
-
}
|
|
227
|
-
protected readonly updateInput = (e: React.ChangeEvent<HTMLSelectElement>) => {
|
|
226
|
+
protected readonly updateInput = (option: SelectOption) => {
|
|
228
227
|
if (this._input) {
|
|
229
228
|
this._values[this.context] = this._input.getControl().getValue();
|
|
230
229
|
}
|
|
231
|
-
this.context =
|
|
230
|
+
this.context = option.value as DebugBreakpointWidget.Context;
|
|
232
231
|
this.render();
|
|
233
232
|
if (this._input) {
|
|
234
233
|
this._input.focus();
|
|
@@ -259,12 +258,12 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
259
258
|
}
|
|
260
259
|
protected get placeholder(): string {
|
|
261
260
|
if (this.context === 'logMessage') {
|
|
262
|
-
return "Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.";
|
|
261
|
+
return nls.localizeByDefault("Message to log when breakpoint is hit. Expressions within {} are interpolated. 'Enter' to accept, 'esc' to cancel.");
|
|
263
262
|
}
|
|
264
263
|
if (this.context === 'hitCondition') {
|
|
265
|
-
return "Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.";
|
|
264
|
+
return nls.localizeByDefault("Break when hit count condition is met. 'Enter' to accept, 'esc' to cancel.");
|
|
266
265
|
}
|
|
267
|
-
return "Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.";
|
|
266
|
+
return nls.localizeByDefault("Break when expression evaluates to true. 'Enter' to accept, 'esc' to cancel.");
|
|
268
267
|
}
|
|
269
268
|
|
|
270
269
|
}
|
|
@@ -125,9 +125,10 @@
|
|
|
125
125
|
border-bottom: 1px solid var(--theia-sideBarSectionHeader-border);
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
.debug-toolbar .
|
|
128
|
+
.debug-toolbar .theia-select-component {
|
|
129
129
|
width: 100%;
|
|
130
130
|
min-width: 40px;
|
|
131
|
+
margin: 0px 4px;
|
|
131
132
|
}
|
|
132
133
|
|
|
133
134
|
.debug-toolbar .debug-action {
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
18
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
19
19
|
import { CommandRegistry, Disposable } from '@theia/core/lib/common';
|
|
20
|
+
import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
20
21
|
import URI from '@theia/core/lib/common/uri';
|
|
21
22
|
import { ReactWidget } from '@theia/core/lib/browser';
|
|
22
23
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
@@ -80,11 +81,7 @@ export class DebugConfigurationWidget extends ReactWidget {
|
|
|
80
81
|
const { options } = this;
|
|
81
82
|
return <React.Fragment>
|
|
82
83
|
<DebugAction run={this.start} label={nls.localizeByDefault('Start Debugging')} iconClass='debug-start' ref={this.setStepRef} />
|
|
83
|
-
<
|
|
84
|
-
{options.length ? options : <option value='__NO_CONF__'>{nls.localizeByDefault('No Configurations')}</option>}
|
|
85
|
-
<option disabled>{'Add Configuration...'.replace(/./g, '-')}</option>
|
|
86
|
-
<option value='__ADD_CONF__'>{nls.localizeByDefault('Add Configuration...')}</option>
|
|
87
|
-
</select>
|
|
84
|
+
<SelectComponent options={options} value={this.currentValue} onChange={option => this.setCurrentConfiguration(option)} />
|
|
88
85
|
<DebugAction run={this.openConfiguration} label={nls.localizeByDefault('Open {0}', '"launch.json"')}
|
|
89
86
|
iconClass='settings-gear' />
|
|
90
87
|
<DebugAction run={this.openConsole} label={nls.localizeByDefault('Debug Console')} iconClass='terminal' />
|
|
@@ -94,10 +91,25 @@ export class DebugConfigurationWidget extends ReactWidget {
|
|
|
94
91
|
const { current } = this.manager;
|
|
95
92
|
return current ? this.toValue(current) : '__NO_CONF__';
|
|
96
93
|
}
|
|
97
|
-
protected get options():
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
94
|
+
protected get options(): SelectOption[] {
|
|
95
|
+
const items: SelectOption[] = Array.from(this.manager.all).map(option => ({
|
|
96
|
+
value: this.toValue(option),
|
|
97
|
+
label: this.toName(option)
|
|
98
|
+
}));
|
|
99
|
+
if (items.length === 0) {
|
|
100
|
+
items.push({
|
|
101
|
+
value: '__NO_CONF__',
|
|
102
|
+
label: nls.localizeByDefault('No Configurations')
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
items.push({
|
|
106
|
+
separator: true
|
|
107
|
+
});
|
|
108
|
+
items.push({
|
|
109
|
+
value: '__ADD_CONF__',
|
|
110
|
+
label: nls.localizeByDefault('Add Configuration...')
|
|
111
|
+
});
|
|
112
|
+
return items;
|
|
101
113
|
}
|
|
102
114
|
protected toValue({ configuration, workspaceFolderUri }: DebugSessionOptions): string {
|
|
103
115
|
if (!workspaceFolderUri) {
|
|
@@ -112,8 +124,8 @@ export class DebugConfigurationWidget extends ReactWidget {
|
|
|
112
124
|
return configuration.name + ' (' + new URI(workspaceFolderUri).path.base + ')';
|
|
113
125
|
}
|
|
114
126
|
|
|
115
|
-
protected readonly setCurrentConfiguration = (
|
|
116
|
-
const value =
|
|
127
|
+
protected readonly setCurrentConfiguration = (option: SelectOption) => {
|
|
128
|
+
const value = option.value!;
|
|
117
129
|
if (value === '__ADD_CONF__') {
|
|
118
130
|
this.manager.addConfiguration();
|
|
119
131
|
} else {
|