@theia/debug 1.59.0-next.72 → 1.60.0-next.43
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/breakpoint/breakpoint-marker.js +1 -1
- package/lib/browser/breakpoint/breakpoint-marker.js.map +1 -1
- package/lib/browser/console/debug-console-items.d.ts +1 -0
- package/lib/browser/console/debug-console-items.d.ts.map +1 -1
- package/lib/browser/console/debug-console-items.js +3 -0
- package/lib/browser/console/debug-console-items.js.map +1 -1
- package/lib/browser/debug-configuration-manager.d.ts.map +1 -1
- package/lib/browser/debug-configuration-manager.js +7 -3
- package/lib/browser/debug-configuration-manager.js.map +1 -1
- package/lib/browser/editor/debug-breakpoint-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-breakpoint-widget.js +11 -6
- package/lib/browser/editor/debug-breakpoint-widget.js.map +1 -1
- package/lib/browser/editor/debug-editor-model.d.ts +2 -1
- package/lib/browser/editor/debug-editor-model.d.ts.map +1 -1
- package/lib/browser/editor/debug-editor-model.js +29 -14
- package/lib/browser/editor/debug-editor-model.js.map +1 -1
- package/lib/browser/editor/debug-editor-service.js +3 -2
- package/lib/browser/editor/debug-editor-service.js.map +1 -1
- package/lib/browser/editor/debug-hover-widget.d.ts +1 -1
- package/lib/browser/editor/debug-hover-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-hover-widget.js +11 -11
- package/lib/browser/editor/debug-hover-widget.js.map +1 -1
- package/lib/common/inline-debug-adapter.d.ts +0 -1
- package/lib/common/inline-debug-adapter.d.ts.map +1 -1
- package/lib/node/debug-adapter-session-manager.js +1 -1
- package/lib/node/debug-adapter-session-manager.js.map +1 -1
- package/package.json +16 -16
- package/src/browser/breakpoint/breakpoint-marker.ts +1 -1
- package/src/browser/console/debug-console-items.tsx +4 -0
- package/src/browser/debug-configuration-manager.ts +7 -3
- package/src/browser/editor/debug-breakpoint-widget.tsx +10 -6
- package/src/browser/editor/debug-editor-model.ts +26 -14
- package/src/browser/editor/debug-editor-service.ts +2 -2
- package/src/browser/editor/debug-hover-widget.ts +22 -21
- package/src/browser/style/index.css +1 -0
- package/src/node/debug-adapter-session-manager.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-editor-model.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-editor-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"debug-editor-model.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-editor-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ let DebugEditorService = class DebugEditorService {
|
|
|
38
38
|
if (!(editor instanceof monaco_editor_1.MonacoEditor)) {
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
|
-
const uri = editor.
|
|
41
|
+
const uri = editor.getResourceUri().toString();
|
|
42
42
|
const debugModel = this.factory(editor);
|
|
43
43
|
this.models.set(uri, debugModel);
|
|
44
44
|
editor.getControl().onDidDispose(() => {
|
|
@@ -103,10 +103,11 @@ let DebugEditorService = class DebugEditorService {
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
canShowHover() {
|
|
106
|
+
var _a;
|
|
106
107
|
const { model } = this;
|
|
107
108
|
if (model) {
|
|
108
109
|
const selection = model.editor.getControl().getSelection();
|
|
109
|
-
return !!model.editor.getControl().getModel().getWordAtPosition(selection.getStartPosition());
|
|
110
|
+
return !!((_a = model.editor.getControl().getModel()) === null || _a === void 0 ? void 0 : _a.getWordAtPosition(selection.getStartPosition()));
|
|
110
111
|
}
|
|
111
112
|
return false;
|
|
112
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-editor-service.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-editor-service.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,oDAAoD;AACpD,uDAAwE;AACxE,qDAA8D;AAC9D,2EAAuE;AACvE,oEAA+D;AAC/D,6DAAiF;AACjF,yEAAmG;AAM5F,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAiBgB,WAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;IAuJpE,CAAC;IApJa,IAAI;QACV,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAES,IAAI,CAAC,MAAoB;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,CAAC,MAAM,YAAY,4BAAY,CAAC,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"debug-editor-service.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-editor-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="lodash" />
|
|
2
|
-
import { Message } from '@theia/core/shared/@
|
|
2
|
+
import { Message } from '@theia/core/shared/@lumino/messaging';
|
|
3
3
|
import { Container, interfaces } from '@theia/core/shared/inversify';
|
|
4
4
|
import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
|
|
5
5
|
import { DebugSessionManager } from '../debug-session-manager';
|
|
@@ -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,
|
|
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,sCAAsC,CAAC;AAC/D,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;IAyBtB,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;IA8GhG,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB;cAgBhC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;cAQnC,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;CAKvD"}
|
|
@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
19
19
|
exports.DebugHoverWidget = exports.createDebugHoverWidgetContainer = void 0;
|
|
20
20
|
const tslib_1 = require("tslib");
|
|
21
21
|
const debounce = require("@theia/core/shared/lodash.debounce");
|
|
22
|
-
const widgets_1 = require("@theia/core/shared/@
|
|
22
|
+
const widgets_1 = require("@theia/core/shared/@lumino/widgets");
|
|
23
23
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
24
24
|
const browser_1 = require("@theia/core/lib/browser");
|
|
25
25
|
const source_tree_1 = require("@theia/core/lib/browser/source-tree");
|
|
@@ -152,15 +152,15 @@ let DebugHoverWidget = DebugHoverWidget_1 = class DebugHoverWidget extends sourc
|
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
else { // use fallback if no provider was registered
|
|
155
|
-
|
|
156
|
-
if (
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
.
|
|
160
|
-
.
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
155
|
+
const model = this.editor.getControl().getModel();
|
|
156
|
+
if (model) {
|
|
157
|
+
matchingExpression = this.expressionProvider.get(model, options.selection);
|
|
158
|
+
if (matchingExpression) {
|
|
159
|
+
const expressionLineContent = model.getLineContent(this.options.selection.startLineNumber);
|
|
160
|
+
const startColumn = expressionLineContent.indexOf(matchingExpression, this.options.selection.startColumn - matchingExpression.length) + 1;
|
|
161
|
+
const endColumn = startColumn + matchingExpression.length;
|
|
162
|
+
this.options.selection = new monaco.Range(this.options.selection.startLineNumber, startColumn, this.options.selection.startLineNumber, endColumn);
|
|
163
|
+
}
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
166
|
if (!matchingExpression) {
|
|
@@ -210,7 +210,7 @@ let DebugHoverWidget = DebugHoverWidget_1 = class DebugHoverWidget extends sourc
|
|
|
210
210
|
});
|
|
211
211
|
}
|
|
212
212
|
isEditorFrame() {
|
|
213
|
-
return this.sessions.isCurrentEditorFrame(this.editor.
|
|
213
|
+
return this.sessions.isCurrentEditorFrame(this.editor.getResourceUri());
|
|
214
214
|
}
|
|
215
215
|
getPosition() {
|
|
216
216
|
if (!this.isVisible) {
|
|
@@ -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,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,+DAAgE;AAEhE,
|
|
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,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,+DAAgE;AAEhE,gEAA4D;AAE5D,4DAAwG;AACxG,qDAA8C;AAC9C,qEAAuE;AACvE,kEAAqF;AACrF,oEAA+D;AAC/D,iDAA6C;AAC7C,2EAAsE;AACtE,6DAAwD;AACxD,wEAA+D;AAC/D,oDAAoD;AACpD,sHAAmH;AACnH,+GAAoH;AACpH,4FAAoG;AACpG,2FAAwF;AACxF,sCAAyC;AAezC,SAAgB,+BAA+B,CAAC,MAA4B,EAAE,MAAmB;IAC7F,MAAM,KAAK,GAAG,8BAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;QACnD,WAAW,EAAE,KAAK;KACrB,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,CAAC,0BAAW,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAChD,KAAK,CAAC,IAAI,CAAC,qCAAgB,CAAC,CAAC,MAAM,EAAE,CAAC;IACtC,KAAK,CAAC,MAAM,CAAC,8BAAgB,CAAC,CAAC;IAC/B,KAAK,CAAC,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAC;IACtC,OAAO,KAAK,CAAC;AACjB,CAAC;AAVD,0EAUC;AAGM,IAAM,gBAAgB,wBAAtB,MAAM,gBAAiB,SAAQ,8BAAgB;IAA/C;;QAcH,wBAAmB,GAAG,IAAI,CAAC;QAOR,YAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxC,cAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,gBAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QA2C5C,eAAU,GAAG,QAAQ,CAAC,CAAC,EAAc,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IA0K5E,CAAC;IA3NG,KAAK;QACD,OAAO,kBAAgB,CAAC,EAAE,CAAC;IAC/B,CAAC;IAKD,UAAU;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAGkB,IAAI;QACnB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,mBAAmB,CAAC;QAC7C,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,yBAAyB,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,2BAA2B,CAAC;QACzD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE3C,kEAAkE;QAClE,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,WAAW;YAChB,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC3E,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;oBACxB,IAAI,CAAC,IAAI,EAAE,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAEQ,OAAO;QACZ,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEQ,IAAI,CAAC,OAA+B;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5E,CAAC;IAEQ,IAAI,CAAC,OAA+B;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC;IAGS,QAAQ,CAAC,EAAc,EAAE,YAAqB,IAAI;QACxD,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACzB,EAAE,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;IAGS,MAAM;QACZ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,MAAM,CAAC,UAA6C,IAAI,CAAC,OAAO;QAC5E,MAAM,kBAAkB,GAAG,IAAI,sCAAuB,EAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACxE,OAAO;QACX,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,gBAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,kBAAsC,CAAC;QAE3C,MAAM,wBAAwB,GAAG,uCAAkB,CAAC,GAAG,CAAC,2CAAwB,CAAC,CAAC,6BAA6B,CAAC;QAChH,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QAE7D,IAAI,wBAAwB,IAAI,wBAAwB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;YAC5E,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC9E,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,OAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,OAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAE5G,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAC/C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,eAAe,EAAE,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAC7G,CAAC;YAEF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,iBAAU,CAAC,QAAQ,CAAC,CAAC;YACtE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAE/B,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACtB,MAAM,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBACxE,kBAAkB,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;gBAC3F,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC,CAAC,6CAA6C;YAClD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;YAClD,IAAI,KAAK,EAAE,CAAC;gBAER,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC3E,IAAI,kBAAkB,EAAE,CAAC;oBACrB,MAAM,qBAAqB,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;oBAC3F,MAAM,WAAW,GACb,qBAAqB,CAAC,OAAO,CACzB,kBAAkB,EAClB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,GAAG,kBAAkB,CAAC,MAAM,CACjE,GAAG,CAAC,CAAC;oBACV,MAAM,SAAS,GAAG,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC;oBAC1D,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,CACrC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EACtC,WAAW,EACX,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EACtC,SAAS,CACZ,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,iCAAoB,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;gBACzC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,CAAC,CAAC,CAAC,CAAC;QACR,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACvE,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,KAAK,CAAC;QAChC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/C,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC;YAC/B,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAChG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,mCAAa,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3D,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC5C,CAAC;iBAAM,IAAI,mCAAa,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1D,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YAC9B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE;gBAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBACnD,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,WAAW;QACP,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,OAAO,SAAU,CAAC;QACtB,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC3E,OAAO,QAAQ;YACX,CAAC,CAAC;gBACE,QAAQ,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC;gBACnE,UAAU,EAAE;oBACR,MAAM,CAAC,MAAM,CAAC,+BAA+B,CAAC,KAAK;oBACnD,MAAM,CAAC,MAAM,CAAC,+BAA+B,CAAC,KAAK;iBACtD;aACJ;YACD,CAAC,CAAC,SAAU,CAAC;IACrB,CAAC;IAEkB,eAAe,CAAC,GAAY;QAC3C,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,MAAM,KAAK,GAAG,UAAU,IAAI,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;IACjC,CAAC;IAEkB,aAAa,CAAC,GAAY;QACzC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;;AA1OQ,4CAAgB;AAgBlB,mBAAE,GAAG,oBAAoB,AAAvB,CAAwB;AAbd;IADlB,IAAA,kBAAM,EAAC,0BAAW,CAAC;;gDACmB;AAGpB;IADlB,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCACC,2CAAmB;kDAAC;AAG9B;IADlB,IAAA,kBAAM,EAAC,qCAAgB,CAAC;sCACO,qCAAgB;qDAAC;AAG9B;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACO,mDAAuB;4DAAC;AAiB5C;IADlB,IAAA,yBAAa,GAAE;;;;4CAwBf;2BApDQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CA4O5B"}
|
|
@@ -10,7 +10,6 @@
|
|
|
10
10
|
/// <reference types="@theia/plugin/src/theia.proposed.canonicalUriProvider" />
|
|
11
11
|
/// <reference types="@theia/plugin/src/theia.proposed.customEditorMove" />
|
|
12
12
|
/// <reference types="@theia/plugin/src/theia.proposed.diffCommand" />
|
|
13
|
-
/// <reference types="@theia/plugin/src/theia.proposed.documentPaste" />
|
|
14
13
|
/// <reference types="@theia/plugin/src/theia.proposed.editSessionIdentityProvider" />
|
|
15
14
|
/// <reference types="@theia/plugin/src/theia.proposed.extensionsAny" />
|
|
16
15
|
/// <reference types="@theia/plugin/src/theia.proposed.externalUriOpener" />
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/common/inline-debug-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inline-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/common/inline-debug-adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAEvC;;GAEG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IAOvC,OAAO,CAAC,YAAY;IANhC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAc;IACnC,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;gBAE3B,YAAY,EAAE,KAAK,CAAC,YAAY;IAM9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAG5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.DebugAdapterSessionManager = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
|
-
const coreutils_1 = require("@theia/core/shared/@
|
|
20
|
+
const coreutils_1 = require("@theia/core/shared/@lumino/coreutils");
|
|
21
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
22
|
const debug_service_1 = require("../common/debug-service");
|
|
23
23
|
const debug_model_1 = require("../common/debug-model");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,oEAA4D;AAC5D,4DAAkE;AAGlE,2DAAmF;AAEnF,uDAA6G;AAG7G;;GAEG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QACgB,aAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IA2EzE,CAAC;IAnEG,SAAS,CAAC,OAAyB;QAC/B,OAAO,CAAC,sBAAsB,CAAC,GAAG,gCAAgB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAkB,EAAE,SAAS,EAAE,EAAE;YAC5F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,OAAO;YACX,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,IAAI,sCAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,MAA0B,EAAE,QAA0C;QAC/E,MAAM,SAAS,GAAG,gBAAI,CAAC,KAAK,EAAE,CAAC;QAE/B,IAAI,qBAAqB,CAAC;QAC1B,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;YAC1B,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjF,CAAC;aAAM,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;YACxE,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC;QAC3G,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACjE,IAAI,aAAa,EAAE,CAAC;gBAChB,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;YAC1C,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAiB;QACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,SAAiB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;CACJ,CAAA;AA5EY,gEAA0B;AAIhB;IADlB,IAAA,kBAAM,EAAC,wCAA0B,CAAC;;8EACuC;AAGvD;IADlB,IAAA,kBAAM,EAAC,iCAAmB,CAAC;;uEACgC;qCAPnD,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA4EtC"}
|
package/package.json
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.60.0-next.43+2a13720d2",
|
|
4
4
|
"description": "Theia - Debug Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/console": "1.
|
|
7
|
-
"@theia/core": "1.
|
|
8
|
-
"@theia/editor": "1.
|
|
9
|
-
"@theia/filesystem": "1.
|
|
10
|
-
"@theia/markers": "1.
|
|
11
|
-
"@theia/monaco": "1.
|
|
6
|
+
"@theia/console": "1.60.0-next.43+2a13720d2",
|
|
7
|
+
"@theia/core": "1.60.0-next.43+2a13720d2",
|
|
8
|
+
"@theia/editor": "1.60.0-next.43+2a13720d2",
|
|
9
|
+
"@theia/filesystem": "1.60.0-next.43+2a13720d2",
|
|
10
|
+
"@theia/markers": "1.60.0-next.43+2a13720d2",
|
|
11
|
+
"@theia/monaco": "1.60.0-next.43+2a13720d2",
|
|
12
12
|
"@theia/monaco-editor-core": "1.96.302",
|
|
13
|
-
"@theia/output": "1.
|
|
14
|
-
"@theia/process": "1.
|
|
15
|
-
"@theia/task": "1.
|
|
16
|
-
"@theia/terminal": "1.
|
|
17
|
-
"@theia/test": "1.
|
|
18
|
-
"@theia/variable-resolver": "1.
|
|
19
|
-
"@theia/workspace": "1.
|
|
13
|
+
"@theia/output": "1.60.0-next.43+2a13720d2",
|
|
14
|
+
"@theia/process": "1.60.0-next.43+2a13720d2",
|
|
15
|
+
"@theia/task": "1.60.0-next.43+2a13720d2",
|
|
16
|
+
"@theia/terminal": "1.60.0-next.43+2a13720d2",
|
|
17
|
+
"@theia/test": "1.60.0-next.43+2a13720d2",
|
|
18
|
+
"@theia/variable-resolver": "1.60.0-next.43+2a13720d2",
|
|
19
|
+
"@theia/workspace": "1.60.0-next.43+2a13720d2",
|
|
20
20
|
"@vscode/debugprotocol": "^1.51.0",
|
|
21
21
|
"fast-deep-equal": "^3.1.3",
|
|
22
22
|
"jsonc-parser": "^2.2.0",
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"watch": "theiaext watch"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
|
-
"@theia/ext-scripts": "1.
|
|
62
|
+
"@theia/ext-scripts": "1.59.0"
|
|
63
63
|
},
|
|
64
64
|
"nyc": {
|
|
65
65
|
"extends": "../../configs/nyc.json"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "2a13720d2d41d8ae6ee4e34cd2dee1c656a18018"
|
|
68
68
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { UUID } from '@theia/core/shared/@
|
|
17
|
+
import { UUID } from '@theia/core/shared/@lumino/coreutils';
|
|
18
18
|
import { Marker } from '@theia/markers/lib/common/marker';
|
|
19
19
|
import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
|
|
20
20
|
import { isObject, isString, URI } from '@theia/core/lib/common';
|
|
@@ -347,6 +347,10 @@ export class DebugConfigurationManager {
|
|
|
347
347
|
return;
|
|
348
348
|
}
|
|
349
349
|
const editor = widget.editor.getControl();
|
|
350
|
+
const editorModel = editor.getModel();
|
|
351
|
+
if (!editorModel) {
|
|
352
|
+
return;
|
|
353
|
+
}
|
|
350
354
|
const commandService = StandaloneServices.get(ICommandService);
|
|
351
355
|
let position: monaco.Position | undefined;
|
|
352
356
|
let depthInArray = 0;
|
|
@@ -357,7 +361,7 @@ export class DebugConfigurationManager {
|
|
|
357
361
|
},
|
|
358
362
|
onArrayBegin: offset => {
|
|
359
363
|
if (lastProperty === 'configurations' && depthInArray === 0) {
|
|
360
|
-
position =
|
|
364
|
+
position = editorModel!.getPositionAt(offset + 1);
|
|
361
365
|
}
|
|
362
366
|
depthInArray++;
|
|
363
367
|
},
|
|
@@ -369,12 +373,12 @@ export class DebugConfigurationManager {
|
|
|
369
373
|
return;
|
|
370
374
|
}
|
|
371
375
|
// Check if there are more characters on a line after a "configurations": [, if yes enter a newline
|
|
372
|
-
if (
|
|
376
|
+
if (editorModel.getLineLastNonWhitespaceColumn(position.lineNumber) > position.column) {
|
|
373
377
|
editor.setPosition(position);
|
|
374
378
|
editor.trigger('debug', 'lineBreakInsert', undefined);
|
|
375
379
|
}
|
|
376
380
|
// Check if there is already an empty line to insert suggest, if yes just place the cursor
|
|
377
|
-
if (
|
|
381
|
+
if (editorModel!.getLineLastNonWhitespaceColumn(position.lineNumber + 1) === 0) {
|
|
378
382
|
editor.setPosition({ lineNumber: position.lineNumber + 1, column: 1 << 30 });
|
|
379
383
|
await commandService.executeCommand('editor.action.deleteLines');
|
|
380
384
|
}
|
|
@@ -130,13 +130,14 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
130
130
|
this.toDispose.push((monaco.languages.registerCompletionItemProvider as (languageId: LanguageSelector, provider: monaco.languages.CompletionItemProvider) => Disposable)
|
|
131
131
|
({ scheme: input.uri.scheme }, {
|
|
132
132
|
provideCompletionItems: async (model, position, context, token): Promise<monaco.languages.CompletionList> => {
|
|
133
|
+
const editor = this.editor.getControl();
|
|
134
|
+
const editorModel = editor.getModel() as unknown as TextModel | undefined;
|
|
133
135
|
const suggestions: monaco.languages.CompletionItem[] = [];
|
|
134
|
-
if ((this.context === 'condition' || this.context === 'logMessage')
|
|
136
|
+
if (editorModel && (this.context === 'condition' || this.context === 'logMessage')
|
|
135
137
|
&& input.uri.toString() === model.uri.toString()) {
|
|
136
|
-
const editor = this.editor.getControl();
|
|
137
138
|
const completions = await provideSuggestionItems(
|
|
138
139
|
StandaloneServices.get(ILanguageFeaturesService).completionProvider,
|
|
139
|
-
|
|
140
|
+
editorModel,
|
|
140
141
|
new monaco.Position(editor.getPosition()!.lineNumber, 1),
|
|
141
142
|
new CompletionOptions(undefined, new Set<CompletionItemKind>().add(CompletionItemKind.Snippet)),
|
|
142
143
|
context as unknown as CompletionContext, token);
|
|
@@ -161,7 +162,7 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
161
162
|
}));
|
|
162
163
|
this.toDispose.push(this.zone.onDidLayoutChange(dimension => this.layout(dimension)));
|
|
163
164
|
this.toDispose.push(input.getControl().onDidChangeModelContent(() => {
|
|
164
|
-
const heightInLines = input.getControl().getModel()
|
|
165
|
+
const heightInLines = input.getControl().getModel()?.getLineCount() || 0 + 1;
|
|
165
166
|
this.zone.layout(heightInLines);
|
|
166
167
|
this.updatePlaceholder();
|
|
167
168
|
}));
|
|
@@ -203,9 +204,12 @@ export class DebugBreakpointWidget implements Disposable {
|
|
|
203
204
|
const afterLineNumber = breakpoint ? breakpoint.line : position!.lineNumber;
|
|
204
205
|
const afterColumn = breakpoint ? breakpoint.column : position!.column;
|
|
205
206
|
const editor = this._input.getControl();
|
|
206
|
-
const
|
|
207
|
+
const editorModel = editor.getModel();
|
|
208
|
+
const heightInLines = (editorModel?.getLineCount() || 0) + 1;
|
|
207
209
|
this.zone.show({ afterLineNumber, afterColumn, heightInLines, frameWidth: 1 });
|
|
208
|
-
|
|
210
|
+
if (editorModel) {
|
|
211
|
+
editor.setPosition(editorModel.getPositionAt(editorModel.getValueLength()));
|
|
212
|
+
}
|
|
209
213
|
this._input.focus();
|
|
210
214
|
this.editor.getControl().createContextKey<boolean>('isBreakpointWidgetVisible', true);
|
|
211
215
|
}
|
|
@@ -22,6 +22,7 @@ import { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/st
|
|
|
22
22
|
import { IDecorationOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
|
|
23
23
|
import { IEditorHoverOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
|
|
24
24
|
import URI from '@theia/core/lib/common/uri';
|
|
25
|
+
import { URI as CodeUri } from '@theia/core/shared/vscode-uri';
|
|
25
26
|
import { Disposable, DisposableCollection, MenuPath, isOSX } from '@theia/core';
|
|
26
27
|
import { ContextMenuRenderer } from '@theia/core/lib/browser';
|
|
27
28
|
import { BreakpointManager, SourceBreakpointsChangeEvent } from '../breakpoint/breakpoint-manager';
|
|
@@ -66,9 +67,9 @@ export class DebugEditorModel implements Disposable {
|
|
|
66
67
|
protected currentBreakpointDecorations: string[] = [];
|
|
67
68
|
|
|
68
69
|
protected editorDecorations: string[] = [];
|
|
69
|
-
protected topFrameRange: monaco.Range | undefined;
|
|
70
70
|
|
|
71
71
|
protected updatingDecorations = false;
|
|
72
|
+
protected toDisposeOnModelChange = new DisposableCollection();
|
|
72
73
|
|
|
73
74
|
@inject(DebugHoverWidget)
|
|
74
75
|
readonly hover: DebugHoverWidget;
|
|
@@ -99,7 +100,7 @@ export class DebugEditorModel implements Disposable {
|
|
|
99
100
|
|
|
100
101
|
@postConstruct()
|
|
101
102
|
protected init(): void {
|
|
102
|
-
this.uri = new URI(this.editor.
|
|
103
|
+
this.uri = new URI(this.editor.getResourceUri().toString());
|
|
103
104
|
this.toDispose.pushAll([
|
|
104
105
|
this.hover,
|
|
105
106
|
this.breakpointWidget,
|
|
@@ -109,7 +110,7 @@ export class DebugEditorModel implements Disposable {
|
|
|
109
110
|
this.editor.getControl().onMouseLeave(event => this.handleMouseLeave(event)),
|
|
110
111
|
this.editor.getControl().onKeyDown(() => this.hover.hide({ immediate: false })),
|
|
111
112
|
this.editor.getControl().onDidChangeModelContent(() => this.update()),
|
|
112
|
-
this.editor.getControl().
|
|
113
|
+
this.editor.getControl().onDidChangeModel(e => this.updateModel()),
|
|
113
114
|
this.editor.onDidResize(e => this.breakpointWidget.inputSize = e),
|
|
114
115
|
this.sessions.onDidChange(() => this.update()),
|
|
115
116
|
this.toDisposeOnUpdate,
|
|
@@ -124,6 +125,16 @@ export class DebugEditorModel implements Disposable {
|
|
|
124
125
|
this.render();
|
|
125
126
|
}
|
|
126
127
|
|
|
128
|
+
protected updateModel(): void {
|
|
129
|
+
this.toDisposeOnModelChange.dispose();
|
|
130
|
+
this.toDisposeOnModelChange = new DisposableCollection();
|
|
131
|
+
const model = this.editor.getControl().getModel();
|
|
132
|
+
if (model) {
|
|
133
|
+
this.toDisposeOnModelChange.push(model.onDidChangeDecorations(() => this.updateBreakpoints()));
|
|
134
|
+
}
|
|
135
|
+
this.render();
|
|
136
|
+
}
|
|
137
|
+
|
|
127
138
|
dispose(): void {
|
|
128
139
|
this.toDispose.dispose();
|
|
129
140
|
}
|
|
@@ -148,10 +159,10 @@ export class DebugEditorModel implements Disposable {
|
|
|
148
159
|
const codeEditor = this.editor.getControl();
|
|
149
160
|
codeEditor.updateOptions({ hover: { enabled: false } });
|
|
150
161
|
this.toDisposeOnUpdate.push(Disposable.create(() => {
|
|
151
|
-
const model = codeEditor.getModel()
|
|
162
|
+
const model = codeEditor.getModel();
|
|
152
163
|
const overrides = {
|
|
153
|
-
resource:
|
|
154
|
-
overrideIdentifier: model
|
|
164
|
+
resource: CodeUri.parse(this.editor.getResourceUri().toString()),
|
|
165
|
+
overrideIdentifier: model?.getLanguageId(),
|
|
155
166
|
};
|
|
156
167
|
const { enabled, delay, sticky } = StandaloneServices.get(IConfigurationService).getValue<IEditorHoverOptions>('editor.hover', overrides);
|
|
157
168
|
codeEditor.updateOptions({
|
|
@@ -211,14 +222,13 @@ export class DebugEditorModel implements Disposable {
|
|
|
211
222
|
options: DebugEditorModel.TOP_STACK_FRAME_DECORATION,
|
|
212
223
|
range: columnUntilEOLRange
|
|
213
224
|
});
|
|
214
|
-
const
|
|
215
|
-
if (
|
|
225
|
+
const firstNonWhitespaceColumn = this.editor.document.textEditorModel.getLineFirstNonWhitespaceColumn(currentFrame.raw.line);
|
|
226
|
+
if (currentFrame.raw.column > firstNonWhitespaceColumn) {
|
|
216
227
|
decorations.push({
|
|
217
228
|
options: DebugEditorModel.TOP_STACK_FRAME_INLINE_DECORATION,
|
|
218
229
|
range: columnUntilEOLRange
|
|
219
230
|
});
|
|
220
231
|
}
|
|
221
|
-
this.topFrameRange = columnUntilEOLRange;
|
|
222
232
|
} else {
|
|
223
233
|
decorations.push({
|
|
224
234
|
options: DebugEditorModel.FOCUSED_STACK_FRAME_MARGIN,
|
|
@@ -283,8 +293,10 @@ export class DebugEditorModel implements Disposable {
|
|
|
283
293
|
for (let i = 0; i < this.breakpointDecorations.length; i++) {
|
|
284
294
|
const decoration = this.breakpointDecorations[i];
|
|
285
295
|
const breakpoint = breakpoints[i];
|
|
286
|
-
const range = this.editor.getControl().getModel()
|
|
287
|
-
|
|
296
|
+
const range = this.editor.getControl().getModel()?.getDecorationRange(decoration);
|
|
297
|
+
if (range) {
|
|
298
|
+
this.breakpointRanges.set(decoration, [range, breakpoint]);
|
|
299
|
+
}
|
|
288
300
|
}
|
|
289
301
|
}
|
|
290
302
|
|
|
@@ -301,7 +313,7 @@ export class DebugEditorModel implements Disposable {
|
|
|
301
313
|
const column = breakpoint.column;
|
|
302
314
|
const range = typeof column === 'number' ? new monaco.Range(lineNumber, column, lineNumber, column + 1) : new monaco.Range(lineNumber, 1, lineNumber, 1);
|
|
303
315
|
const { className, message } = breakpoint.getDecoration();
|
|
304
|
-
const renderInline = typeof column === 'number' && (column > this.editor.getControl().getModel()
|
|
316
|
+
const renderInline = typeof column === 'number' && (column > (this.editor.getControl().getModel()?.getLineFirstNonWhitespaceColumn(lineNumber) || 0));
|
|
305
317
|
return {
|
|
306
318
|
range,
|
|
307
319
|
options: {
|
|
@@ -324,7 +336,7 @@ export class DebugEditorModel implements Disposable {
|
|
|
324
336
|
return false;
|
|
325
337
|
}
|
|
326
338
|
for (const decoration of this.breakpointDecorations) {
|
|
327
|
-
const range = this.editor.getControl().getModel()
|
|
339
|
+
const range = this.editor.getControl().getModel()?.getDecorationRange(decoration);
|
|
328
340
|
const oldRange = this.breakpointRanges.get(decoration)![0];
|
|
329
341
|
if (!range || !range.equalsRange(oldRange)) {
|
|
330
342
|
return true;
|
|
@@ -337,7 +349,7 @@ export class DebugEditorModel implements Disposable {
|
|
|
337
349
|
const lines = new Set<number>();
|
|
338
350
|
const breakpoints: SourceBreakpoint[] = [];
|
|
339
351
|
for (const decoration of this.breakpointDecorations) {
|
|
340
|
-
const range = this.editor.getControl().getModel()
|
|
352
|
+
const range = this.editor.getControl().getModel()?.getDecorationRange(decoration);
|
|
341
353
|
if (range && !lines.has(range.startLineNumber)) {
|
|
342
354
|
const line = range.startLineNumber;
|
|
343
355
|
const column = range.startColumn;
|
|
@@ -57,7 +57,7 @@ export class DebugEditorService {
|
|
|
57
57
|
if (!(editor instanceof MonacoEditor)) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
const uri = editor.
|
|
60
|
+
const uri = editor.getResourceUri().toString();
|
|
61
61
|
const debugModel = this.factory(editor);
|
|
62
62
|
this.models.set(uri, debugModel);
|
|
63
63
|
editor.getControl().onDidDispose(() => {
|
|
@@ -134,7 +134,7 @@ export class DebugEditorService {
|
|
|
134
134
|
const { model } = this;
|
|
135
135
|
if (model) {
|
|
136
136
|
const selection = model.editor.getControl().getSelection()!;
|
|
137
|
-
return !!model.editor.getControl().getModel()
|
|
137
|
+
return !!model.editor.getControl().getModel()?.getWordAtPosition(selection.getStartPosition());
|
|
138
138
|
}
|
|
139
139
|
return false;
|
|
140
140
|
}
|