@theia/debug 1.25.0-next.4 → 1.25.0-next.42
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/debug-session-manager.d.ts +3 -3
- package/lib/browser/debug-session-manager.d.ts.map +1 -1
- package/lib/browser/debug-session-manager.js +21 -5
- package/lib/browser/debug-session-manager.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/lib/common/debug-service.d.ts +4 -4
- package/lib/common/debug-service.d.ts.map +1 -1
- package/lib/common/debug-service.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/console/debug-console-contribution.tsx +25 -28
- package/src/browser/debug-session-manager.ts +42 -8
- 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
- package/src/common/debug-service.ts +10 -4
|
@@ -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":";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;AAClD,uFAAiG;AAEjG,oEAA4F;AAC5F,mEAA0F;AAG7E,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAErE,IAAiB,oBAAoB,CAUpC;AAVD,WAAiB,oBAAoB;IAEpB,mCAAc,GAAG,OAAO,CAAC;IAEzB,0BAAK,GAAG,iBAAO,CAAC,yBAAyB,CAAC;QACnD,EAAE,EAAE,qBAAqB;QACzB,QAAQ,EAAE,qBAAA,cAAc;QACxB,KAAK,EAAE,eAAe;QACtB,SAAS,EAAE,IAAA,iBAAO,EAAC,WAAW,CAAC;KAClC,CAAC,CAAC;AACP,CAAC,EAVgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAUpC;AAGD,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,kCAAuC;IAWjF;QACI,KAAK,CAAC;YACF,QAAQ,EAAE,0BAAwB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,EAAE,0BAAwB,CAAC,OAAO,CAAC,KAAM,CAAC,KAAM;YAC1D,oBAAoB,EAAE;gBAClB,IAAI,EAAE,QAAQ;aACjB;YACD,eAAe,EAAE,sBAAsB;YACvC,gBAAgB,EAAE,iBAAiB;SACtC,CAAC,CAAC;QAkJG,uBAAkB,GAAG,CAAC,MAAoB,EAAE,EAAE;YACpD,MAAM,EAAE,GAAG,MAAM,CAAC,KAAM,CAAC;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnD,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,OAAO,CAAC;QACzD,CAAC,CAAC;QAEQ,mBAAc,GAAG,CAAC,MAAoB,EAAE,EAAE;YAChD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,mBAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3E,CAAC,CAAC;IAzJF,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE;YACvD,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAClD,IAAI,aAAa,EAAE;gBACf,MAAM,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC9E,IAAI,oBAAoB,YAAY,2CAAmB,EAAE;oBACrD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;iBAC3G;aACJ;iBAAM;gBACH,MAAM,cAAc,GAAG,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;gBAChE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAC/C,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;aAC3E;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7G,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE;YACxD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,+BAA+B,CAAC,KAAkC;QACxE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,SAAS,CAAC;SAC1D;aAAM;YACH,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC;YACtE,MAAM,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,cAAc,CAAC;YAC5D,MAAM,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;YACxE,IAAI,cAAc,IAAI,eAAe,YAAY,iBAAiB,EAAE;gBAChE,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,EAAE,CAAC;aAC7C;SACJ;IACL,CAAC;IAEQ,gBAAgB,CAAC,QAAyB;QAC/C,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjC,QAAQ,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE;YACjD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC;YACxD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC;YACxD,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC5C,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,CAAC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,eAAsC;QAC7D,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,wBAAwB;YAC5B,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACrD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC;YACxD,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,mBAAmB;SAC9D,CAAC,CAAC;QAEH,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,gCAAgC;YACpC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC;YACzD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;SAChG,CAAC,CAAC;QAEH,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE;YACtC,OAAO,EAAE,oBAAoB,CAAC,KAAK,CAAC,KAAK;YACzC,QAAQ,EAAE,CAAC;SACd,CAAC,CAAC;IACP,CAAC;IAkBD,MAAM,CAAC,MAAM,CAAC,MAA4B;QACtC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAwB,6BAAqB,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,8BAAa,CAAC,eAAe,CAAC,MAAM,kCAC3C,0BAAwB,CAAC,OAAO,KACnC,oBAAoB,IACtB,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,IAAqB;QACzC,IAAI,CAAC,6BAAqB,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACzD,SAAS,CAAC,GAAG,CAAoB,uCAAiB,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CACtF,CAAC,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,CAAC;QACpD,IAAI,CAAC,kDAA0B,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAqB,EAAE,EAAE;YAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,2CAAmB,CAAC,CAAC;YAClE,cAAc,CAAC,YAAY,GAAG,OAAO,CAAC;YACtC,OAAO,cAAc,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACxD,IAAA,8BAAoB,EAAC,IAAI,EAAE,0BAAwB,CAAC,CAAC;QACrD,IAAI,CAAC,2CAAyB,CAAC,CAAC,SAAS,CAAC,0BAAwB,CAAC,CAAC;QACpE,IAAI,CAAC,uBAAa,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YACnD,EAAE,EAAE,0BAAwB,CAAC,OAAO,CAAC,EAAE;YACvC,YAAY,EAAE,GAAG,EAAE,CAAC,0BAAwB,CAAC,MAAM,CAAC,SAAS,CAAC;SACjE,CAAC,CAAC,CAAC;IACR,CAAC;IAES,sBAAsB,CAAC,MAA0B;QACvD,MAAM,gBAAgB,GAAmB,mBAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClE,KAAK,EAAE,CAAC;SACX,CAAC,CAAC,CAAC;QAEJ,OAAO,oBAAC,kCAAe,IACnB,GAAG,EAAC,sBAAsB,EAC1B,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,IAAI,mBAAQ,CAAC,MAAM,EAC7D,QAAQ,EAAE,IAAI,CAAC,cAAc,GAAI,CAAC;IAC1C,CAAC;IAES,0BAA0B,CAAC,MAA0B;QAC3D,MAAM,iBAAiB,GAAmB,EAAE,CAAC;QAC7C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvC,IAAI,CAAC,YAAY,2CAAmB,EAAE;gBAClC,iBAAiB,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,CAAC,CAAC,EAAE;oBACX,KAAK,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK;iBAC9B,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,oBAAC,kCAAe,IACnB,GAAG,EAAC,sBAAsB,EAC1B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,IAAI,CAAC,kBAAkB,GAAI,CAAC;IAC9C,CAAC;IAYS,UAAU,CAAI,SAA6B,IAAI,CAAC,YAAY,EAAE,EAAE,EAAgC;QACtG,IAAI,MAAM,YAAY,8BAAa,IAAI,MAAM,CAAC,EAAE,KAAK,0BAAwB,CAAC,OAAO,CAAC,EAAE,EAAE;YACtF,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;SACrB;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,YAAY;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QACjC,MAAM,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;CAEJ,CAAA;AApGU,gCAAO,GAAmB;IAC7B,EAAE,EAAE,eAAe;IACnB,KAAK,EAAE;QACH,KAAK,EAAE,SAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC;QAC7C,SAAS,EAAE,IAAA,iBAAO,EAAC,eAAe,CAAC;KACtC;IACD,KAAK,EAAE;QACH,GAAG,EAAE,2CAAmB,CAAC,GAAG;QAC5B,OAAO,EAAE;YACL,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;SAChB;KACJ;CACH,CAAA;AAtGF;IADC,IAAA,kBAAM,EAAC,+CAAqB,CAAC;8BACG,+CAAqB;uEAAC;AAGvD;IADC,IAAA,kBAAM,EAAC,kDAA0B,CAAC;;4EAC8B;AAGjE;IADC,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BACG,2CAAmB;qEAAC;AAenD;IADC,IAAA,yBAAa,GAAE;;;;oDAmBf;AA1CQ,wBAAwB;IADpC,IAAA,sBAAU,GAAE;;GACA,wBAAwB,CA+LpC;AA/LY,4DAAwB"}
|
|
@@ -84,10 +84,10 @@ export declare class DebugSessionManager {
|
|
|
84
84
|
start(options: DebugSessionOptions): Promise<DebugSession | undefined>;
|
|
85
85
|
protected fireWillStartDebugSession(): Promise<void>;
|
|
86
86
|
protected configurationIds: Map<string, number>;
|
|
87
|
-
protected resolveConfiguration(options: Readonly<DebugSessionOptions>): Promise<InternalDebugSessionOptions>;
|
|
88
|
-
protected resolveDebugConfiguration(configuration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration>;
|
|
87
|
+
protected resolveConfiguration(options: Readonly<DebugSessionOptions>): Promise<InternalDebugSessionOptions | undefined | null>;
|
|
88
|
+
protected resolveDebugConfiguration(configuration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined | null>;
|
|
89
89
|
protected fireWillResolveDebugConfiguration(debugType: string): Promise<void>;
|
|
90
|
-
protected resolveDebugConfigurationWithSubstitutedVariables(configuration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration>;
|
|
90
|
+
protected resolveDebugConfigurationWithSubstitutedVariables(configuration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined | null>;
|
|
91
91
|
protected doStart(sessionId: string, options: DebugSessionOptions): Promise<DebugSession>;
|
|
92
92
|
protected cleanup(session: DebugSession): void;
|
|
93
93
|
protected doRestart(session: DebugSession, isRestart: boolean): Promise<DebugSession | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-manager.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"debug-session-manager.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,6 +117,17 @@ let DebugSessionManager = class DebugSessionManager {
|
|
|
117
117
|
}
|
|
118
118
|
await this.fireWillStartDebugSession();
|
|
119
119
|
const resolved = await this.resolveConfiguration(options);
|
|
120
|
+
if (!resolved) {
|
|
121
|
+
// As per vscode API: https://code.visualstudio.com/api/references/vscode-api#DebugConfigurationProvider
|
|
122
|
+
// "Returning the value 'undefined' prevents the debug session from starting.
|
|
123
|
+
// Returning the value 'null' prevents the debug session from starting and opens the
|
|
124
|
+
// underlying debug configuration instead."
|
|
125
|
+
// eslint-disable-next-line no-null/no-null
|
|
126
|
+
if (resolved === null) {
|
|
127
|
+
this.debugConfigurationManager.openConfiguration();
|
|
128
|
+
}
|
|
129
|
+
return undefined;
|
|
130
|
+
}
|
|
120
131
|
// preLaunchTask isn't run in case of auto restart as well as postDebugTask
|
|
121
132
|
if (!options.configuration.__restart) {
|
|
122
133
|
const taskRun = await this.runTask(options.workspaceFolderUri, resolved.configuration.preLaunchTask, true);
|
|
@@ -147,11 +158,16 @@ let DebugSessionManager = class DebugSessionManager {
|
|
|
147
158
|
}
|
|
148
159
|
const { workspaceFolderUri } = options;
|
|
149
160
|
let configuration = await this.resolveDebugConfiguration(options.configuration, workspaceFolderUri);
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
161
|
+
if (configuration) {
|
|
162
|
+
configuration = await this.variableResolver.resolve(configuration, {
|
|
163
|
+
context: options.workspaceFolderUri ? new uri_1.default(options.workspaceFolderUri) : undefined,
|
|
164
|
+
configurationSection: 'launch',
|
|
165
|
+
});
|
|
166
|
+
configuration = await this.resolveDebugConfigurationWithSubstitutedVariables(configuration, workspaceFolderUri);
|
|
167
|
+
}
|
|
168
|
+
if (!configuration) {
|
|
169
|
+
return configuration;
|
|
170
|
+
}
|
|
155
171
|
const key = configuration.name + workspaceFolderUri;
|
|
156
172
|
const id = this.configurationIds.has(key) ? this.configurationIds.get(key) + 1 : 0;
|
|
157
173
|
this.configurationIds.set(key, id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-manager.js","sourceRoot":"","sources":["../../src/browser/debug-session-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"debug-session-manager.js","sourceRoot":"","sources":["../../src/browser/debug-session-manager.ts"],"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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"}
|
|
@@ -51,16 +51,16 @@ export interface DebugService extends Disposable {
|
|
|
51
51
|
* Resolves a [debug configuration](#DebugConfiguration) by filling in missing values
|
|
52
52
|
* or by adding/changing/removing attributes before variable substitution.
|
|
53
53
|
* @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
|
|
54
|
-
* @returns The resolved debug configuration.
|
|
54
|
+
* @returns The resolved debug configuration, undefined or null.
|
|
55
55
|
*/
|
|
56
|
-
resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration>;
|
|
56
|
+
resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined | null>;
|
|
57
57
|
/**
|
|
58
58
|
* Resolves a [debug configuration](#DebugConfiguration) by filling in missing values
|
|
59
59
|
* or by adding/changing/removing attributes with substituted variables.
|
|
60
60
|
* @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
|
|
61
|
-
* @returns The resolved debug configuration.
|
|
61
|
+
* @returns The resolved debug configuration, undefined or null.
|
|
62
62
|
*/
|
|
63
|
-
resolveDebugConfigurationWithSubstitutedVariables(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration>;
|
|
63
|
+
resolveDebugConfigurationWithSubstitutedVariables(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined | null>;
|
|
64
64
|
/**
|
|
65
65
|
* Creates a new [debug adapter session](#DebugAdapterSession).
|
|
66
66
|
* @param config The resolved [debug configuration](#DebugConfiguration).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,oBAAoB,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAa,SAAQ,UAAU;IAC5C;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAE1E;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAE/D,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAE1D;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAErH;;OAEG;IACH,iCAAiC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAEpF;;;;;OAKG;IACH,yBAAyB,
|
|
1
|
+
{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,oBAAoB,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAa,SAAQ,UAAU;IAC5C;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAE1E;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAE/D,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAE1D;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAErH;;OAEG;IACH,iCAAiC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAEpF;;;;;OAKG;IACH,yBAAyB,CACrB,MAAM,EAAE,kBAAkB,EAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACvC,OAAO,CAAC,kBAAkB,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;IAElD;;;;;OAKG;IACH,iDAAiD,CAC7C,MAAM,EAAE,kBAAkB,EAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACvC,OAAO,CAAC,kBAAkB,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;IAElD;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEhE;;OAEG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAE1D,yBAAiB,UAAU,CAAC;IACjB,MAAM,QAAQ;;MAGlB,CAAC;CACP;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IAEzC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IACzC,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1D,KAAK,IAAI,IAAI,CAAC;CACjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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;;;AAKhF,gFAA4E;AAS5E;;GAEG;AACU,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C;;GAEG;AACU,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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;;;AAKhF,gFAA4E;AAS5E;;GAEG;AACU,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C;;GAEG;AACU,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AA4EnD;;GAEG;AACU,QAAA,gBAAgB,GAAG,yBAAyB,CAAC;AAE1D,IAAiB,UAAU,CAK1B;AALD,WAAiB,UAAU;IACV,mBAAQ,GAAG,oCAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,IAAI,IAAI,mCAAmC;QACpD,IAAI,EAAE,EAAE,IAAI,EAAE;KACjB,CAAC,CAAC,CAAC;AACR,CAAC,EALgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAK1B"}
|
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.42+f527fb3b831",
|
|
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.42+f527fb3b831",
|
|
7
|
+
"@theia/core": "1.25.0-next.42+f527fb3b831",
|
|
8
|
+
"@theia/editor": "1.25.0-next.42+f527fb3b831",
|
|
9
|
+
"@theia/filesystem": "1.25.0-next.42+f527fb3b831",
|
|
10
|
+
"@theia/markers": "1.25.0-next.42+f527fb3b831",
|
|
11
|
+
"@theia/monaco": "1.25.0-next.42+f527fb3b831",
|
|
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.42+f527fb3b831",
|
|
14
|
+
"@theia/process": "1.25.0-next.42+f527fb3b831",
|
|
15
|
+
"@theia/task": "1.25.0-next.42+f527fb3b831",
|
|
16
|
+
"@theia/terminal": "1.25.0-next.42+f527fb3b831",
|
|
17
|
+
"@theia/variable-resolver": "1.25.0-next.42+f527fb3b831",
|
|
18
|
+
"@theia/workspace": "1.25.0-next.42+f527fb3b831",
|
|
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": "f527fb3b831e09d2d15b82dd808b907b0654c237"
|
|
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 {
|
|
@@ -193,6 +193,19 @@ export class DebugSessionManager {
|
|
|
193
193
|
await this.fireWillStartDebugSession();
|
|
194
194
|
const resolved = await this.resolveConfiguration(options);
|
|
195
195
|
|
|
196
|
+
if (!resolved) {
|
|
197
|
+
// As per vscode API: https://code.visualstudio.com/api/references/vscode-api#DebugConfigurationProvider
|
|
198
|
+
// "Returning the value 'undefined' prevents the debug session from starting.
|
|
199
|
+
// Returning the value 'null' prevents the debug session from starting and opens the
|
|
200
|
+
// underlying debug configuration instead."
|
|
201
|
+
|
|
202
|
+
// eslint-disable-next-line no-null/no-null
|
|
203
|
+
if (resolved === null) {
|
|
204
|
+
this.debugConfigurationManager.openConfiguration();
|
|
205
|
+
}
|
|
206
|
+
return undefined;
|
|
207
|
+
}
|
|
208
|
+
|
|
196
209
|
// preLaunchTask isn't run in case of auto restart as well as postDebugTask
|
|
197
210
|
if (!options.configuration.__restart) {
|
|
198
211
|
const taskRun = await this.runTask(options.workspaceFolderUri, resolved.configuration.preLaunchTask, true);
|
|
@@ -221,17 +234,31 @@ export class DebugSessionManager {
|
|
|
221
234
|
}
|
|
222
235
|
|
|
223
236
|
protected configurationIds = new Map<string, number>();
|
|
224
|
-
protected async resolveConfiguration(
|
|
237
|
+
protected async resolveConfiguration(
|
|
238
|
+
options: Readonly<DebugSessionOptions>
|
|
239
|
+
): Promise<InternalDebugSessionOptions | undefined | null> {
|
|
225
240
|
if (InternalDebugSessionOptions.is(options)) {
|
|
226
241
|
return options;
|
|
227
242
|
}
|
|
228
243
|
const { workspaceFolderUri } = options;
|
|
229
244
|
let configuration = await this.resolveDebugConfiguration(options.configuration, workspaceFolderUri);
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
245
|
+
|
|
246
|
+
if (configuration) {
|
|
247
|
+
configuration = await this.variableResolver.resolve(configuration, {
|
|
248
|
+
context: options.workspaceFolderUri ? new URI(options.workspaceFolderUri) : undefined,
|
|
249
|
+
configurationSection: 'launch',
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
configuration = await this.resolveDebugConfigurationWithSubstitutedVariables(
|
|
253
|
+
configuration,
|
|
254
|
+
workspaceFolderUri
|
|
255
|
+
);
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
if (!configuration) {
|
|
259
|
+
return configuration;
|
|
260
|
+
}
|
|
261
|
+
|
|
235
262
|
const key = configuration.name + workspaceFolderUri;
|
|
236
263
|
const id = this.configurationIds.has(key) ? this.configurationIds.get(key)! + 1 : 0;
|
|
237
264
|
this.configurationIds.set(key, id);
|
|
@@ -242,15 +269,22 @@ export class DebugSessionManager {
|
|
|
242
269
|
};
|
|
243
270
|
}
|
|
244
271
|
|
|
245
|
-
protected async resolveDebugConfiguration(
|
|
272
|
+
protected async resolveDebugConfiguration(
|
|
273
|
+
configuration: DebugConfiguration,
|
|
274
|
+
workspaceFolderUri: string | undefined
|
|
275
|
+
): Promise<DebugConfiguration | undefined | null> {
|
|
246
276
|
await this.fireWillResolveDebugConfiguration(configuration.type);
|
|
247
277
|
return this.debug.resolveDebugConfiguration(configuration, workspaceFolderUri);
|
|
248
278
|
}
|
|
279
|
+
|
|
249
280
|
protected async fireWillResolveDebugConfiguration(debugType: string): Promise<void> {
|
|
250
281
|
await WaitUntilEvent.fire(this.onWillResolveDebugConfigurationEmitter, { debugType });
|
|
251
282
|
}
|
|
252
283
|
|
|
253
|
-
protected async resolveDebugConfigurationWithSubstitutedVariables(
|
|
284
|
+
protected async resolveDebugConfigurationWithSubstitutedVariables(
|
|
285
|
+
configuration: DebugConfiguration,
|
|
286
|
+
workspaceFolderUri: string | undefined
|
|
287
|
+
): Promise<DebugConfiguration | undefined | null> {
|
|
254
288
|
return this.debug.resolveDebugConfigurationWithSubstitutedVariables(configuration, workspaceFolderUri);
|
|
255
289
|
}
|
|
256
290
|
|
|
@@ -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 {
|
|
@@ -79,17 +79,23 @@ export interface DebugService extends Disposable {
|
|
|
79
79
|
* Resolves a [debug configuration](#DebugConfiguration) by filling in missing values
|
|
80
80
|
* or by adding/changing/removing attributes before variable substitution.
|
|
81
81
|
* @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
|
|
82
|
-
* @returns The resolved debug configuration.
|
|
82
|
+
* @returns The resolved debug configuration, undefined or null.
|
|
83
83
|
*/
|
|
84
|
-
resolveDebugConfiguration(
|
|
84
|
+
resolveDebugConfiguration(
|
|
85
|
+
config: DebugConfiguration,
|
|
86
|
+
workspaceFolderUri: string | undefined
|
|
87
|
+
): Promise<DebugConfiguration | undefined | null>;
|
|
85
88
|
|
|
86
89
|
/**
|
|
87
90
|
* Resolves a [debug configuration](#DebugConfiguration) by filling in missing values
|
|
88
91
|
* or by adding/changing/removing attributes with substituted variables.
|
|
89
92
|
* @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
|
|
90
|
-
* @returns The resolved debug configuration.
|
|
93
|
+
* @returns The resolved debug configuration, undefined or null.
|
|
91
94
|
*/
|
|
92
|
-
resolveDebugConfigurationWithSubstitutedVariables(
|
|
95
|
+
resolveDebugConfigurationWithSubstitutedVariables(
|
|
96
|
+
config: DebugConfiguration,
|
|
97
|
+
workspaceFolderUri: string | undefined
|
|
98
|
+
): Promise<DebugConfiguration | undefined | null>;
|
|
93
99
|
|
|
94
100
|
/**
|
|
95
101
|
* Creates a new [debug adapter session](#DebugAdapterSession).
|