@theia/debug 1.42.1 → 1.43.0
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-hover-widget.d.ts.map +1 -1
- package/lib/browser/editor/debug-hover-widget.js +9 -0
- package/lib/browser/editor/debug-hover-widget.js.map +1 -1
- package/lib/browser/editor/debug-inline-value-decorator.d.ts +1 -1
- package/lib/browser/editor/debug-inline-value-decorator.d.ts.map +1 -1
- package/lib/browser/model/debug-thread.d.ts +1 -0
- package/lib/browser/model/debug-thread.d.ts.map +1 -1
- package/lib/browser/model/debug-thread.js +33 -4
- package/lib/browser/model/debug-thread.js.map +1 -1
- package/package.json +15 -15
- package/src/browser/editor/debug-hover-widget.ts +18 -0
- package/src/browser/editor/debug-inline-value-decorator.ts +1 -1
- package/src/browser/model/debug-thread.tsx +39 -6
|
@@ -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;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;
|
|
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;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;IA6GhG,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"}
|
|
@@ -161,6 +161,15 @@ let DebugHoverWidget = DebugHoverWidget_1 = class DebugHoverWidget extends sourc
|
|
|
161
161
|
}
|
|
162
162
|
else { // use fallback if no provider was registered
|
|
163
163
|
matchingExpression = this.expressionProvider.get(this.editor.getControl().getModel(), options.selection);
|
|
164
|
+
if (matchingExpression) {
|
|
165
|
+
const expressionLineContent = this.editor
|
|
166
|
+
.getControl()
|
|
167
|
+
.getModel()
|
|
168
|
+
.getLineContent(this.options.selection.startLineNumber);
|
|
169
|
+
const startColumn = expressionLineContent.indexOf(matchingExpression, this.options.selection.startColumn - matchingExpression.length) + 1;
|
|
170
|
+
const endColumn = startColumn + matchingExpression.length;
|
|
171
|
+
this.options.selection = new monaco.Range(this.options.selection.startLineNumber, startColumn, this.options.selection.startLineNumber, endColumn);
|
|
172
|
+
}
|
|
164
173
|
}
|
|
165
174
|
if (!matchingExpression) {
|
|
166
175
|
this.hide();
|
|
@@ -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,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;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;AAGD,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,8BAAgB;IAAtD;;QAcI,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;
|
|
1
|
+
{"version":3,"file":"debug-hover-widget.js","sourceRoot":"","sources":["../../../src/browser/editor/debug-hover-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
|
|
1
|
+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
|
|
2
2
|
import * as monaco from '@theia/monaco-editor-core';
|
|
3
3
|
import { IDecorationOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
|
|
4
4
|
import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-inline-value-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-inline-value-decorator.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"debug-inline-value-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/editor/debug-inline-value-decorator.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,2DAA2D,CAAC;AAE5G,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6DAA6D,CAAC;AAMjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAEtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,2BAA2B,0BAA0B,CAAC;AAmBnE,qBACa,yBAA0B,YAAW,+BAA+B;IAG7E,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IAEjD,SAAS,CAAC,OAAO,UAAS;IAC1B,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAa;IAEvF,OAAO,IAAI,IAAI;IAUT,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;cAOtH,4BAA4B,CACxC,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,EAC3C,UAAU,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;YA6B7D,uCAAuC;IAiKrD,SAAS,CAAC,iBAAiB,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM;IAetD,OAAO,CAAC,2BAA2B;IAkCnC,OAAO,CAAC,qBAAqB;CA8ChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-thread.d.ts","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"debug-thread.d.ts","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
|
|
@@ -191,10 +191,39 @@ class DebugThread extends DebugThreadData {
|
|
|
191
191
|
}
|
|
192
192
|
render() {
|
|
193
193
|
const reason = this.stoppedDetails && this.stoppedDetails.reason;
|
|
194
|
-
const
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
194
|
+
const localizedReason = this.getLocalizedReason(reason);
|
|
195
|
+
const status = this.stoppedDetails
|
|
196
|
+
? reason
|
|
197
|
+
? core_1.nls.localizeByDefault('Paused on {0}', localizedReason)
|
|
198
|
+
: core_1.nls.localizeByDefault('Paused')
|
|
199
|
+
: core_1.nls.localizeByDefault('Running');
|
|
200
|
+
return (React.createElement("div", { className: "theia-debug-thread", title: core_1.nls.localizeByDefault('Session') },
|
|
201
|
+
React.createElement("span", { className: "label" }, this.raw.name),
|
|
202
|
+
React.createElement("span", { className: "status" }, status)));
|
|
203
|
+
}
|
|
204
|
+
getLocalizedReason(reason) {
|
|
205
|
+
switch (reason) {
|
|
206
|
+
case 'step':
|
|
207
|
+
return core_1.nls.localize('theia/debug/step', 'step');
|
|
208
|
+
case 'breakpoint':
|
|
209
|
+
return core_1.nls.localize('theia/debug/breakpoint', 'breakpoint');
|
|
210
|
+
case 'exception':
|
|
211
|
+
return core_1.nls.localize('theia/debug/exception', 'exception');
|
|
212
|
+
case 'pause':
|
|
213
|
+
return core_1.nls.localize('theia/debug/pause', 'pause');
|
|
214
|
+
case 'entry':
|
|
215
|
+
return core_1.nls.localize('theia/debug/entry', 'entry');
|
|
216
|
+
case 'goto':
|
|
217
|
+
return core_1.nls.localize('theia/debug/goto', 'goto');
|
|
218
|
+
case 'function breakpoint':
|
|
219
|
+
return core_1.nls.localize('theia/debug/functionBreakpoint', 'function breakpoint');
|
|
220
|
+
case 'data breakpoint':
|
|
221
|
+
return core_1.nls.localize('theia/debug/dataBreakpoint', 'data breakpoint');
|
|
222
|
+
case 'instruction breakpoint':
|
|
223
|
+
return core_1.nls.localize('theia/debug/instructionBreakpoint', 'instruction breakpoint');
|
|
224
|
+
default:
|
|
225
|
+
return '';
|
|
226
|
+
}
|
|
198
227
|
}
|
|
199
228
|
}
|
|
200
229
|
exports.DebugThread = DebugThread;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-thread.js","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.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,gFAAgF;AAChF,gFAAgF;;;AAEhF,kDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"debug-thread.js","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.43.0",
|
|
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.43.0",
|
|
7
|
+
"@theia/core": "1.43.0",
|
|
8
|
+
"@theia/editor": "1.43.0",
|
|
9
|
+
"@theia/filesystem": "1.43.0",
|
|
10
|
+
"@theia/markers": "1.43.0",
|
|
11
|
+
"@theia/monaco": "1.43.0",
|
|
12
12
|
"@theia/monaco-editor-core": "1.72.3",
|
|
13
|
-
"@theia/output": "1.
|
|
14
|
-
"@theia/process": "1.
|
|
15
|
-
"@theia/task": "1.
|
|
16
|
-
"@theia/terminal": "1.
|
|
17
|
-
"@theia/variable-resolver": "1.
|
|
18
|
-
"@theia/workspace": "1.
|
|
13
|
+
"@theia/output": "1.43.0",
|
|
14
|
+
"@theia/process": "1.43.0",
|
|
15
|
+
"@theia/task": "1.43.0",
|
|
16
|
+
"@theia/terminal": "1.43.0",
|
|
17
|
+
"@theia/variable-resolver": "1.43.0",
|
|
18
|
+
"@theia/workspace": "1.43.0",
|
|
19
19
|
"@vscode/debugprotocol": "^1.51.0",
|
|
20
20
|
"fast-deep-equal": "^3.1.3",
|
|
21
21
|
"jsonc-parser": "^2.2.0",
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
"watch": "theiaext watch"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@theia/ext-scripts": "1.
|
|
59
|
+
"@theia/ext-scripts": "1.43.0"
|
|
60
60
|
},
|
|
61
61
|
"nyc": {
|
|
62
62
|
"extends": "../../configs/nyc.json"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "c94caea7fe1cc7c9f05b1c3f55afb6b5eb69bbb2"
|
|
65
65
|
}
|
|
@@ -197,6 +197,24 @@ export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.
|
|
|
197
197
|
}
|
|
198
198
|
} else { // use fallback if no provider was registered
|
|
199
199
|
matchingExpression = this.expressionProvider.get(this.editor.getControl().getModel()!, options.selection);
|
|
200
|
+
if (matchingExpression) {
|
|
201
|
+
const expressionLineContent = this.editor
|
|
202
|
+
.getControl()
|
|
203
|
+
.getModel()!
|
|
204
|
+
.getLineContent(this.options.selection.startLineNumber);
|
|
205
|
+
const startColumn =
|
|
206
|
+
expressionLineContent.indexOf(
|
|
207
|
+
matchingExpression,
|
|
208
|
+
this.options.selection.startColumn - matchingExpression.length
|
|
209
|
+
) + 1;
|
|
210
|
+
const endColumn = startColumn + matchingExpression.length;
|
|
211
|
+
this.options.selection = new monaco.Range(
|
|
212
|
+
this.options.selection.startLineNumber,
|
|
213
|
+
startColumn,
|
|
214
|
+
this.options.selection.startLineNumber,
|
|
215
|
+
endColumn
|
|
216
|
+
);
|
|
217
|
+
}
|
|
200
218
|
}
|
|
201
219
|
|
|
202
220
|
if (!matchingExpression) {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
*--------------------------------------------------------------------------------------------*/
|
|
21
21
|
// Based on https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
|
|
22
22
|
|
|
23
|
-
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
|
|
23
|
+
import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
|
|
24
24
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
25
25
|
import * as monaco from '@theia/monaco-editor-core';
|
|
26
26
|
import { CancellationTokenSource } from '@theia/monaco-editor-core/esm/vs/base/common/cancellation';
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
|
-
import { CancellationTokenSource, Emitter, Event } from '@theia/core';
|
|
18
|
+
import { CancellationTokenSource, Emitter, Event, nls } from '@theia/core';
|
|
19
19
|
import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
|
|
20
20
|
import { TreeElement } from '@theia/core/lib/browser/source-tree';
|
|
21
21
|
import { DebugStackFrame } from './debug-stack-frame';
|
|
@@ -230,11 +230,44 @@ export class DebugThread extends DebugThreadData implements TreeElement {
|
|
|
230
230
|
|
|
231
231
|
render(): React.ReactNode {
|
|
232
232
|
const reason = this.stoppedDetails && this.stoppedDetails.reason;
|
|
233
|
-
const
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
233
|
+
const localizedReason = this.getLocalizedReason(reason);
|
|
234
|
+
|
|
235
|
+
const status = this.stoppedDetails
|
|
236
|
+
? reason
|
|
237
|
+
? nls.localizeByDefault('Paused on {0}', localizedReason)
|
|
238
|
+
: nls.localizeByDefault('Paused')
|
|
239
|
+
: nls.localizeByDefault('Running');
|
|
240
|
+
return (
|
|
241
|
+
<div className="theia-debug-thread" title={nls.localizeByDefault('Session')}>
|
|
242
|
+
<span className="label">{this.raw.name}</span>
|
|
243
|
+
<span className="status">{status}</span>
|
|
244
|
+
</div>
|
|
245
|
+
);
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
protected getLocalizedReason(reason: string | undefined): string {
|
|
249
|
+
switch (reason) {
|
|
250
|
+
case 'step':
|
|
251
|
+
return nls.localize('theia/debug/step', 'step');
|
|
252
|
+
case 'breakpoint':
|
|
253
|
+
return nls.localize('theia/debug/breakpoint', 'breakpoint');
|
|
254
|
+
case 'exception':
|
|
255
|
+
return nls.localize('theia/debug/exception', 'exception');
|
|
256
|
+
case 'pause':
|
|
257
|
+
return nls.localize('theia/debug/pause', 'pause');
|
|
258
|
+
case 'entry':
|
|
259
|
+
return nls.localize('theia/debug/entry', 'entry');
|
|
260
|
+
case 'goto':
|
|
261
|
+
return nls.localize('theia/debug/goto', 'goto');
|
|
262
|
+
case 'function breakpoint':
|
|
263
|
+
return nls.localize('theia/debug/functionBreakpoint', 'function breakpoint');
|
|
264
|
+
case 'data breakpoint':
|
|
265
|
+
return nls.localize('theia/debug/dataBreakpoint', 'data breakpoint');
|
|
266
|
+
case 'instruction breakpoint':
|
|
267
|
+
return nls.localize('theia/debug/instructionBreakpoint', 'instruction breakpoint');
|
|
268
|
+
default:
|
|
269
|
+
return '';
|
|
270
|
+
}
|
|
238
271
|
}
|
|
239
272
|
|
|
240
273
|
}
|