@theia/debug 1.29.0-next.2 → 1.29.0-next.20
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/editor/debug-breakpoint-widget.d.ts +2 -0
- package/lib/browser/editor/debug-breakpoint-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-breakpoint-widget.js +5 -4
- package/lib/browser/editor/debug-breakpoint-widget.js.map +1 -1
- package/lib/browser/editor/debug-exception-widget.d.ts +2 -0
- package/lib/browser/editor/debug-exception-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-exception-widget.js +6 -5
- package/lib/browser/editor/debug-exception-widget.js.map +1 -1
- package/lib/browser/editor/debug-hover-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-hover-widget.js +26 -1
- package/lib/browser/editor/debug-hover-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 +5 -1
- package/lib/browser/view/debug-configuration-widget.js.map +1 -1
- package/lib/browser/view/debug-toolbar-widget.d.ts +3 -2
- package/lib/browser/view/debug-toolbar-widget.d.ts.map +1 -1
- package/lib/browser/view/debug-toolbar-widget.js +5 -1
- package/lib/browser/view/debug-toolbar-widget.js.map +1 -1
- package/lib/common/debug-configuration.d.ts +2 -2
- package/lib/common/debug-configuration.d.ts.map +1 -1
- package/lib/common/debug-configuration.js.map +1 -1
- package/lib/node/debug-adapter-factory.d.ts.map +1 -1
- package/lib/node/debug-adapter-factory.js +1 -2
- package/lib/node/debug-adapter-factory.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/editor/debug-breakpoint-widget.tsx +6 -4
- package/src/browser/editor/debug-exception-widget.tsx +7 -5
- package/src/browser/editor/debug-hover-widget.ts +34 -1
- package/src/browser/view/debug-configuration-widget.tsx +7 -2
- package/src/browser/view/debug-toolbar-widget.tsx +7 -2
- package/src/common/debug-configuration.ts +2 -2
- package/src/node/debug-adapter-factory.ts +2 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Root } from '@theia/core/shared/react-dom/client';
|
|
1
2
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
2
3
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
3
4
|
import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
|
|
@@ -19,6 +20,7 @@ export declare class DebugBreakpointWidget implements Disposable {
|
|
|
19
20
|
readonly editor: DebugEditor;
|
|
20
21
|
protected readonly editorProvider: MonacoEditorProvider;
|
|
21
22
|
protected selectNode: HTMLDivElement;
|
|
23
|
+
protected selectNodeRoot: Root;
|
|
22
24
|
protected zone: MonacoEditorZoneWidget;
|
|
23
25
|
protected readonly toDispose: DisposableCollection;
|
|
24
26
|
protected context: DebugBreakpointWidget.Context;
|
|
@@ -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":"AAiBA,OAAO,EAAc,IAAI,EAAE,MAAM,qCAAqC,CAAC;AACvE,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;IACrC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC;IAE/B,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;IA4DrC,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"}
|
|
@@ -27,7 +27,7 @@ var DebugBreakpointWidget_1;
|
|
|
27
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
28
|
exports.DebugBreakpointWidget = void 0;
|
|
29
29
|
const React = require("@theia/core/shared/react");
|
|
30
|
-
const
|
|
30
|
+
const client_1 = require("@theia/core/shared/react-dom/client");
|
|
31
31
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
32
|
const core_1 = require("@theia/core");
|
|
33
33
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
@@ -82,6 +82,8 @@ let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidge
|
|
|
82
82
|
const selectNode = this.selectNode = document.createElement('div');
|
|
83
83
|
selectNode.classList.add('theia-debug-breakpoint-select');
|
|
84
84
|
this.zone.containerNode.appendChild(selectNode);
|
|
85
|
+
this.selectNodeRoot = (0, client_1.createRoot)(this.selectNode);
|
|
86
|
+
this.toDispose.push(core_1.Disposable.create(() => this.selectNodeRoot.unmount()));
|
|
85
87
|
const inputNode = document.createElement('div');
|
|
86
88
|
inputNode.classList.add('theia-debug-breakpoint-input');
|
|
87
89
|
this.zone.containerNode.appendChild(inputNode);
|
|
@@ -124,7 +126,6 @@ let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidge
|
|
|
124
126
|
this.zone.layout(heightInLines);
|
|
125
127
|
this.updatePlaceholder();
|
|
126
128
|
}));
|
|
127
|
-
this.toDispose.push(core_1.Disposable.create(() => ReactDOM.unmountComponentAtNode(selectNode)));
|
|
128
129
|
}
|
|
129
130
|
dispose() {
|
|
130
131
|
this.toDispose.dispose();
|
|
@@ -185,11 +186,11 @@ let DebugBreakpointWidget = DebugBreakpointWidget_1 = class DebugBreakpointWidge
|
|
|
185
186
|
if (this._input) {
|
|
186
187
|
this._input.getControl().setValue(this._values[this.context] || '');
|
|
187
188
|
}
|
|
188
|
-
|
|
189
|
+
this.selectNodeRoot.render(React.createElement(select_component_1.SelectComponent, { defaultValue: this.context, onChange: this.updateInput, options: [
|
|
189
190
|
{ value: 'condition', label: core_1.nls.localizeByDefault('Expression') },
|
|
190
191
|
{ value: 'hitCondition', label: core_1.nls.localizeByDefault('Hit Count') },
|
|
191
192
|
{ value: 'logMessage', label: core_1.nls.localizeByDefault('Log Message') },
|
|
192
|
-
] })
|
|
193
|
+
] }));
|
|
193
194
|
}
|
|
194
195
|
updatePlaceholder() {
|
|
195
196
|
if (!this._input) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"debug-breakpoint-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-breakpoint-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Root } from '@theia/core/shared/react-dom/client';
|
|
1
2
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
2
3
|
import { MonacoEditorZoneWidget } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
|
|
3
4
|
import { DebugEditor } from './debug-editor';
|
|
@@ -16,6 +17,7 @@ export declare class DebugExceptionMonacoEditorZoneWidget extends MonacoEditorZo
|
|
|
16
17
|
export declare class DebugExceptionWidget implements Disposable {
|
|
17
18
|
readonly editor: DebugEditor;
|
|
18
19
|
protected zone: MonacoEditorZoneWidget;
|
|
20
|
+
protected containerNodeRoot: Root;
|
|
19
21
|
protected readonly toDispose: DisposableCollection;
|
|
20
22
|
protected init(): Promise<void>;
|
|
21
23
|
dispose(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-exception-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-exception-widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debug-exception-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-exception-widget.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAc,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAGvE,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAI3D,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,kBAAkB,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,oCAAqC,SAAQ,sBAAsB;cAEzD,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG;QAC3D,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAA;KACrB;CASJ;AAED,qBACa,oBAAqB,YAAW,UAAU;IAGnD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,IAAI,EAAE,sBAAsB,CAAC;IACvC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC;IAElC,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;cAG1C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,wBAAwB,GAAG,IAAI;IAgBlE,IAAI,IAAI,IAAI;IAIZ,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAehE,SAAS,CAAC,MAAM,IAAI,IAAI;CAS3B"}
|
|
@@ -26,7 +26,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
exports.DebugExceptionWidget = exports.DebugExceptionMonacoEditorZoneWidget = void 0;
|
|
28
28
|
const React = require("@theia/core/shared/react");
|
|
29
|
-
const
|
|
29
|
+
const client_1 = require("@theia/core/shared/react-dom/client");
|
|
30
30
|
const monaco = require("@theia/monaco-editor-core");
|
|
31
31
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
32
|
const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
@@ -52,7 +52,8 @@ let DebugExceptionWidget = class DebugExceptionWidget {
|
|
|
52
52
|
async init() {
|
|
53
53
|
this.toDispose.push(this.zone = new DebugExceptionMonacoEditorZoneWidget(this.editor.getControl()));
|
|
54
54
|
this.zone.containerNode.classList.add('theia-debug-exception-widget');
|
|
55
|
-
this.
|
|
55
|
+
this.containerNodeRoot = (0, client_1.createRoot)(this.zone.containerNode);
|
|
56
|
+
this.toDispose.push(disposable_1.Disposable.create(() => this.containerNodeRoot.unmount()));
|
|
56
57
|
this.toDispose.push(this.editor.getControl().onDidLayoutChange(() => this.layout()));
|
|
57
58
|
}
|
|
58
59
|
dispose() {
|
|
@@ -79,12 +80,12 @@ let DebugExceptionWidget = class DebugExceptionWidget {
|
|
|
79
80
|
const exceptionTitle = info.id ?
|
|
80
81
|
nls_1.nls.localizeByDefault('Exception has occurred: {0}', info.id) :
|
|
81
82
|
nls_1.nls.localizeByDefault('Exception has occurred.');
|
|
82
|
-
|
|
83
|
-
React.createElement("div", { className: 'title' },
|
|
83
|
+
this.containerNodeRoot.render(React.createElement(React.Fragment, null,
|
|
84
|
+
React.createElement("div", { className: 'title', ref: cb },
|
|
84
85
|
exceptionTitle,
|
|
85
86
|
React.createElement("span", { id: "exception-close", className: (0, widgets_1.codicon)('close', true), onClick: () => this.hide(), title: nls_1.nls.localizeByDefault('Close') })),
|
|
86
87
|
info.description && React.createElement("div", { className: 'description' }, info.description),
|
|
87
|
-
stackTrace && React.createElement("div", { className: 'stack-trace' }, stackTrace))
|
|
88
|
+
stackTrace && React.createElement("div", { className: 'stack-trace' }, stackTrace)));
|
|
88
89
|
}
|
|
89
90
|
layout() {
|
|
90
91
|
// reset height to match it to the content
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-exception-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-exception-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,
|
|
1
|
+
{"version":3,"file":"debug-exception-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-exception-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-hover-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-hover-widget.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACjE,OAAO,EAAqC,SAAS,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAExG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-hover-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-hover-widget.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACjE,OAAO,EAAqC,SAAS,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAExG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAOpD,MAAM,WAAW,qBAAqB;IAClC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAA;IACvB,qBAAqB;IACrB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oBAAoB;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,MAAM,WAAW,qBAAqB;IAClC,oBAAoB;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,CAU5G;AAED,qBACa,gBAAiB,SAAQ,gBAAiB,YAAW,MAAM,CAAC,MAAM,CAAC,cAAc;IAG1F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,uBAAuB,CAAC;IAE/D,mBAAmB,UAAQ;IAE3B,MAAM,CAAC,EAAE,SAAwB;IACjC,KAAK,IAAI,MAAM;IAIf,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,SAAS,iBAAiC;IAC7D,SAAS,CAAC,QAAQ,CAAC,WAAW,iBAAiC;IAC/D,UAAU,IAAI,WAAW;cAKN,IAAI,IAAI,IAAI;IAsBtB,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAI3C,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAIpD,SAAS,CAAC,QAAQ,CAAC,UAAU,sCAAiB,MAAM,IAAI,WAAgB;IACxE,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IASnE,SAAS,CAAC,OAAO,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACrD,SAAS,CAAC,MAAM,IAAI,IAAI;cAgBR,MAAM,CAAC,OAAO,GAAE,qBAAqB,GAAG,SAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2FhG,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB;cAehC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;cAQnC,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAKvD"}
|
|
@@ -38,6 +38,11 @@ const debug_expression_provider_1 = require("./debug-expression-provider");
|
|
|
38
38
|
const debug_hover_source_1 = require("./debug-hover-source");
|
|
39
39
|
const debug_console_items_1 = require("../console/debug-console-items");
|
|
40
40
|
const monaco = require("@theia/monaco-editor-core");
|
|
41
|
+
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
42
|
+
const languageFeatures_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures");
|
|
43
|
+
const cancellation_1 = require("@theia/monaco-editor-core/esm/vs/base/common/cancellation");
|
|
44
|
+
const position_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/core/position");
|
|
45
|
+
const core_1 = require("@theia/core");
|
|
41
46
|
function createDebugHoverWidgetContainer(parent, editor) {
|
|
42
47
|
const child = source_tree_1.SourceTreeWidget.createContainer(parent, {
|
|
43
48
|
virtualized: false
|
|
@@ -119,6 +124,7 @@ let DebugHoverWidget = DebugHoverWidget_1 = class DebugHoverWidget extends sourc
|
|
|
119
124
|
this.editor.getControl().layoutContentWidget(this);
|
|
120
125
|
}
|
|
121
126
|
async doShow(options = this.options) {
|
|
127
|
+
const cancellationSource = new cancellation_1.CancellationTokenSource();
|
|
122
128
|
if (!this.isEditorFrame()) {
|
|
123
129
|
this.hide();
|
|
124
130
|
return;
|
|
@@ -134,7 +140,26 @@ let DebugHoverWidget = DebugHoverWidget_1 = class DebugHoverWidget extends sourc
|
|
|
134
140
|
widgets_1.Widget.attach(this, this.contentNode);
|
|
135
141
|
}
|
|
136
142
|
this.options = options;
|
|
137
|
-
|
|
143
|
+
let matchingExpression;
|
|
144
|
+
const pluginExpressionProvider = standaloneServices_1.StandaloneServices.get(languageFeatures_1.ILanguageFeaturesService).evaluatableExpressionProvider;
|
|
145
|
+
const textEditorModel = this.editor.document.textEditorModel;
|
|
146
|
+
if (pluginExpressionProvider && pluginExpressionProvider.has(textEditorModel)) {
|
|
147
|
+
const registeredProviders = pluginExpressionProvider.ordered(textEditorModel);
|
|
148
|
+
const position = new position_1.Position(this.options.selection.startLineNumber, this.options.selection.startColumn);
|
|
149
|
+
const promises = registeredProviders.map(support => Promise.resolve(support.provideEvaluatableExpression(textEditorModel, position, cancellationSource.token)));
|
|
150
|
+
const results = await Promise.all(promises).then(core_1.ArrayUtils.coalesce);
|
|
151
|
+
if (results.length > 0) {
|
|
152
|
+
matchingExpression = results[0].expression;
|
|
153
|
+
const range = results[0].range;
|
|
154
|
+
if (!matchingExpression) {
|
|
155
|
+
const lineContent = textEditorModel.getLineContent(position.lineNumber);
|
|
156
|
+
matchingExpression = lineContent.substring(range.startColumn - 1, range.endColumn - 1);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
else { // use fallback if no provider was registered
|
|
161
|
+
matchingExpression = this.expressionProvider.get(this.editor.getControl().getModel(), options.selection);
|
|
162
|
+
}
|
|
138
163
|
if (!matchingExpression) {
|
|
139
164
|
this.hide();
|
|
140
165
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-hover-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-hover-widget.ts"],"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,+DAAgE;AAEhE,kEAA8D;AAE9D,4DAAwG;AACxG,qDAA8C;AAC9C,qEAAuE;AACvE,kEAAqF;AACrF,oEAA+D;AAC/D,iDAA6C;AAC7C,2EAAsE;AACtE,6DAAwD;AACxD,wEAA+D;AAC/D,oDAAoD;
|
|
1
|
+
{"version":3,"file":"debug-hover-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-hover-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { ReactWidget, QuickInputService } from '@theia/core/lib/browser';
|
|
3
|
-
import { CommandRegistry, MessageService } from '@theia/core/lib/common';
|
|
3
|
+
import { CommandRegistry, DisposableCollection, MessageService } from '@theia/core/lib/common';
|
|
4
4
|
import * as React from '@theia/core/shared/react';
|
|
5
5
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
6
6
|
import { DebugConsoleContribution } from '../console/debug-console-contribution';
|
|
@@ -17,11 +17,12 @@ export declare class DebugConfigurationWidget extends ReactWidget {
|
|
|
17
17
|
protected readonly quickInputService: QuickInputService;
|
|
18
18
|
protected readonly workspaceService: WorkspaceService;
|
|
19
19
|
protected readonly messageService: MessageService;
|
|
20
|
+
protected readonly onRender: DisposableCollection;
|
|
20
21
|
protected init(): void;
|
|
21
22
|
focus(): void;
|
|
22
23
|
protected doFocus(): boolean;
|
|
23
24
|
protected stepRef: DebugAction | undefined;
|
|
24
|
-
protected setStepRef: (stepRef: DebugAction | null) =>
|
|
25
|
+
protected setStepRef: (stepRef: DebugAction | null) => void;
|
|
25
26
|
render(): React.ReactNode;
|
|
26
27
|
protected readonly start: () => Promise<void>;
|
|
27
28
|
protected readonly openConfiguration: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAc,cAAc,EAAE,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,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAc,oBAAoB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE3G,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,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,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,QAAQ,uBAA8B;IAGzD,SAAS,CAAC,IAAI,IAAI,IAAI;IAStB,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,OAAO,IAAI,OAAO;IAQ5B,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,UAAU,YAAa,WAAW,GAAG,IAAI,UAGjD;IAEF,MAAM,IAAI,KAAK,CAAC,SAAS;IAczB,SAAS,CAAC,QAAQ,CAAC,KAAK,sBAUtB;IAEF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,sBAA0C;IAC9E,SAAS,CAAC,QAAQ,CAAC,WAAW,mFAE3B;CAEN"}
|
|
@@ -41,7 +41,11 @@ const nls_1 = require("@theia/core/lib/common/nls");
|
|
|
41
41
|
let DebugConfigurationWidget = class DebugConfigurationWidget extends browser_1.ReactWidget {
|
|
42
42
|
constructor() {
|
|
43
43
|
super(...arguments);
|
|
44
|
-
this.
|
|
44
|
+
this.onRender = new common_1.DisposableCollection();
|
|
45
|
+
this.setStepRef = (stepRef) => {
|
|
46
|
+
this.stepRef = stepRef || undefined;
|
|
47
|
+
this.onRender.dispose();
|
|
48
|
+
};
|
|
45
49
|
this.start = async () => {
|
|
46
50
|
let configuration;
|
|
47
51
|
try {
|
|
@@ -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,qDAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"debug-configuration-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import * as React from '@theia/core/shared/react';
|
|
3
|
-
import { MenuPath } from '@theia/core';
|
|
3
|
+
import { DisposableCollection, MenuPath } from '@theia/core';
|
|
4
4
|
import { ReactWidget } from '@theia/core/lib/browser/widgets';
|
|
5
5
|
import { DebugViewModel } from './debug-view-model';
|
|
6
6
|
import { DebugAction } from './debug-action';
|
|
7
7
|
export declare class DebugToolBar extends ReactWidget {
|
|
8
8
|
static readonly MENU: MenuPath;
|
|
9
9
|
protected readonly model: DebugViewModel;
|
|
10
|
+
protected readonly onRender: DisposableCollection;
|
|
10
11
|
protected init(): void;
|
|
11
12
|
focus(): void;
|
|
12
13
|
protected doFocus(): boolean;
|
|
13
14
|
protected stepRef: DebugAction | undefined;
|
|
14
|
-
protected setStepRef: (stepRef: DebugAction | null) =>
|
|
15
|
+
protected setStepRef: (stepRef: DebugAction | null) => void;
|
|
15
16
|
protected render(): React.ReactNode;
|
|
16
17
|
protected renderStart(): React.ReactNode;
|
|
17
18
|
protected renderContinue(): React.ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-toolbar-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAc,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-toolbar-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAc,oBAAoB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,qBACa,YAAa,SAAQ,WAAW;IAEzC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAA0B;IAGxD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAEzC,SAAS,CAAC,QAAQ,CAAC,QAAQ,uBAA8B;IAGzD,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,UAGjD;IAEF,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;IAenC,SAAS,CAAC,WAAW,IAAI,KAAK,CAAC,SAAS;IAOxC,SAAS,CAAC,cAAc,IAAI,KAAK,CAAC,SAAS;IAQ3C,SAAS,CAAC,KAAK,sBAA4B;IAC3C,SAAS,CAAC,OAAO,sBAA8B;IAC/C,SAAS,CAAC,IAAI,sBAAgC;IAC9C,SAAS,CAAC,QAAQ,2FAAyE;IAC3F,SAAS,CAAC,KAAK,wFAAsE;IACrF,SAAS,CAAC,QAAQ,uFAAyE;IAC3F,SAAS,CAAC,MAAM,yFAAuE;IACvF,SAAS,CAAC,OAAO,0FAAwE;CAE5F"}
|
|
@@ -36,7 +36,11 @@ const nls_1 = require("@theia/core/lib/common/nls");
|
|
|
36
36
|
let DebugToolBar = class DebugToolBar extends widgets_1.ReactWidget {
|
|
37
37
|
constructor() {
|
|
38
38
|
super(...arguments);
|
|
39
|
-
this.
|
|
39
|
+
this.onRender = new core_1.DisposableCollection();
|
|
40
|
+
this.setStepRef = (stepRef) => {
|
|
41
|
+
this.stepRef = stepRef || undefined;
|
|
42
|
+
this.onRender.dispose();
|
|
43
|
+
};
|
|
40
44
|
this.start = () => this.model.start();
|
|
41
45
|
this.restart = () => this.model.restart();
|
|
42
46
|
this.stop = () => this.model.terminate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-toolbar-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"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;;;;;;;;;;;;AAEhF,kDAAkD;AAClD,4DAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"debug-toolbar-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ export interface DebugConfiguration {
|
|
|
33
33
|
* The data is sent as the 'restart' attribute of the 'terminated' event.
|
|
34
34
|
* The client should leave the data intact.
|
|
35
35
|
*/
|
|
36
|
-
__restart?:
|
|
36
|
+
__restart?: boolean;
|
|
37
37
|
/** default: neverOpen */
|
|
38
38
|
openDebug?: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart' | 'openOnDebugBreak';
|
|
39
39
|
/** default: neverOpen */
|
|
@@ -44,7 +44,7 @@ export interface DebugConfiguration {
|
|
|
44
44
|
postDebugTask?: string | TaskIdentifier;
|
|
45
45
|
}
|
|
46
46
|
export declare namespace DebugConfiguration {
|
|
47
|
-
function is(arg:
|
|
47
|
+
function is(arg: unknown): arg is DebugConfiguration;
|
|
48
48
|
}
|
|
49
49
|
export interface DebugSessionOptions {
|
|
50
50
|
parentSession?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration.d.ts","sourceRoot":"","sources":["../../src/common/debug-configuration.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAE/B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAE/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-configuration.d.ts","sourceRoot":"","sources":["../../src/common/debug-configuration.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAE/B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAE/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,yBAAyB;IACzB,SAAS,CAAC,EAAE,WAAW,GAAG,oBAAoB,GAAG,yBAAyB,GAAG,kBAAkB,CAAC;IAEhG,yBAAyB;IACzB,sBAAsB,CAAC,EAAE,WAAW,GAAG,oBAAoB,GAAG,yBAAyB,CAAA;IAEvF,8CAA8C;IAC9C,aAAa,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAExC,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;CAC3C;AACD,yBAAiB,kBAAkB,CAAC;IAChC,SAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAE1D;CACJ;AAED,MAAM,WAAW,mBAAmB;IAChC,aAAa,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,oBAAY,gBAAgB;IACxB,QAAQ,IAAI;IACZ,eAAe,IAAI;CACtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-configuration.js","sourceRoot":"","sources":["../../src/common/debug-configuration.ts"],"names":[],"mappings":";;;AAwEA,IAAiB,kBAAkB,CAIlC;AAJD,WAAiB,kBAAkB;IAC/B,SAAgB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"debug-configuration.js","sourceRoot":"","sources":["../../src/common/debug-configuration.ts"],"names":[],"mappings":";;;AAwEA,IAAiB,kBAAkB,CAIlC;AAJD,WAAiB,kBAAkB;IAC/B,SAAgB,EAAE,CAAC,GAAY;QAC3B,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,CAAC;IAClG,CAAC;IAFe,qBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAIlC;AASD,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,+DAAY,CAAA;IACZ,6EAAmB,CAAA;AACvB,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-factory.d.ts","sourceRoot":"","sources":["../../src/node/debug-adapter-factory.ts"],"names":[],"mappings":"AAyBA,OAAO,EACH,iBAAiB,EACjB,cAAc,EAIjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,EAC1B,mBAAmB,EAEnB,YAAY,EACf,MAAM,uBAAuB,CAAC;AAK/B;;;GAGG;AACH,qBACa,8BAA+B,YAAW,mBAAmB;IAEtE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,KAAK,CAAC,UAAU,EAAE,sBAAsB,GAAG,YAAY;IAYvD,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"debug-adapter-factory.d.ts","sourceRoot":"","sources":["../../src/node/debug-adapter-factory.ts"],"names":[],"mappings":"AAyBA,OAAO,EACH,iBAAiB,EACjB,cAAc,EAIjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,EAC1B,mBAAmB,EAEnB,YAAY,EACf,MAAM,uBAAuB,CAAC;AAK/B;;;GAGG;AACH,qBACa,8BAA+B,YAAW,mBAAmB;IAEtE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC;IAErD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,KAAK,CAAC,UAAU,EAAE,sBAAsB,GAAG,YAAY;IAYvD,OAAO,CAAC,YAAY;IAiBpB,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,YAAY;CAOjD;AAED;;GAEG;AACH,qBACa,8BAA+B,YAAW,0BAA0B;IAE7E,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,mBAAmB;CAM1E"}
|
|
@@ -51,8 +51,7 @@ let LaunchBasedDebugAdapterFactory = class LaunchBasedDebugAdapterFactory {
|
|
|
51
51
|
return provider;
|
|
52
52
|
}
|
|
53
53
|
childProcess(executable) {
|
|
54
|
-
|
|
55
|
-
const isForkOptions = (forkOptions) => !!forkOptions && !!forkOptions.modulePath;
|
|
54
|
+
const isForkOptions = (forkOptions) => !!forkOptions && typeof forkOptions === 'object' && 'modulePath' in forkOptions;
|
|
56
55
|
const processOptions = Object.assign({}, executable);
|
|
57
56
|
const options = { stdio: ['pipe', 'pipe', 2] };
|
|
58
57
|
if (isForkOptions(processOptions)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-factory.js","sourceRoot":"","sources":["../../src/node/debug-adapter-factory.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;;;;;;;;;;;;AAEhF;;;gGAGgG;AAEhG,mIAAmI;AAEnI,2BAA2B;AAC3B,4DAAkE;AAClE,kDAMiC;AASjC,2EAA0E;AAC1E,uFAA4E;AAC5E,iEAAiF;AAEjF;;;GAGG;AAEH,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAMvC,KAAK,CAAC,UAAkC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SAC3F;QAED,oCAAoC;QACpC,MAAM,QAAQ,GAAG,IAAI,0CAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,YAAY,CAAC,UAAkC;QACnD,
|
|
1
|
+
{"version":3,"file":"debug-adapter-factory.js","sourceRoot":"","sources":["../../src/node/debug-adapter-factory.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;;;;;;;;;;;;AAEhF;;;gGAGgG;AAEhG,mIAAmI;AAEnI,2BAA2B;AAC3B,4DAAkE;AAClE,kDAMiC;AASjC,2EAA0E;AAC1E,uFAA4E;AAC5E,iEAAiF;AAEjF;;;GAGG;AAEH,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAMvC,KAAK,CAAC,UAAkC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SAC3F;QAED,oCAAoC;QACpC,MAAM,QAAQ,GAAG,IAAI,0CAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,YAAY,CAAC,UAAkC;QACnD,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAiC,EAAE,CAC1E,CAAC,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,YAAY,IAAI,WAAW,CAAC;QAEpF,MAAM,cAAc,qBAA4C,UAAU,CAAE,CAAC;QAC7E,MAAM,OAAO,GAAsE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;QAElH,IAAI,aAAa,CAAC,cAAc,CAAC,EAAE;YAC/B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,OAAO,CAAC,GAAG,GAAG,iCAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAClD,OAAO,CAAC,QAAQ,GAAI,UAAyC,CAAC,QAAQ,CAAC;SAC1E;QAED,cAAc,CAAC,OAAO,GAAG,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,eAAuB;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACrD,qEAAqE;QAErE,MAAM,QAAQ,GAAG,IAAI,yCAAkB,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ,CAAA;AAxCG;IADC,IAAA,kBAAM,EAAC,wBAAiB,CAAC;;sEAC2B;AAErD;IADC,IAAA,kBAAM,EAAC,qBAAc,CAAC;8BACY,qBAAc;sEAAC;AAJzC,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CA0C1C;AA1CY,wEAA8B;AA4C3C;;GAEG;AAEH,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAEvC,GAAG,CAAC,SAAiB,EAAE,YAA0B;QAC7C,OAAO,IAAI,+CAAuB,CAC9B,SAAS,EACT,YAAY,CACf,CAAC;IACN,CAAC;CACJ,CAAA;AARY,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAQ1C;AARY,wEAA8B"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.29.0-next.
|
|
3
|
+
"version": "1.29.0-next.20+1c0253adc71",
|
|
4
4
|
"description": "Theia - Debug Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/console": "1.29.0-next.
|
|
7
|
-
"@theia/core": "1.29.0-next.
|
|
8
|
-
"@theia/editor": "1.29.0-next.
|
|
9
|
-
"@theia/filesystem": "1.29.0-next.
|
|
10
|
-
"@theia/markers": "1.29.0-next.
|
|
11
|
-
"@theia/monaco": "1.29.0-next.
|
|
6
|
+
"@theia/console": "1.29.0-next.20+1c0253adc71",
|
|
7
|
+
"@theia/core": "1.29.0-next.20+1c0253adc71",
|
|
8
|
+
"@theia/editor": "1.29.0-next.20+1c0253adc71",
|
|
9
|
+
"@theia/filesystem": "1.29.0-next.20+1c0253adc71",
|
|
10
|
+
"@theia/markers": "1.29.0-next.20+1c0253adc71",
|
|
11
|
+
"@theia/monaco": "1.29.0-next.20+1c0253adc71",
|
|
12
12
|
"@theia/monaco-editor-core": "1.67.2",
|
|
13
|
-
"@theia/output": "1.29.0-next.
|
|
14
|
-
"@theia/process": "1.29.0-next.
|
|
15
|
-
"@theia/task": "1.29.0-next.
|
|
16
|
-
"@theia/terminal": "1.29.0-next.
|
|
17
|
-
"@theia/variable-resolver": "1.29.0-next.
|
|
18
|
-
"@theia/workspace": "1.29.0-next.
|
|
13
|
+
"@theia/output": "1.29.0-next.20+1c0253adc71",
|
|
14
|
+
"@theia/process": "1.29.0-next.20+1c0253adc71",
|
|
15
|
+
"@theia/task": "1.29.0-next.20+1c0253adc71",
|
|
16
|
+
"@theia/terminal": "1.29.0-next.20+1c0253adc71",
|
|
17
|
+
"@theia/variable-resolver": "1.29.0-next.20+1c0253adc71",
|
|
18
|
+
"@theia/workspace": "1.29.0-next.20+1c0253adc71",
|
|
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": "1c0253adc71fa59d6ca7aef0797d3ba0c7d7d36c"
|
|
72
72
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
|
-
import
|
|
18
|
+
import { createRoot, Root } from '@theia/core/shared/react-dom/client';
|
|
19
19
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
20
20
|
import { injectable, postConstruct, inject } from '@theia/core/shared/inversify';
|
|
21
21
|
import { Disposable, DisposableCollection, nls } from '@theia/core';
|
|
@@ -55,6 +55,7 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
55
55
|
protected readonly editorProvider: MonacoEditorProvider;
|
|
56
56
|
|
|
57
57
|
protected selectNode: HTMLDivElement;
|
|
58
|
+
protected selectNodeRoot: Root;
|
|
58
59
|
|
|
59
60
|
protected zone: MonacoEditorZoneWidget;
|
|
60
61
|
|
|
@@ -99,6 +100,8 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
99
100
|
const selectNode = this.selectNode = document.createElement('div');
|
|
100
101
|
selectNode.classList.add('theia-debug-breakpoint-select');
|
|
101
102
|
this.zone.containerNode.appendChild(selectNode);
|
|
103
|
+
this.selectNodeRoot = createRoot(this.selectNode);
|
|
104
|
+
this.toDispose.push(Disposable.create(() => this.selectNodeRoot.unmount()));
|
|
102
105
|
|
|
103
106
|
const inputNode = document.createElement('div');
|
|
104
107
|
inputNode.classList.add('theia-debug-breakpoint-input');
|
|
@@ -148,7 +151,6 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
148
151
|
this.zone.layout(heightInLines);
|
|
149
152
|
this.updatePlaceholder();
|
|
150
153
|
}));
|
|
151
|
-
this.toDispose.push(Disposable.create(() => ReactDOM.unmountComponentAtNode(selectNode)));
|
|
152
154
|
}
|
|
153
155
|
|
|
154
156
|
dispose(): void {
|
|
@@ -213,14 +215,14 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
213
215
|
if (this._input) {
|
|
214
216
|
this._input.getControl().setValue(this._values[this.context] || '');
|
|
215
217
|
}
|
|
216
|
-
|
|
218
|
+
this.selectNodeRoot.render(<SelectComponent
|
|
217
219
|
defaultValue={this.context} onChange={this.updateInput}
|
|
218
220
|
options={[
|
|
219
221
|
{ value: 'condition', label: nls.localizeByDefault('Expression') },
|
|
220
222
|
{ value: 'hitCondition', label: nls.localizeByDefault('Hit Count') },
|
|
221
223
|
{ value: 'logMessage', label: nls.localizeByDefault('Log Message') },
|
|
222
224
|
]}
|
|
223
|
-
|
|
225
|
+
/>);
|
|
224
226
|
}
|
|
225
227
|
|
|
226
228
|
protected readonly updateInput = (option: SelectOption) => {
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
|
-
import
|
|
18
|
+
import { createRoot, Root } from '@theia/core/shared/react-dom/client';
|
|
19
19
|
import * as monaco from '@theia/monaco-editor-core';
|
|
20
20
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
21
21
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
@@ -54,6 +54,7 @@ export class DebugExceptionWidget implements Disposable {
|
|
|
54
54
|
readonly editor: DebugEditor;
|
|
55
55
|
|
|
56
56
|
protected zone: MonacoEditorZoneWidget;
|
|
57
|
+
protected containerNodeRoot: Root;
|
|
57
58
|
|
|
58
59
|
protected readonly toDispose = new DisposableCollection();
|
|
59
60
|
|
|
@@ -61,7 +62,8 @@ export class DebugExceptionWidget implements Disposable {
|
|
|
61
62
|
protected async init(): Promise<void> {
|
|
62
63
|
this.toDispose.push(this.zone = new DebugExceptionMonacoEditorZoneWidget(this.editor.getControl()));
|
|
63
64
|
this.zone.containerNode.classList.add('theia-debug-exception-widget');
|
|
64
|
-
this.
|
|
65
|
+
this.containerNodeRoot = createRoot(this.zone.containerNode);
|
|
66
|
+
this.toDispose.push(Disposable.create(() => this.containerNodeRoot.unmount()));
|
|
65
67
|
this.toDispose.push(this.editor.getControl().onDidLayoutChange(() => this.layout()));
|
|
66
68
|
}
|
|
67
69
|
|
|
@@ -94,14 +96,14 @@ export class DebugExceptionWidget implements Disposable {
|
|
|
94
96
|
const exceptionTitle = info.id ?
|
|
95
97
|
nls.localizeByDefault('Exception has occurred: {0}', info.id) :
|
|
96
98
|
nls.localizeByDefault('Exception has occurred.');
|
|
97
|
-
|
|
98
|
-
<div className='title'>
|
|
99
|
+
this.containerNodeRoot.render(<React.Fragment>
|
|
100
|
+
<div className='title' ref={cb}>
|
|
99
101
|
{exceptionTitle}
|
|
100
102
|
<span id="exception-close" className={codicon('close', true)} onClick={() => this.hide()} title={nls.localizeByDefault('Close')}></span>
|
|
101
103
|
</div>
|
|
102
104
|
{info.description && <div className='description'>{info.description}</div>}
|
|
103
105
|
{stackTrace && <div className='stack-trace'>{stackTrace}</div>}
|
|
104
|
-
</React.Fragment
|
|
106
|
+
</React.Fragment>);
|
|
105
107
|
}
|
|
106
108
|
|
|
107
109
|
protected layout(): void {
|
|
@@ -28,6 +28,11 @@ import { DebugExpressionProvider } from './debug-expression-provider';
|
|
|
28
28
|
import { DebugHoverSource } from './debug-hover-source';
|
|
29
29
|
import { DebugVariable } from '../console/debug-console-items';
|
|
30
30
|
import * as monaco from '@theia/monaco-editor-core';
|
|
31
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
32
|
+
import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
|
|
33
|
+
import { CancellationTokenSource } from '@theia/monaco-editor-core/esm/vs/base/common/cancellation';
|
|
34
|
+
import { Position } from '@theia/monaco-editor-core/esm/vs/editor/common/core/position';
|
|
35
|
+
import { ArrayUtils } from '@theia/core';
|
|
31
36
|
|
|
32
37
|
export interface ShowDebugHoverOptions {
|
|
33
38
|
selection: monaco.Range
|
|
@@ -146,6 +151,8 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
|
|
|
146
151
|
}
|
|
147
152
|
|
|
148
153
|
protected async doShow(options: ShowDebugHoverOptions | undefined = this.options): Promise<void> {
|
|
154
|
+
const cancellationSource = new CancellationTokenSource();
|
|
155
|
+
|
|
149
156
|
if (!this.isEditorFrame()) {
|
|
150
157
|
this.hide();
|
|
151
158
|
return;
|
|
@@ -162,7 +169,33 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
|
|
|
162
169
|
}
|
|
163
170
|
|
|
164
171
|
this.options = options;
|
|
165
|
-
|
|
172
|
+
let matchingExpression: string | undefined;
|
|
173
|
+
|
|
174
|
+
const pluginExpressionProvider = StandaloneServices.get(ILanguageFeaturesService).evaluatableExpressionProvider;
|
|
175
|
+
const textEditorModel = this.editor.document.textEditorModel;
|
|
176
|
+
|
|
177
|
+
if (pluginExpressionProvider && pluginExpressionProvider.has(textEditorModel)) {
|
|
178
|
+
const registeredProviders = pluginExpressionProvider.ordered(textEditorModel);
|
|
179
|
+
const position = new Position(this.options!.selection.startLineNumber, this.options!.selection.startColumn);
|
|
180
|
+
|
|
181
|
+
const promises = registeredProviders.map(support =>
|
|
182
|
+
Promise.resolve(support.provideEvaluatableExpression(textEditorModel, position, cancellationSource.token))
|
|
183
|
+
);
|
|
184
|
+
|
|
185
|
+
const results = await Promise.all(promises).then(ArrayUtils.coalesce);
|
|
186
|
+
if (results.length > 0) {
|
|
187
|
+
matchingExpression = results[0].expression;
|
|
188
|
+
const range = results[0].range;
|
|
189
|
+
|
|
190
|
+
if (!matchingExpression) {
|
|
191
|
+
const lineContent = textEditorModel.getLineContent(position.lineNumber);
|
|
192
|
+
matchingExpression = lineContent.substring(range.startColumn - 1, range.endColumn - 1);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
} else { // use fallback if no provider was registered
|
|
196
|
+
matchingExpression = this.expressionProvider.get(this.editor.getControl().getModel()!, options.selection);
|
|
197
|
+
}
|
|
198
|
+
|
|
166
199
|
if (!matchingExpression) {
|
|
167
200
|
this.hide();
|
|
168
201
|
return;
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ReactWidget, QuickInputService } from '@theia/core/lib/browser';
|
|
18
|
-
import { CommandRegistry, Disposable, MessageService } from '@theia/core/lib/common';
|
|
18
|
+
import { CommandRegistry, Disposable, DisposableCollection, MessageService } from '@theia/core/lib/common';
|
|
19
19
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
20
20
|
import * as React from '@theia/core/shared/react';
|
|
21
21
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
@@ -55,6 +55,8 @@ export class DebugConfigurationWidget extends ReactWidget {
|
|
|
55
55
|
@inject(MessageService)
|
|
56
56
|
protected readonly messageService: MessageService;
|
|
57
57
|
|
|
58
|
+
protected readonly onRender = new DisposableCollection();
|
|
59
|
+
|
|
58
60
|
@postConstruct()
|
|
59
61
|
protected init(): void {
|
|
60
62
|
this.addClass('debug-toolbar');
|
|
@@ -80,7 +82,10 @@ export class DebugConfigurationWidget extends ReactWidget {
|
|
|
80
82
|
}
|
|
81
83
|
|
|
82
84
|
protected stepRef: DebugAction | undefined;
|
|
83
|
-
protected setStepRef = (stepRef: DebugAction | null) =>
|
|
85
|
+
protected setStepRef = (stepRef: DebugAction | null) => {
|
|
86
|
+
this.stepRef = stepRef || undefined;
|
|
87
|
+
this.onRender.dispose();
|
|
88
|
+
};
|
|
84
89
|
|
|
85
90
|
render(): React.ReactNode {
|
|
86
91
|
return <React.Fragment>
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
18
|
import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
|
|
19
|
-
import { Disposable, MenuPath } from '@theia/core';
|
|
19
|
+
import { Disposable, DisposableCollection, MenuPath } from '@theia/core';
|
|
20
20
|
import { ReactWidget } from '@theia/core/lib/browser/widgets';
|
|
21
21
|
import { DebugViewModel } from './debug-view-model';
|
|
22
22
|
import { DebugState } from '../debug-session';
|
|
@@ -31,6 +31,8 @@ export class DebugToolBar extends ReactWidget {
|
|
|
31
31
|
@inject(DebugViewModel)
|
|
32
32
|
protected readonly model: DebugViewModel;
|
|
33
33
|
|
|
34
|
+
protected readonly onRender = new DisposableCollection();
|
|
35
|
+
|
|
34
36
|
@postConstruct()
|
|
35
37
|
protected init(): void {
|
|
36
38
|
this.id = 'debug:toolbar:' + this.model.id;
|
|
@@ -55,7 +57,10 @@ export class DebugToolBar extends ReactWidget {
|
|
|
55
57
|
return true;
|
|
56
58
|
}
|
|
57
59
|
protected stepRef: DebugAction | undefined;
|
|
58
|
-
protected setStepRef = (stepRef: DebugAction | null) =>
|
|
60
|
+
protected setStepRef = (stepRef: DebugAction | null) => {
|
|
61
|
+
this.stepRef = stepRef || undefined;
|
|
62
|
+
this.onRender.dispose();
|
|
63
|
+
};
|
|
59
64
|
|
|
60
65
|
protected render(): React.ReactNode {
|
|
61
66
|
const { state } = this.model;
|
|
@@ -56,7 +56,7 @@ export interface DebugConfiguration {
|
|
|
56
56
|
* The data is sent as the 'restart' attribute of the 'terminated' event.
|
|
57
57
|
* The client should leave the data intact.
|
|
58
58
|
*/
|
|
59
|
-
__restart?:
|
|
59
|
+
__restart?: boolean;
|
|
60
60
|
|
|
61
61
|
/** default: neverOpen */
|
|
62
62
|
openDebug?: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart' | 'openOnDebugBreak';
|
|
@@ -71,7 +71,7 @@ export interface DebugConfiguration {
|
|
|
71
71
|
postDebugTask?: string | TaskIdentifier;
|
|
72
72
|
}
|
|
73
73
|
export namespace DebugConfiguration {
|
|
74
|
-
export function is(arg:
|
|
74
|
+
export function is(arg: unknown): arg is DebugConfiguration {
|
|
75
75
|
return !!arg && typeof arg === 'object' && 'type' in arg && 'name' in arg && 'request' in arg;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -66,9 +66,8 @@ export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
|
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
private childProcess(executable: DebugAdapterExecutable): RawProcess {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
!!forkOptions && !!forkOptions.modulePath;
|
|
69
|
+
const isForkOptions = (forkOptions: unknown): forkOptions is RawForkOptions =>
|
|
70
|
+
!!forkOptions && typeof forkOptions === 'object' && 'modulePath' in forkOptions;
|
|
72
71
|
|
|
73
72
|
const processOptions: RawProcessOptions | RawForkOptions = { ...executable };
|
|
74
73
|
const options: { stdio: (string | number)[], env?: object, execArgv?: string[] } = { stdio: ['pipe', 'pipe', 2] };
|