@theia/debug 1.68.0-next.9 → 1.68.1

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.
Files changed (151) hide show
  1. package/lib/browser/breakpoint/breakpoint-manager.js +10 -10
  2. package/lib/browser/breakpoint/breakpoint-manager.js.map +1 -1
  3. package/lib/browser/breakpoint/breakpoint-marker.js +4 -6
  4. package/lib/browser/breakpoint/breakpoint-marker.js.map +1 -1
  5. package/lib/browser/breakpoint/debug-data-breakpoint-actions.js +7 -10
  6. package/lib/browser/breakpoint/debug-data-breakpoint-actions.js.map +1 -1
  7. package/lib/browser/console/debug-console-contribution.d.ts +16 -4
  8. package/lib/browser/console/debug-console-contribution.d.ts.map +1 -1
  9. package/lib/browser/console/debug-console-contribution.js +158 -44
  10. package/lib/browser/console/debug-console-contribution.js.map +1 -1
  11. package/lib/browser/console/debug-console-items.d.ts +0 -1
  12. package/lib/browser/console/debug-console-items.d.ts.map +1 -1
  13. package/lib/browser/console/debug-console-items.js +11 -16
  14. package/lib/browser/console/debug-console-items.js.map +1 -1
  15. package/lib/browser/console/debug-console-session.d.ts +9 -1
  16. package/lib/browser/console/debug-console-session.d.ts.map +1 -1
  17. package/lib/browser/console/debug-console-session.js +59 -4
  18. package/lib/browser/console/debug-console-session.js.map +1 -1
  19. package/lib/browser/debug-commands.js +3 -3
  20. package/lib/browser/debug-commands.js.map +1 -1
  21. package/lib/browser/debug-configuration-manager.js +8 -14
  22. package/lib/browser/debug-configuration-manager.js.map +1 -1
  23. package/lib/browser/debug-frontend-application-contribution.js +17 -21
  24. package/lib/browser/debug-frontend-application-contribution.js.map +1 -1
  25. package/lib/browser/debug-prefix-configuration.js +4 -4
  26. package/lib/browser/debug-prefix-configuration.js.map +1 -1
  27. package/lib/browser/debug-session-manager.js +4 -5
  28. package/lib/browser/debug-session-manager.js.map +1 -1
  29. package/lib/browser/debug-session-options.js +1 -2
  30. package/lib/browser/debug-session-options.js.map +1 -1
  31. package/lib/browser/debug-session.d.ts +0 -1
  32. package/lib/browser/debug-session.d.ts.map +1 -1
  33. package/lib/browser/debug-session.js +13 -19
  34. package/lib/browser/debug-session.js.map +1 -1
  35. package/lib/browser/disassembly-view/disassembly-view-breakpoint-renderer.js +7 -10
  36. package/lib/browser/disassembly-view/disassembly-view-breakpoint-renderer.js.map +1 -1
  37. package/lib/browser/disassembly-view/disassembly-view-contribution.js +7 -8
  38. package/lib/browser/disassembly-view/disassembly-view-contribution.js.map +1 -1
  39. package/lib/browser/disassembly-view/disassembly-view-instruction-renderer.js +16 -18
  40. package/lib/browser/disassembly-view/disassembly-view-instruction-renderer.js.map +1 -1
  41. package/lib/browser/disassembly-view/disassembly-view-table-delegate.js +1 -2
  42. package/lib/browser/disassembly-view/disassembly-view-table-delegate.js.map +1 -1
  43. package/lib/browser/disassembly-view/disassembly-view-widget.d.ts.map +1 -1
  44. package/lib/browser/disassembly-view/disassembly-view-widget.js +29 -34
  45. package/lib/browser/disassembly-view/disassembly-view-widget.js.map +1 -1
  46. package/lib/browser/editor/debug-breakpoint-widget.d.ts.map +1 -1
  47. package/lib/browser/editor/debug-breakpoint-widget.js +5 -5
  48. package/lib/browser/editor/debug-breakpoint-widget.js.map +1 -1
  49. package/lib/browser/editor/debug-editor-model.d.ts.map +1 -1
  50. package/lib/browser/editor/debug-editor-model.js +36 -39
  51. package/lib/browser/editor/debug-editor-model.js.map +1 -1
  52. package/lib/browser/editor/debug-editor-service.js +1 -2
  53. package/lib/browser/editor/debug-editor-service.js.map +1 -1
  54. package/lib/browser/editor/debug-hover-source.d.ts +0 -1
  55. package/lib/browser/editor/debug-hover-source.d.ts.map +1 -1
  56. package/lib/browser/editor/debug-hover-widget.d.ts +0 -1
  57. package/lib/browser/editor/debug-hover-widget.d.ts.map +1 -1
  58. package/lib/browser/editor/debug-hover-widget.js +10 -9
  59. package/lib/browser/editor/debug-hover-widget.js.map +1 -1
  60. package/lib/browser/editor/debug-inline-value-decorator.d.ts.map +1 -1
  61. package/lib/browser/editor/debug-inline-value-decorator.js +6 -3
  62. package/lib/browser/editor/debug-inline-value-decorator.js.map +1 -1
  63. package/lib/browser/model/debug-breakpoint.d.ts +0 -1
  64. package/lib/browser/model/debug-breakpoint.d.ts.map +1 -1
  65. package/lib/browser/model/debug-breakpoint.js +1 -2
  66. package/lib/browser/model/debug-breakpoint.js.map +1 -1
  67. package/lib/browser/model/debug-data-breakpoint.d.ts +0 -1
  68. package/lib/browser/model/debug-data-breakpoint.d.ts.map +1 -1
  69. package/lib/browser/model/debug-data-breakpoint.js +2 -3
  70. package/lib/browser/model/debug-data-breakpoint.js.map +1 -1
  71. package/lib/browser/model/debug-function-breakpoint.d.ts +0 -1
  72. package/lib/browser/model/debug-function-breakpoint.d.ts.map +1 -1
  73. package/lib/browser/model/debug-instruction-breakpoint.d.ts +0 -1
  74. package/lib/browser/model/debug-instruction-breakpoint.d.ts.map +1 -1
  75. package/lib/browser/model/debug-instruction-breakpoint.js +2 -3
  76. package/lib/browser/model/debug-instruction-breakpoint.js.map +1 -1
  77. package/lib/browser/model/debug-source-breakpoint.d.ts +0 -1
  78. package/lib/browser/model/debug-source-breakpoint.d.ts.map +1 -1
  79. package/lib/browser/model/debug-source-breakpoint.js +3 -1
  80. package/lib/browser/model/debug-source-breakpoint.js.map +1 -1
  81. package/lib/browser/model/debug-source.js +2 -2
  82. package/lib/browser/model/debug-source.js.map +1 -1
  83. package/lib/browser/model/debug-stack-frame.d.ts +0 -1
  84. package/lib/browser/model/debug-stack-frame.d.ts.map +1 -1
  85. package/lib/browser/model/debug-thread.d.ts +0 -1
  86. package/lib/browser/model/debug-thread.d.ts.map +1 -1
  87. package/lib/browser/model/debug-thread.js +3 -5
  88. package/lib/browser/model/debug-thread.js.map +1 -1
  89. package/lib/browser/view/debug-action.d.ts +0 -1
  90. package/lib/browser/view/debug-action.d.ts.map +1 -1
  91. package/lib/browser/view/debug-breakpoints-widget.d.ts +0 -1
  92. package/lib/browser/view/debug-breakpoints-widget.d.ts.map +1 -1
  93. package/lib/browser/view/debug-breakpoints-widget.js +7 -6
  94. package/lib/browser/view/debug-breakpoints-widget.js.map +1 -1
  95. package/lib/browser/view/debug-configuration-select.d.ts +0 -1
  96. package/lib/browser/view/debug-configuration-select.d.ts.map +1 -1
  97. package/lib/browser/view/debug-configuration-select.js +6 -7
  98. package/lib/browser/view/debug-configuration-select.js.map +1 -1
  99. package/lib/browser/view/debug-configuration-widget.d.ts +0 -1
  100. package/lib/browser/view/debug-configuration-widget.d.ts.map +1 -1
  101. package/lib/browser/view/debug-exception-breakpoint.d.ts +0 -1
  102. package/lib/browser/view/debug-exception-breakpoint.d.ts.map +1 -1
  103. package/lib/browser/view/debug-exception-breakpoint.js +1 -2
  104. package/lib/browser/view/debug-exception-breakpoint.js.map +1 -1
  105. package/lib/browser/view/debug-session-widget.js +3 -2
  106. package/lib/browser/view/debug-session-widget.js.map +1 -1
  107. package/lib/browser/view/debug-stack-frames-source.d.ts +0 -1
  108. package/lib/browser/view/debug-stack-frames-source.d.ts.map +1 -1
  109. package/lib/browser/view/debug-stack-frames-widget.d.ts +0 -1
  110. package/lib/browser/view/debug-stack-frames-widget.d.ts.map +1 -1
  111. package/lib/browser/view/debug-stack-frames-widget.js +4 -3
  112. package/lib/browser/view/debug-stack-frames-widget.js.map +1 -1
  113. package/lib/browser/view/debug-threads-widget.d.ts +0 -1
  114. package/lib/browser/view/debug-threads-widget.d.ts.map +1 -1
  115. package/lib/browser/view/debug-threads-widget.js +7 -6
  116. package/lib/browser/view/debug-threads-widget.js.map +1 -1
  117. package/lib/browser/view/debug-toolbar-widget.d.ts +0 -1
  118. package/lib/browser/view/debug-toolbar-widget.d.ts.map +1 -1
  119. package/lib/browser/view/debug-toolbar-widget.js +4 -3
  120. package/lib/browser/view/debug-toolbar-widget.js.map +1 -1
  121. package/lib/browser/view/debug-variables-widget.d.ts +0 -1
  122. package/lib/browser/view/debug-variables-widget.d.ts.map +1 -1
  123. package/lib/browser/view/debug-variables-widget.js +11 -10
  124. package/lib/browser/view/debug-variables-widget.js.map +1 -1
  125. package/lib/browser/view/debug-watch-expression.d.ts +0 -1
  126. package/lib/browser/view/debug-watch-expression.d.ts.map +1 -1
  127. package/lib/browser/view/debug-watch-widget.js +6 -5
  128. package/lib/browser/view/debug-watch-widget.js.map +1 -1
  129. package/lib/browser/view/debug-widget.js +4 -3
  130. package/lib/browser/view/debug-widget.js.map +1 -1
  131. package/lib/common/debug-adapter-session.js +1 -2
  132. package/lib/common/debug-adapter-session.js.map +1 -1
  133. package/lib/common/debug-preferences.js +7 -7
  134. package/lib/common/debug-preferences.js.map +1 -1
  135. package/lib/common/debug-service.js +1 -1
  136. package/lib/common/debug-service.js.map +1 -1
  137. package/lib/common/launch-preferences.js +2 -2
  138. package/lib/common/launch-preferences.js.map +1 -1
  139. package/lib/node/stream-debug-adapter.d.ts +0 -5
  140. package/lib/node/stream-debug-adapter.d.ts.map +1 -1
  141. package/lib/node/stream-debug-adapter.js +4 -5
  142. package/lib/node/stream-debug-adapter.js.map +1 -1
  143. package/package.json +16 -16
  144. package/src/browser/console/debug-console-contribution.tsx +194 -38
  145. package/src/browser/console/debug-console-session.ts +65 -1
  146. package/src/browser/disassembly-view/disassembly-view-widget.ts +6 -3
  147. package/src/browser/editor/debug-editor-model.ts +1 -0
  148. package/src/browser/editor/debug-inline-value-decorator.ts +6 -3
  149. package/src/browser/model/debug-source-breakpoint.tsx +3 -1
  150. package/src/browser/style/debug.css +28 -0
  151. package/src/common/debug-preferences.ts +4 -4
@@ -16,7 +16,8 @@
16
16
  // *****************************************************************************
17
17
  var BreakpointManager_1;
18
18
  Object.defineProperty(exports, "__esModule", { value: true });
19
- exports.diff = exports.BreakpointManager = void 0;
19
+ exports.BreakpointManager = void 0;
20
+ exports.diff = diff;
20
21
  const tslib_1 = require("tslib");
21
22
  const deepEqual = require("fast-deep-equal");
22
23
  const inversify_1 = require("@theia/core/shared/inversify");
@@ -25,7 +26,7 @@ const browser_1 = require("@theia/core/lib/browser");
25
26
  const marker_manager_1 = require("@theia/markers/lib/browser/marker-manager");
26
27
  const uri_1 = require("@theia/core/lib/common/uri");
27
28
  const breakpoint_marker_1 = require("./breakpoint-marker");
28
- let BreakpointManager = BreakpointManager_1 = class BreakpointManager extends marker_manager_1.MarkerManager {
29
+ let BreakpointManager = class BreakpointManager extends marker_manager_1.MarkerManager {
29
30
  constructor() {
30
31
  super(...arguments);
31
32
  this.owner = 'breakpoint';
@@ -43,6 +44,11 @@ let BreakpointManager = BreakpointManager_1 = class BreakpointManager extends ma
43
44
  this.instructionBreakpoints = [];
44
45
  this.dataBreakpoints = [];
45
46
  }
47
+ static { BreakpointManager_1 = this; }
48
+ static { this.EXCEPTION_URI = new uri_1.default('debug:exception://'); }
49
+ static { this.FUNCTION_URI = new uri_1.default('debug:function://'); }
50
+ static { this.INSTRUCTION_URI = new uri_1.default('debug:instruction://'); }
51
+ static { this.DATA_URI = new uri_1.default('debug:data://'); }
46
52
  getKind() {
47
53
  return breakpoint_marker_1.BREAKPOINT_KIND;
48
54
  }
@@ -64,7 +70,7 @@ let BreakpointManager = BreakpointManager_1 = class BreakpointManager extends ma
64
70
  // We emit all existing markers as 'changed', but we only fire an event if something really did change.
65
71
  // We also fire an event if oldMarker === newMarker, as we cannot actually detect a change in this case
66
72
  // (https://github.com/eclipse-theia/theia/issues/12546).
67
- didChangeMarkers || (didChangeMarkers = !!added.length || oldMarker === newMarker || !deepEqual(oldMarker, newMarker));
73
+ didChangeMarkers ||= !!added.length || oldMarker === newMarker || !deepEqual(oldMarker, newMarker);
68
74
  changed.push(newMarker);
69
75
  }
70
76
  }
@@ -263,13 +269,12 @@ let BreakpointManager = BreakpointManager_1 = class BreakpointManager extends ma
263
269
  this.setDataBreakpoints(this.dataBreakpoints.concat(breakpoint));
264
270
  }
265
271
  updateDataBreakpoint(id, options) {
266
- var _a;
267
272
  const breakpoint = this.dataBreakpoints.find(bp => bp.id === id);
268
273
  if (!breakpoint) {
269
274
  return;
270
275
  }
271
276
  Object.assign(breakpoint.raw, options);
272
- breakpoint.enabled = (_a = options.enabled) !== null && _a !== void 0 ? _a : breakpoint.enabled;
277
+ breakpoint.enabled = options.enabled ?? breakpoint.enabled;
273
278
  this.fireOnDidChangeMarkers(BreakpointManager_1.DATA_URI);
274
279
  this.onDidChangeDataBreakpointsEmitter.fire({ uri: BreakpointManager_1.DATA_URI, added: [], removed: [], changed: [breakpoint] });
275
280
  }
@@ -334,10 +339,6 @@ let BreakpointManager = BreakpointManager_1 = class BreakpointManager extends ma
334
339
  }
335
340
  };
336
341
  exports.BreakpointManager = BreakpointManager;
337
- BreakpointManager.EXCEPTION_URI = new uri_1.default('debug:exception://');
338
- BreakpointManager.FUNCTION_URI = new uri_1.default('debug:function://');
339
- BreakpointManager.INSTRUCTION_URI = new uri_1.default('debug:instruction://');
340
- BreakpointManager.DATA_URI = new uri_1.default('debug:data://');
341
342
  tslib_1.__decorate([
342
343
  (0, inversify_1.inject)(browser_1.StorageService),
343
344
  tslib_1.__metadata("design:type", Object)
@@ -363,5 +364,4 @@ function diff(prevs, nexts, toKey) {
363
364
  const removed = Array.from(old.values());
364
365
  return { added, removed, changed };
365
366
  }
366
- exports.diff = diff;
367
367
  //# sourceMappingURL=breakpoint-manager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"breakpoint-manager.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/breakpoint-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"breakpoint-manager.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/breakpoint-manager.ts"],"names":[],"mappings":"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"}
@@ -72,11 +72,10 @@ var FunctionBreakpoint;
72
72
  var InstructionBreakpoint;
73
73
  (function (InstructionBreakpoint) {
74
74
  function create(raw, existing) {
75
- var _a, _b;
76
75
  return {
77
76
  ...raw,
78
- id: (_a = existing === null || existing === void 0 ? void 0 : existing.id) !== null && _a !== void 0 ? _a : coreutils_1.UUID.uuid4(),
79
- enabled: (_b = existing === null || existing === void 0 ? void 0 : existing.enabled) !== null && _b !== void 0 ? _b : true,
77
+ id: existing?.id ?? coreutils_1.UUID.uuid4(),
78
+ enabled: existing?.enabled ?? true,
80
79
  };
81
80
  }
82
81
  InstructionBreakpoint.create = create;
@@ -88,12 +87,11 @@ var InstructionBreakpoint;
88
87
  var DataBreakpoint;
89
88
  (function (DataBreakpoint) {
90
89
  function create(raw, info, source, ref) {
91
- var _a, _b;
92
90
  return {
93
91
  raw,
94
92
  info,
95
- id: (_a = ref === null || ref === void 0 ? void 0 : ref.id) !== null && _a !== void 0 ? _a : coreutils_1.UUID.uuid4(),
96
- enabled: (_b = ref === null || ref === void 0 ? void 0 : ref.enabled) !== null && _b !== void 0 ? _b : true,
93
+ id: ref?.id ?? coreutils_1.UUID.uuid4(),
94
+ enabled: ref?.enabled ?? true,
97
95
  source
98
96
  };
99
97
  }
@@ -1 +1 @@
1
- {"version":3,"file":"breakpoint-marker.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/breakpoint-marker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"breakpoint-marker.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/breakpoint-marker.ts"],"names":[],"mappings":"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"}
@@ -29,9 +29,8 @@ const debug_breakpoints_widget_1 = require("../view/debug-breakpoints-widget");
29
29
  // Adapted from https://github.com/microsoft/vscode/blob/9c883243a89e7ec3b730d3746fbb1e836d5e4f52/src/vs/workbench/contrib/debug/browser/breakpointsView.ts#L1506-L1625
30
30
  let AddOrEditDataBreakpointAddress = class AddOrEditDataBreakpointAddress {
31
31
  isEnabled(node) {
32
- var _a, _b;
33
- return !!((_a = this.viewModel.currentSession) === null || _a === void 0 ? void 0 : _a.capabilities.supportsDataBreakpoints)
34
- && ((_b = this.viewModel.currentSession) === null || _b === void 0 ? void 0 : _b.capabilities.supportsDataBreakpointBytes) !== false
32
+ return !!this.viewModel.currentSession?.capabilities.supportsDataBreakpoints
33
+ && this.viewModel.currentSession?.capabilities.supportsDataBreakpointBytes !== false
35
34
  && this.isAddressBreakpointOrDebugWidget(node);
36
35
  }
37
36
  isVisible(node) {
@@ -46,14 +45,13 @@ let AddOrEditDataBreakpointAddress = class AddOrEditDataBreakpointAddress {
46
45
  : false;
47
46
  }
48
47
  async execute(node) {
49
- var _a;
50
48
  const existingBreakpoint = source_tree_1.TreeElementNode.is(node) && node.element instanceof debug_data_breakpoint_1.DebugDataBreakpoint ? node.element : undefined;
51
49
  const session = this.viewModel.currentSession;
52
50
  if (!session) {
53
51
  return;
54
52
  }
55
53
  let defaultValue = undefined;
56
- if ((existingBreakpoint === null || existingBreakpoint === void 0 ? void 0 : existingBreakpoint.origin.source.type) === 1 /* DataBreakpointSourceType.Address */) {
54
+ if (existingBreakpoint?.origin.source.type === 1 /* DataBreakpointSourceType.Address */) {
57
55
  defaultValue = `${existingBreakpoint.origin.source.address} + ${existingBreakpoint.origin.source.bytes}`;
58
56
  }
59
57
  const quickInput = this.quickInputService;
@@ -64,11 +62,11 @@ let AddOrEditDataBreakpointAddress = class AddOrEditDataBreakpointAddress {
64
62
  const info = await session.sendRequest('dataBreakpointInfo', { asAddress: true, name: range.address, bytes: range.bytes })
65
63
  .then(({ body }) => body)
66
64
  .catch(e => { this.messageService.error(core_1.nls.localizeByDefault('Failed to set data breakpoint at {0}: {1}', range.address, e.message)); });
67
- if (!(info === null || info === void 0 ? void 0 : info.dataId)) {
65
+ if (!info?.dataId) {
68
66
  return;
69
67
  }
70
68
  let accessType = 'write';
71
- if (info.accessTypes && ((_a = info.accessTypes) === null || _a === void 0 ? void 0 : _a.length) > 1) {
69
+ if (info.accessTypes && info.accessTypes?.length > 1) {
72
70
  const accessTypes = info.accessTypes.map(type => ({ label: type }));
73
71
  const selectedAccessType = await quickInput.pick(accessTypes, { placeHolder: core_1.nls.localizeByDefault('Select the access type to monitor') });
74
72
  if (!selectedAccessType) {
@@ -98,11 +96,10 @@ let AddOrEditDataBreakpointAddress = class AddOrEditDataBreakpointAddress {
98
96
  }
99
97
  addDisposable(input.onDidChangeValue(e => {
100
98
  const err = this.parseAddress(e, false);
101
- input.validationMessage = err === null || err === void 0 ? void 0 : err.error;
99
+ input.validationMessage = err?.error;
102
100
  }));
103
101
  addDisposable(input.onDidAccept(() => {
104
- var _a;
105
- const r = this.parseAddress((_a = input.value) !== null && _a !== void 0 ? _a : '', true);
102
+ const r = this.parseAddress(input.value ?? '', true);
106
103
  if ('error' in r) {
107
104
  input.validationMessage = r.error;
108
105
  }
@@ -1 +1 @@
1
- {"version":3,"file":"debug-data-breakpoint-actions.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/debug-data-breakpoint-actions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-data-breakpoint-actions.js","sourceRoot":"","sources":["../../../src/browser/breakpoint/debug-data-breakpoint-actions.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,7 @@
1
- /// <reference types="react" />
2
1
  import '../../../src/browser/style/debug.css';
3
2
  import { ConsoleSessionManager } from '@theia/console/lib/browser/console-session-manager';
4
3
  import { ConsoleOptions, ConsoleWidget } from '@theia/console/lib/browser/console-widget';
5
- import { AbstractViewContribution, Widget } from '@theia/core/lib/browser';
4
+ import { AbstractViewContribution, HoverService, Widget } from '@theia/core/lib/browser';
6
5
  import { ContextKey } from '@theia/core/lib/browser/context-key-service';
7
6
  import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
8
7
  import { Command, CommandRegistry } from '@theia/core/lib/common/command';
@@ -11,19 +10,24 @@ import * as React from '@theia/core/shared/react';
11
10
  import { SelectOption } from '@theia/core/lib/browser/widgets/select-component';
12
11
  import { DebugSessionManager, DidChangeActiveDebugSession } from '../debug-session-manager';
13
12
  import { DebugConsoleSessionFactory } from './debug-console-session';
14
- import { InMemoryResources } from '@theia/core';
13
+ import { Disposable, DisposableCollection, Emitter, InMemoryResources } from '@theia/core';
15
14
  export type InDebugReplContextKey = ContextKey<boolean>;
16
15
  export declare const InDebugReplContextKey: unique symbol;
17
16
  export declare namespace DebugConsoleCommands {
18
17
  const DEBUG_CATEGORY = "Debug";
19
18
  const CLEAR: Command;
20
19
  }
21
- export declare class DebugConsoleContribution extends AbstractViewContribution<ConsoleWidget> implements TabBarToolbarContribution {
20
+ export declare class DebugConsoleContribution extends AbstractViewContribution<ConsoleWidget> implements TabBarToolbarContribution, Disposable {
22
21
  protected consoleSessionManager: ConsoleSessionManager;
23
22
  protected debugConsoleSessionFactory: DebugConsoleSessionFactory;
24
23
  protected debugSessionManager: DebugSessionManager;
25
24
  protected readonly resources: InMemoryResources;
25
+ protected readonly hoverService: HoverService;
26
26
  protected readonly DEBUG_CONSOLE_SEVERITY_ID = "debugConsoleSeverity";
27
+ protected filterInputRef: HTMLInputElement | undefined;
28
+ protected currentFilterValue: string;
29
+ protected readonly filterChangedEmitter: Emitter<void>;
30
+ protected readonly toDispose: DisposableCollection;
27
31
  constructor();
28
32
  protected init(): void;
29
33
  protected handleActiveDebugSessionChanged(event: DidChangeActiveDebugSession): void;
@@ -33,7 +37,14 @@ export declare class DebugConsoleContribution extends AbstractViewContribution<C
33
37
  static create(parent: interfaces.Container): Promise<ConsoleWidget>;
34
38
  static bindContribution(bind: interfaces.Bind): void;
35
39
  protected renderSeveritySelector(widget: Widget | undefined): React.ReactNode;
40
+ protected handleSeverityMouseEnter: (e: React.MouseEvent<HTMLDivElement>) => void;
36
41
  protected renderDebugConsoleSelector(widget: Widget | undefined): React.ReactNode;
42
+ protected handleSessionSelectorMouseEnter: (e: React.MouseEvent<HTMLDivElement>) => void;
43
+ protected renderFilterInput(): React.ReactNode;
44
+ protected handleFilterInputChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
45
+ protected applyFilterDebounced: import("lodash").DebouncedFunc<(value: string) => void>;
46
+ protected handleFilterClear: () => void;
47
+ protected handleFilterMouseEnter: (e: React.MouseEvent<HTMLInputElement>) => void;
37
48
  protected changeDebugConsole: (option: SelectOption) => void;
38
49
  protected changeSeverity: (option: SelectOption) => void;
39
50
  protected withWidget<T>(widget: Widget | undefined, fn: (widget: ConsoleWidget) => T): T | false;
@@ -41,5 +52,6 @@ export declare class DebugConsoleContribution extends AbstractViewContribution<C
41
52
  * Clear the console widget.
42
53
  */
43
54
  protected clearConsole(): Promise<void>;
55
+ dispose(): void;
44
56
  }
45
57
  //# sourceMappingURL=debug-console-contribution.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"debug-console-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":";AAeA,OAAO,sCAAsC,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAiC,MAAM,EAAiB,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,UAAU,EAAqB,MAAM,6CAA6C,CAAC;AAE5F,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAEjG,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAuB,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;AACxD,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE,yBAAiB,oBAAoB,CAAC;IAE3B,MAAM,cAAc,UAAU,CAAC;IAE/B,MAAM,KAAK,SAKhB,CAAC;CACN;AAED,qBACa,wBAAyB,SAAQ,wBAAwB,CAAC,aAAa,CAAE,YAAW,yBAAyB;IAGtH,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAGjE,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,0BAA0B;;IAetE,SAAS,CAAC,IAAI,IAAI,IAAI;IAqBtB,SAAS,CAAC,+BAA+B,CAAC,KAAK,EAAE,2BAA2B,GAAG,IAAI;IAc1E,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAWpD,oBAAoB,CAAC,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBjF,MAAM,CAAC,OAAO,EAAE,cAAc,CAc5B;WAEW,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;IAWzE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI;IAmBpD,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS;IAe7E,SAAS,CAAC,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS;IAkBjF,SAAS,CAAC,kBAAkB,WAAY,YAAY,UAIlD;IAEF,SAAS,CAAC,cAAc,WAAY,YAAY,UAE9C;IAEF,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,oBAA0C,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK;IAOtH;;OAEG;cACa,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKhD"}
1
+ {"version":3,"file":"debug-console-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/console/debug-console-contribution.tsx"],"names":[],"mappings":"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"}
@@ -33,6 +33,8 @@ const select_component_1 = require("@theia/core/lib/browser/widgets/select-compo
33
33
  const debug_session_manager_1 = require("../debug-session-manager");
34
34
  const debug_console_session_1 = require("./debug-console-session");
35
35
  const core_1 = require("@theia/core");
36
+ const markdown_rendering_1 = require("@theia/core/lib/common/markdown-rendering");
37
+ const debounce = require("@theia/core/shared/lodash.debounce");
36
38
  exports.InDebugReplContextKey = Symbol('inDebugReplContextKey');
37
39
  var DebugConsoleCommands;
38
40
  (function (DebugConsoleCommands) {
@@ -44,7 +46,8 @@ var DebugConsoleCommands;
44
46
  iconClass: (0, browser_1.codicon)('clear-all')
45
47
  });
46
48
  })(DebugConsoleCommands || (exports.DebugConsoleCommands = DebugConsoleCommands = {}));
47
- let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleContribution extends browser_1.AbstractViewContribution {
49
+ let DebugConsoleContribution = class DebugConsoleContribution extends browser_1.AbstractViewContribution {
50
+ static { DebugConsoleContribution_1 = this; }
48
51
  constructor() {
49
52
  super({
50
53
  widgetId: DebugConsoleContribution_1.options.id,
@@ -56,6 +59,64 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
56
59
  toggleKeybinding: 'ctrlcmd+shift+y'
57
60
  });
58
61
  this.DEBUG_CONSOLE_SEVERITY_ID = 'debugConsoleSeverity';
62
+ this.currentFilterValue = '';
63
+ this.filterChangedEmitter = new core_1.Emitter();
64
+ this.toDispose = new core_1.DisposableCollection();
65
+ this.handleSeverityMouseEnter = (e) => {
66
+ const tooltipContent = new markdown_rendering_1.MarkdownStringImpl();
67
+ tooltipContent.appendMarkdown(nls_1.nls.localize('theia/debug/consoleSeverityTooltip', 'Filter console output by severity level. Only messages with the selected severity will be shown.'));
68
+ this.hoverService.requestHover({
69
+ content: tooltipContent,
70
+ target: e.currentTarget,
71
+ position: 'bottom'
72
+ });
73
+ };
74
+ this.handleSessionSelectorMouseEnter = (e) => {
75
+ const tooltipContent = new markdown_rendering_1.MarkdownStringImpl();
76
+ tooltipContent.appendMarkdown(nls_1.nls.localize('theia/debug/consoleSessionSelectorTooltip', 'Switch between debug sessions. Each debug session has its own console output.'));
77
+ this.hoverService.requestHover({
78
+ content: tooltipContent,
79
+ target: e.currentTarget,
80
+ position: 'bottom'
81
+ });
82
+ };
83
+ this.handleFilterInputChange = (e) => {
84
+ const value = e.target.value;
85
+ this.currentFilterValue = value;
86
+ this.filterChangedEmitter.fire();
87
+ this.applyFilterDebounced(value);
88
+ };
89
+ this.applyFilterDebounced = debounce((value) => {
90
+ const session = this.consoleSessionManager.selectedSession;
91
+ if (session) {
92
+ session.filterText = value;
93
+ }
94
+ }, 150);
95
+ this.handleFilterClear = () => {
96
+ if (this.filterInputRef) {
97
+ this.filterInputRef.value = '';
98
+ }
99
+ this.currentFilterValue = '';
100
+ const session = this.consoleSessionManager.selectedSession;
101
+ if (session) {
102
+ session.filterText = '';
103
+ }
104
+ this.filterChangedEmitter.fire();
105
+ };
106
+ this.handleFilterMouseEnter = (e) => {
107
+ const tooltipContent = new markdown_rendering_1.MarkdownStringImpl();
108
+ tooltipContent.appendMarkdown(nls_1.nls.localize('theia/debug/consoleFilterTooltip', 'Filter console output by text. Separate multiple terms with commas. Prefix with `!` to exclude a term.\n\n' +
109
+ 'Examples:\n\n' +
110
+ '- `text` - show lines containing "text"\n' +
111
+ '- `text, other` - show lines containing "text" or "other"\n' +
112
+ '- `!text` - hide lines containing "text"\n' +
113
+ '- `text, !other` - show "text" but hide "other"'));
114
+ this.hoverService.requestHover({
115
+ content: tooltipContent,
116
+ target: e.currentTarget,
117
+ position: 'bottom'
118
+ });
119
+ };
59
120
  this.changeDebugConsole = (option) => {
60
121
  const id = option.value;
61
122
  const session = this.consoleSessionManager.get(id);
@@ -67,28 +128,42 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
67
128
  }
68
129
  init() {
69
130
  this.resources.add(debug_console_session_1.DebugConsoleSession.uri, '');
70
- this.debugSessionManager.onDidCreateDebugSession(session => {
71
- const consoleParent = session.findConsoleParent();
72
- if (consoleParent) {
73
- const parentConsoleSession = this.consoleSessionManager.get(consoleParent.id);
74
- if (parentConsoleSession instanceof debug_console_session_1.DebugConsoleSession) {
75
- session.on('output', event => parentConsoleSession.logOutput(parentConsoleSession.debugSession, event));
131
+ this.toDispose.pushAll([
132
+ this.debugSessionManager.onDidCreateDebugSession(session => {
133
+ const consoleParent = session.findConsoleParent();
134
+ if (consoleParent) {
135
+ const parentConsoleSession = this.consoleSessionManager.get(consoleParent.id);
136
+ if (parentConsoleSession instanceof debug_console_session_1.DebugConsoleSession) {
137
+ session.on('output', event => parentConsoleSession.logOutput(parentConsoleSession.debugSession, event));
138
+ }
76
139
  }
77
- }
78
- else {
79
- const consoleSession = this.debugConsoleSessionFactory(session);
80
- this.consoleSessionManager.add(consoleSession);
81
- session.on('output', event => consoleSession.logOutput(session, event));
82
- }
83
- });
84
- this.debugSessionManager.onDidChangeActiveDebugSession(event => this.handleActiveDebugSessionChanged(event));
85
- this.debugSessionManager.onDidDestroyDebugSession(session => {
86
- this.consoleSessionManager.delete(session.id);
87
- });
140
+ else {
141
+ const consoleSession = this.debugConsoleSessionFactory(session);
142
+ this.consoleSessionManager.add(consoleSession);
143
+ session.on('output', event => consoleSession.logOutput(session, event));
144
+ }
145
+ }),
146
+ this.debugSessionManager.onDidChangeActiveDebugSession(event => this.handleActiveDebugSessionChanged(event)),
147
+ this.debugSessionManager.onDidDestroyDebugSession(session => {
148
+ const consoleSession = this.consoleSessionManager.get(session.id);
149
+ if (consoleSession instanceof debug_console_session_1.DebugConsoleSession) {
150
+ consoleSession.markTerminated();
151
+ }
152
+ }),
153
+ this.consoleSessionManager.onDidChangeSelectedSession(() => {
154
+ const session = this.consoleSessionManager.selectedSession;
155
+ if (session && this.filterInputRef) {
156
+ const filterValue = session.filterText || '';
157
+ this.filterInputRef.value = filterValue;
158
+ this.currentFilterValue = filterValue;
159
+ this.filterChangedEmitter.fire();
160
+ }
161
+ })
162
+ ]);
88
163
  }
89
164
  handleActiveDebugSessionChanged(event) {
90
165
  if (!event.current) {
91
- this.consoleSessionManager.selectedSession = undefined;
166
+ return;
92
167
  }
93
168
  else {
94
169
  const topSession = event.current.findConsoleParent() || event.current;
@@ -115,12 +190,22 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
115
190
  id: 'debug-console-severity',
116
191
  render: widget => this.renderSeveritySelector(widget),
117
192
  isVisible: widget => this.withWidget(widget, () => true),
118
- onDidChange: this.consoleSessionManager.onDidChangeSeverity
193
+ onDidChange: this.consoleSessionManager.onDidChangeSeverity,
194
+ priority: -3,
195
+ });
196
+ toolbarRegistry.registerItem({
197
+ id: 'debug-console-filter',
198
+ render: () => this.renderFilterInput(),
199
+ isVisible: widget => this.withWidget(widget, () => true),
200
+ onDidChange: this.filterChangedEmitter.event,
201
+ priority: -2,
119
202
  });
120
203
  toolbarRegistry.registerItem({
121
204
  id: 'debug-console-session-selector',
122
205
  render: widget => this.renderDebugConsoleSelector(widget),
123
- isVisible: widget => this.withWidget(widget, () => this.consoleSessionManager.all.length > 1)
206
+ isVisible: widget => this.withWidget(widget, () => this.consoleSessionManager.all.length >= 1),
207
+ onDidChange: core_1.Event.any(this.consoleSessionManager.onDidAddSession, this.consoleSessionManager.onDidDeleteSession, this.consoleSessionManager.onDidChangeSelectedSession),
208
+ priority: -1,
124
209
  });
125
210
  toolbarRegistry.registerItem({
126
211
  id: DebugConsoleCommands.CLEAR.id,
@@ -129,6 +214,21 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
129
214
  priority: 0,
130
215
  });
131
216
  }
217
+ static { this.options = {
218
+ id: 'debug-console',
219
+ title: {
220
+ label: nls_1.nls.localizeByDefault('Debug Console'),
221
+ iconClass: (0, browser_1.codicon)('debug-console')
222
+ },
223
+ input: {
224
+ uri: debug_console_session_1.DebugConsoleSession.uri,
225
+ options: {
226
+ autoSizing: true,
227
+ minHeight: 1,
228
+ maxHeight: 10
229
+ }
230
+ }
231
+ }; }
132
232
  static async create(parent) {
133
233
  const inputFocusContextKey = parent.get(exports.InDebugReplContextKey);
134
234
  const child = console_widget_1.ConsoleWidget.createContainer(parent, {
@@ -160,19 +260,37 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
160
260
  value: e,
161
261
  label: severity_1.Severity.toLocaleString(e)
162
262
  }));
163
- return React.createElement(select_component_1.SelectComponent, { id: this.DEBUG_CONSOLE_SEVERITY_ID, key: "debugConsoleSeverity", options: severityElements, defaultValue: this.consoleSessionManager.severity || severity_1.Severity.Ignore, onChange: this.changeSeverity });
263
+ return React.createElement("div", { onMouseEnter: this.handleSeverityMouseEnter },
264
+ React.createElement(select_component_1.SelectComponent, { id: this.DEBUG_CONSOLE_SEVERITY_ID, key: "debugConsoleSeverity", options: severityElements, defaultValue: this.consoleSessionManager.severity || severity_1.Severity.Ignore, onChange: this.changeSeverity }));
164
265
  }
165
266
  renderDebugConsoleSelector(widget) {
166
267
  const availableConsoles = [];
167
- this.consoleSessionManager.all.forEach(e => {
168
- if (e instanceof debug_console_session_1.DebugConsoleSession) {
169
- availableConsoles.push({
170
- value: e.id,
171
- label: e.debugSession.label
172
- });
268
+ const sortedSessions = this.consoleSessionManager.all
269
+ .filter((e) => e instanceof debug_console_session_1.DebugConsoleSession)
270
+ .sort((a, b) => {
271
+ if (a.terminated !== b.terminated) {
272
+ return a.terminated ? 1 : -1;
273
+ }
274
+ return 0;
275
+ });
276
+ sortedSessions.forEach(session => {
277
+ let label = session.debugSession.label;
278
+ if (session.terminated) {
279
+ label = `${label} (${nls_1.nls.localizeByDefault('Stopped')})`;
173
280
  }
281
+ availableConsoles.push({
282
+ value: session.id,
283
+ label
284
+ });
174
285
  });
175
- return React.createElement(select_component_1.SelectComponent, { key: "debugConsoleSelector", options: availableConsoles, defaultValue: 0, onChange: this.changeDebugConsole });
286
+ const selectedId = this.consoleSessionManager.selectedSession?.id;
287
+ return React.createElement("div", { onMouseEnter: this.handleSessionSelectorMouseEnter },
288
+ React.createElement(select_component_1.SelectComponent, { key: "debugConsoleSelector", options: availableConsoles, defaultValue: selectedId, onChange: this.changeDebugConsole }));
289
+ }
290
+ renderFilterInput() {
291
+ return (React.createElement("div", { className: "item enabled debug-console-filter-container" },
292
+ React.createElement("input", { type: "text", className: "theia-input", placeholder: nls_1.nls.localize('theia/debug/consoleFilter', 'Filter (e.g. text, !exclude)'), "aria-label": nls_1.nls.localize('theia/debug/consoleFilterAriaLabel', 'Filter debug console output'), ref: ref => { this.filterInputRef = ref ?? undefined; }, onChange: this.handleFilterInputChange, onMouseEnter: this.handleFilterMouseEnter }),
293
+ this.currentFilterValue && React.createElement("span", { className: "debug-console-filter-btn codicon codicon-close action-label", role: "button", "aria-label": nls_1.nls.localizeByDefault('Clear'), onClick: this.handleFilterClear, title: nls_1.nls.localizeByDefault('Clear') })));
176
294
  }
177
295
  withWidget(widget = this.tryGetWidget(), fn) {
178
296
  if (widget instanceof console_widget_1.ConsoleWidget && widget.id === DebugConsoleContribution_1.options.id) {
@@ -186,24 +304,16 @@ let DebugConsoleContribution = DebugConsoleContribution_1 = class DebugConsoleCo
186
304
  async clearConsole() {
187
305
  const widget = await this.widget;
188
306
  widget.clear();
189
- }
190
- };
191
- exports.DebugConsoleContribution = DebugConsoleContribution;
192
- DebugConsoleContribution.options = {
193
- id: 'debug-console',
194
- title: {
195
- label: nls_1.nls.localizeByDefault('Debug Console'),
196
- iconClass: (0, browser_1.codicon)('debug-console')
197
- },
198
- input: {
199
- uri: debug_console_session_1.DebugConsoleSession.uri,
200
- options: {
201
- autoSizing: true,
202
- minHeight: 1,
203
- maxHeight: 10
307
+ const selectedSession = this.consoleSessionManager.selectedSession;
308
+ if (selectedSession instanceof debug_console_session_1.DebugConsoleSession && selectedSession.terminated) {
309
+ this.consoleSessionManager.delete(selectedSession.id);
204
310
  }
205
311
  }
312
+ dispose() {
313
+ this.toDispose.dispose();
314
+ }
206
315
  };
316
+ exports.DebugConsoleContribution = DebugConsoleContribution;
207
317
  tslib_1.__decorate([
208
318
  (0, inversify_1.inject)(console_session_manager_1.ConsoleSessionManager),
209
319
  tslib_1.__metadata("design:type", console_session_manager_1.ConsoleSessionManager)
@@ -220,6 +330,10 @@ tslib_1.__decorate([
220
330
  (0, inversify_1.inject)(core_1.InMemoryResources),
221
331
  tslib_1.__metadata("design:type", core_1.InMemoryResources)
222
332
  ], DebugConsoleContribution.prototype, "resources", void 0);
333
+ tslib_1.__decorate([
334
+ (0, inversify_1.inject)(browser_1.HoverService),
335
+ tslib_1.__metadata("design:type", browser_1.HoverService)
336
+ ], DebugConsoleContribution.prototype, "hoverService", void 0);
223
337
  tslib_1.__decorate([
224
338
  (0, inversify_1.postConstruct)(),
225
339
  tslib_1.__metadata("design:type", Function),