@theia/debug 1.67.0-next.59 → 1.67.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.
Files changed (145) hide show
  1. package/lib/browser/breakpoint/breakpoint-manager.js +1 -1
  2. package/lib/browser/breakpoint/breakpoint-manager.js.map +1 -1
  3. package/lib/browser/console/debug-console-items.d.ts +13 -3
  4. package/lib/browser/console/debug-console-items.d.ts.map +1 -1
  5. package/lib/browser/console/debug-console-items.js +81 -20
  6. package/lib/browser/console/debug-console-items.js.map +1 -1
  7. package/lib/browser/console/debug-console-session.d.ts.map +1 -1
  8. package/lib/browser/console/debug-console-session.js +1 -0
  9. package/lib/browser/console/debug-console-session.js.map +1 -1
  10. package/lib/browser/debug-commands.d.ts +153 -0
  11. package/lib/browser/debug-commands.d.ts.map +1 -0
  12. package/lib/browser/debug-commands.js +399 -0
  13. package/lib/browser/debug-commands.js.map +1 -0
  14. package/lib/browser/debug-frontend-application-contribution.d.ts +1 -150
  15. package/lib/browser/debug-frontend-application-contribution.d.ts.map +1 -1
  16. package/lib/browser/debug-frontend-application-contribution.js +155 -532
  17. package/lib/browser/debug-frontend-application-contribution.js.map +1 -1
  18. package/lib/browser/debug-prefix-configuration.js +3 -3
  19. package/lib/browser/debug-prefix-configuration.js.map +1 -1
  20. package/lib/browser/debug-session-contribution.d.ts +2 -1
  21. package/lib/browser/debug-session-contribution.d.ts.map +1 -1
  22. package/lib/browser/debug-session-contribution.js +5 -1
  23. package/lib/browser/debug-session-contribution.js.map +1 -1
  24. package/lib/browser/debug-session-manager.d.ts +11 -3
  25. package/lib/browser/debug-session-manager.d.ts.map +1 -1
  26. package/lib/browser/debug-session-manager.js +49 -8
  27. package/lib/browser/debug-session-manager.js.map +1 -1
  28. package/lib/browser/debug-session.d.ts +9 -3
  29. package/lib/browser/debug-session.d.ts.map +1 -1
  30. package/lib/browser/debug-session.js +13 -3
  31. package/lib/browser/debug-session.js.map +1 -1
  32. package/lib/browser/editor/debug-hover-source.d.ts +1 -0
  33. package/lib/browser/editor/debug-hover-source.d.ts.map +1 -1
  34. package/lib/browser/editor/debug-hover-source.js +9 -0
  35. package/lib/browser/editor/debug-hover-source.js.map +1 -1
  36. package/lib/browser/editor/debug-inline-value-decorator.js +1 -1
  37. package/lib/browser/editor/debug-inline-value-decorator.js.map +1 -1
  38. package/lib/browser/model/debug-breakpoint.d.ts +4 -2
  39. package/lib/browser/model/debug-breakpoint.d.ts.map +1 -1
  40. package/lib/browser/model/debug-breakpoint.js +10 -2
  41. package/lib/browser/model/debug-breakpoint.js.map +1 -1
  42. package/lib/browser/model/debug-data-breakpoint.d.ts +2 -0
  43. package/lib/browser/model/debug-data-breakpoint.d.ts.map +1 -1
  44. package/lib/browser/model/debug-data-breakpoint.js +16 -5
  45. package/lib/browser/model/debug-data-breakpoint.js.map +1 -1
  46. package/lib/browser/model/debug-function-breakpoint.d.ts +3 -0
  47. package/lib/browser/model/debug-function-breakpoint.d.ts.map +1 -1
  48. package/lib/browser/model/debug-function-breakpoint.js +17 -1
  49. package/lib/browser/model/debug-function-breakpoint.js.map +1 -1
  50. package/lib/browser/model/debug-instruction-breakpoint.d.ts +2 -0
  51. package/lib/browser/model/debug-instruction-breakpoint.d.ts.map +1 -1
  52. package/lib/browser/model/debug-instruction-breakpoint.js +13 -1
  53. package/lib/browser/model/debug-instruction-breakpoint.js.map +1 -1
  54. package/lib/browser/model/debug-source-breakpoint.d.ts +6 -1
  55. package/lib/browser/model/debug-source-breakpoint.d.ts.map +1 -1
  56. package/lib/browser/model/debug-source-breakpoint.js +17 -1
  57. package/lib/browser/model/debug-source-breakpoint.js.map +1 -1
  58. package/lib/browser/model/debug-stack-frame.d.ts +2 -2
  59. package/lib/browser/model/debug-stack-frame.d.ts.map +1 -1
  60. package/lib/browser/model/debug-stack-frame.js +13 -5
  61. package/lib/browser/model/debug-stack-frame.js.map +1 -1
  62. package/lib/browser/model/debug-thread.d.ts +2 -2
  63. package/lib/browser/model/debug-thread.d.ts.map +1 -1
  64. package/lib/browser/model/debug-thread.js +13 -9
  65. package/lib/browser/model/debug-thread.js.map +1 -1
  66. package/lib/browser/view/debug-action.d.ts +1 -0
  67. package/lib/browser/view/debug-action.d.ts.map +1 -1
  68. package/lib/browser/view/debug-action.js +2 -2
  69. package/lib/browser/view/debug-action.js.map +1 -1
  70. package/lib/browser/view/debug-breakpoints-source.d.ts +2 -0
  71. package/lib/browser/view/debug-breakpoints-source.d.ts.map +1 -1
  72. package/lib/browser/view/debug-breakpoints-source.js +6 -1
  73. package/lib/browser/view/debug-breakpoints-source.js.map +1 -1
  74. package/lib/browser/view/debug-configuration-widget.js +2 -2
  75. package/lib/browser/view/debug-configuration-widget.js.map +1 -1
  76. package/lib/browser/view/debug-exception-breakpoint.d.ts +9 -2
  77. package/lib/browser/view/debug-exception-breakpoint.d.ts.map +1 -1
  78. package/lib/browser/view/debug-exception-breakpoint.js +26 -5
  79. package/lib/browser/view/debug-exception-breakpoint.js.map +1 -1
  80. package/lib/browser/view/debug-session-widget.d.ts +0 -1
  81. package/lib/browser/view/debug-session-widget.d.ts.map +1 -1
  82. package/lib/browser/view/debug-session-widget.js +0 -4
  83. package/lib/browser/view/debug-session-widget.js.map +1 -1
  84. package/lib/browser/view/debug-threads-widget.d.ts +6 -1
  85. package/lib/browser/view/debug-threads-widget.d.ts.map +1 -1
  86. package/lib/browser/view/debug-threads-widget.js +69 -5
  87. package/lib/browser/view/debug-threads-widget.js.map +1 -1
  88. package/lib/browser/view/debug-toolbar-widget.d.ts +5 -18
  89. package/lib/browser/view/debug-toolbar-widget.d.ts.map +1 -1
  90. package/lib/browser/view/debug-toolbar-widget.js +14 -58
  91. package/lib/browser/view/debug-toolbar-widget.js.map +1 -1
  92. package/lib/browser/view/debug-variables-source.d.ts.map +1 -1
  93. package/lib/browser/view/debug-variables-source.js +1 -0
  94. package/lib/browser/view/debug-variables-source.js.map +1 -1
  95. package/lib/browser/view/debug-variables-widget.d.ts +15 -0
  96. package/lib/browser/view/debug-variables-widget.d.ts.map +1 -1
  97. package/lib/browser/view/debug-variables-widget.js +56 -1
  98. package/lib/browser/view/debug-variables-widget.js.map +1 -1
  99. package/lib/browser/view/debug-view-model.d.ts +4 -0
  100. package/lib/browser/view/debug-view-model.d.ts.map +1 -1
  101. package/lib/browser/view/debug-view-model.js +18 -9
  102. package/lib/browser/view/debug-view-model.js.map +1 -1
  103. package/lib/browser/view/debug-watch-expression.d.ts.map +1 -1
  104. package/lib/browser/view/debug-watch-expression.js +4 -5
  105. package/lib/browser/view/debug-watch-expression.js.map +1 -1
  106. package/lib/browser/view/debug-watch-source.d.ts.map +1 -1
  107. package/lib/browser/view/debug-watch-source.js +1 -0
  108. package/lib/browser/view/debug-watch-source.js.map +1 -1
  109. package/lib/common/debug-preferences.d.ts +1 -0
  110. package/lib/common/debug-preferences.d.ts.map +1 -1
  111. package/lib/common/debug-preferences.js +11 -1
  112. package/lib/common/debug-preferences.js.map +1 -1
  113. package/package.json +16 -16
  114. package/src/browser/breakpoint/breakpoint-manager.ts +1 -1
  115. package/src/browser/console/debug-console-items.tsx +90 -21
  116. package/src/browser/console/debug-console-session.ts +1 -0
  117. package/src/browser/debug-commands.ts +402 -0
  118. package/src/browser/debug-frontend-application-contribution.ts +35 -410
  119. package/src/browser/debug-prefix-configuration.ts +1 -1
  120. package/src/browser/debug-session-contribution.ts +7 -2
  121. package/src/browser/debug-session-manager.ts +62 -9
  122. package/src/browser/debug-session.tsx +17 -4
  123. package/src/browser/editor/debug-hover-source.tsx +6 -2
  124. package/src/browser/editor/debug-inline-value-decorator.ts +1 -1
  125. package/src/browser/model/debug-breakpoint.tsx +12 -3
  126. package/src/browser/model/debug-data-breakpoint.tsx +21 -6
  127. package/src/browser/model/debug-function-breakpoint.tsx +22 -1
  128. package/src/browser/model/debug-instruction-breakpoint.tsx +16 -1
  129. package/src/browser/model/debug-source-breakpoint.tsx +24 -3
  130. package/src/browser/model/debug-stack-frame.tsx +13 -6
  131. package/src/browser/model/debug-thread.tsx +14 -10
  132. package/src/browser/style/index.css +30 -5
  133. package/src/browser/view/debug-action.tsx +3 -2
  134. package/src/browser/view/debug-breakpoints-source.tsx +5 -1
  135. package/src/browser/view/debug-configuration-widget.tsx +1 -1
  136. package/src/browser/view/debug-exception-breakpoint.tsx +30 -5
  137. package/src/browser/view/debug-session-widget.ts +0 -5
  138. package/src/browser/view/debug-threads-widget.ts +84 -6
  139. package/src/browser/view/debug-toolbar-widget.tsx +13 -60
  140. package/src/browser/view/debug-variables-source.ts +1 -0
  141. package/src/browser/view/debug-variables-widget.ts +59 -0
  142. package/src/browser/view/debug-view-model.ts +20 -8
  143. package/src/browser/view/debug-watch-expression.tsx +5 -6
  144. package/src/browser/view/debug-watch-source.ts +1 -0
  145. package/src/common/debug-preferences.ts +12 -1
@@ -1 +1 @@
1
- {"version":3,"file":"debug-stack-frame.js","sourceRoot":"","sources":["../../../src/browser/model/debug-stack-frame.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-stack-frame.js","sourceRoot":"","sources":["../../../src/browser/model/debug-stack-frame.tsx"],"names":[],"mappings":"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"}
@@ -45,7 +45,7 @@ export declare class DebugThread extends DebugThreadData implements TreeElement
45
45
  getExceptionInfo(): Promise<DebugExceptionInfo | undefined>;
46
46
  get supportsTerminate(): boolean;
47
47
  terminate(): Promise<void>;
48
- protected readonly _frames: Map<number, DebugStackFrame>;
48
+ protected readonly _frames: Map<string, DebugStackFrame>;
49
49
  get frames(): IterableIterator<DebugStackFrame>;
50
50
  get topFrame(): DebugStackFrame | undefined;
51
51
  get frameCount(): number;
@@ -55,7 +55,7 @@ export declare class DebugThread extends DebugThreadData implements TreeElement
55
55
  fetchFrames(levels?: number): Promise<DebugStackFrame[]>;
56
56
  get pendingFrameCount(): number;
57
57
  protected doFetchFrames(startFrame: number, levels: number): Promise<DebugProtocol.StackFrame[]>;
58
- protected doUpdateFrames(frames: DebugProtocol.StackFrame[]): DebugStackFrame[];
58
+ protected doUpdateFrames(startFrame: number, frames: DebugProtocol.StackFrame[]): DebugStackFrame[];
59
59
  protected clearFrames(): void;
60
60
  protected updateCurrentFrame(): void;
61
61
  protected toArgs<T extends object>(arg?: T): {
@@ -1 +1 @@
1
- {"version":3,"file":"debug-thread.d.ts","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-thread.d.ts","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
@@ -147,7 +147,7 @@ class DebugThread extends DebugThreadData {
147
147
  if (cancel.isCancellationRequested) {
148
148
  return [];
149
149
  }
150
- return this.doUpdateFrames(frames);
150
+ return this.doUpdateFrames(start, frames);
151
151
  }
152
152
  catch (e) {
153
153
  console.error('fetchFrames failed:', e);
@@ -178,15 +178,19 @@ class DebugThread extends DebugThreadData {
178
178
  return [];
179
179
  }
180
180
  }
181
- doUpdateFrames(frames) {
181
+ doUpdateFrames(startFrame, frames) {
182
182
  const result = new Set();
183
- for (const raw of frames) {
184
- const id = raw.id;
185
- const frame = this._frames.get(id) || new debug_stack_frame_1.DebugStackFrame(this, this.session);
183
+ frames.forEach((raw, index) => {
184
+ // Similarly to VS Code, we no longer use `raw.frameId` in computation of the DebugStackFrame id.
185
+ // The `raw.frameId` was changing in every step and was not allowing us to correlate stack frames between step events.
186
+ // Refs: https://github.com/microsoft/vscode/commit/18fc2bcf718e22265b5e09bb7fd0e9c090264cd2, https://github.com/microsoft/vscode/issues/93230#issuecomment-642558395
187
+ const source = raw.source && this.session.getSource(raw.source);
188
+ const id = `${this.id}:${startFrame + index}:${source === null || source === void 0 ? void 0 : source.name}`;
189
+ const frame = this._frames.get(id) || new debug_stack_frame_1.DebugStackFrame(this, this.session, id);
186
190
  this._frames.set(id, frame);
187
191
  frame.update({ raw });
188
192
  result.add(frame);
189
- }
193
+ });
190
194
  this.updateCurrentFrame();
191
195
  return [...result.values()];
192
196
  }
@@ -203,9 +207,9 @@ class DebugThread extends DebugThreadData {
203
207
  }
204
208
  updateCurrentFrame() {
205
209
  const { currentFrame } = this;
206
- const frameId = currentFrame && currentFrame.raw.id;
207
- this.currentFrame = typeof frameId === 'number' &&
208
- this._frames.get(frameId) ||
210
+ const id = currentFrame && currentFrame.id;
211
+ this.currentFrame = typeof id === 'string' &&
212
+ this._frames.get(id) ||
209
213
  this._frames.values().next().value;
210
214
  }
211
215
  toArgs(arg) {
@@ -1 +1 @@
1
- {"version":3,"file":"debug-thread.js","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-thread.js","sourceRoot":"","sources":["../../../src/browser/model/debug-thread.tsx"],"names":[],"mappings":"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"}
@@ -10,6 +10,7 @@ export declare class DebugAction extends React.Component<DebugAction.Props> {
10
10
  export declare namespace DebugAction {
11
11
  interface Props {
12
12
  label: string;
13
+ tooltip?: string;
13
14
  iconClass: string;
14
15
  run: (effectiveMenuPath: MenuPath) => void;
15
16
  enabled?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"debug-action.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-action.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,qBAAa,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC;IAEtD,MAAM,IAAI,KAAK,CAAC,SAAS;IAkBlC,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,MAAM,QAAS,WAAW,GAAG,IAAI,6BAAiC;CAE/E;AACD,yBAAiB,WAAW,CAAC;IACzB,UAAiB,KAAK;QAClB,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,GAAG,EAAE,CAAC,iBAAiB,EAAE,QAAQ,KAAK,IAAI,CAAA;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAA;KACpB;CACJ"}
1
+ {"version":3,"file":"debug-action.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-action.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,qBAAa,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC;IAEtD,MAAM,IAAI,KAAK,CAAC,SAAS;IAkBlC,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,MAAM,QAAS,WAAW,GAAG,IAAI,6BAAiC;CAE/E;AACD,yBAAiB,WAAW,CAAC;IACzB,UAAiB,KAAK;QAClB,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,GAAG,EAAE,CAAC,iBAAiB,EAAE,QAAQ,KAAK,IAAI,CAAA;QAC1C,OAAO,CAAC,EAAE,OAAO,CAAA;KACpB;CACJ"}
@@ -24,7 +24,7 @@ class DebugAction extends React.Component {
24
24
  this.setRef = (ref) => this.ref = ref || undefined;
25
25
  }
26
26
  render() {
27
- const { enabled, label, iconClass } = this.props;
27
+ const { enabled, label, tooltip, iconClass } = this.props;
28
28
  const classNames = ['debug-action'];
29
29
  if (iconClass) {
30
30
  classNames.push(...(0, browser_1.codiconArray)(iconClass, true));
@@ -32,7 +32,7 @@ class DebugAction extends React.Component {
32
32
  if (enabled === false) {
33
33
  classNames.push(browser_1.DISABLED_CLASS);
34
34
  }
35
- return React.createElement("span", { tabIndex: 0, className: classNames.join(' '), title: label, onClick: () => { this.props.run([]); }, ref: this.setRef }, !iconClass && React.createElement("div", null, label));
35
+ return React.createElement("span", { tabIndex: 0, className: classNames.join(' '), title: tooltip || label, onClick: () => { this.props.run([]); }, ref: this.setRef }, !iconClass && React.createElement("div", null, label));
36
36
  }
37
37
  focus() {
38
38
  if (this.ref) {
@@ -1 +1 @@
1
- {"version":3,"file":"debug-action.js","sourceRoot":"","sources":["../../../src/browser/view/debug-action.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,qDAAuE;AAGvE,MAAa,WAAY,SAAQ,KAAK,CAAC,SAA4B;IAAnE;;QA2Bc,WAAM,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,CAAC;IAEhF,CAAC;IA3BY,MAAM;QACX,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACjD,MAAM,UAAU,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,SAAS,EAAE,CAAC;YACZ,UAAU,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,wBAAc,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,8BAAM,QAAQ,EAAE,CAAC,EACpB,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EACtC,GAAG,EAAE,IAAI,CAAC,MAAM,IACf,CAAC,SAAS,IAAI,iCAAM,KAAK,CAAO,CAC9B,CAAC;IACZ,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;IACL,CAAC;CAKJ;AA7BD,kCA6BC"}
1
+ {"version":3,"file":"debug-action.js","sourceRoot":"","sources":["../../../src/browser/view/debug-action.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,qDAAuE;AAGvE,MAAa,WAAY,SAAQ,KAAK,CAAC,SAA4B;IAAnE;;QA2Bc,WAAM,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,CAAC;IAEhF,CAAC;IA3BY,MAAM;QACX,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,MAAM,UAAU,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,SAAS,EAAE,CAAC;YACZ,UAAU,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,wBAAc,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,8BAAM,QAAQ,EAAE,CAAC,EACpB,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,OAAO,IAAI,KAAK,EACvB,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EACtC,GAAG,EAAE,IAAI,CAAC,MAAM,IACf,CAAC,SAAS,IAAI,iCAAM,KAAK,CAAO,CAC9B,CAAC;IACZ,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;IACL,CAAC;CAKJ;AA7BD,kCA6BC"}
@@ -1,9 +1,11 @@
1
1
  import { TreeSource, TreeElement } from '@theia/core/lib/browser/source-tree';
2
2
  import { DebugViewModel } from './debug-view-model';
3
3
  import { BreakpointManager } from '../breakpoint/breakpoint-manager';
4
+ import { CommandService } from '@theia/core/lib/common';
4
5
  export declare class DebugBreakpointsSource extends TreeSource {
5
6
  protected readonly model: DebugViewModel;
6
7
  protected readonly breakpoints: BreakpointManager;
8
+ protected readonly commandService: CommandService;
7
9
  protected init(): void;
8
10
  getElements(): IterableIterator<TreeElement>;
9
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"debug-breakpoints-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-breakpoints-source.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,qBACa,sBAAuB,SAAQ,UAAU;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,IAAI,IAAI,IAAI;IAKrB,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC;CAShD"}
1
+ {"version":3,"file":"debug-breakpoints-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-breakpoints-source.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,qBACa,sBAAuB,SAAQ,UAAU;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,IAAI,IAAI,IAAI;IAKrB,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC;CAShD"}
@@ -22,6 +22,7 @@ const source_tree_1 = require("@theia/core/lib/browser/source-tree");
22
22
  const debug_view_model_1 = require("./debug-view-model");
23
23
  const breakpoint_manager_1 = require("../breakpoint/breakpoint-manager");
24
24
  const debug_exception_breakpoint_1 = require("./debug-exception-breakpoint");
25
+ const common_1 = require("@theia/core/lib/common");
25
26
  let DebugBreakpointsSource = class DebugBreakpointsSource extends source_tree_1.TreeSource {
26
27
  init() {
27
28
  this.fireDidChange();
@@ -29,7 +30,7 @@ let DebugBreakpointsSource = class DebugBreakpointsSource extends source_tree_1.
29
30
  }
30
31
  *getElements() {
31
32
  for (const exceptionBreakpoint of this.breakpoints.getExceptionBreakpoints()) {
32
- yield new debug_exception_breakpoint_1.DebugExceptionBreakpoint(exceptionBreakpoint, this.breakpoints);
33
+ yield new debug_exception_breakpoint_1.DebugExceptionBreakpoint(exceptionBreakpoint, this.breakpoints, this.commandService);
33
34
  }
34
35
  yield* this.model.dataBreakpoints;
35
36
  yield* this.model.functionBreakpoints;
@@ -46,6 +47,10 @@ tslib_1.__decorate([
46
47
  (0, inversify_1.inject)(breakpoint_manager_1.BreakpointManager),
47
48
  tslib_1.__metadata("design:type", breakpoint_manager_1.BreakpointManager)
48
49
  ], DebugBreakpointsSource.prototype, "breakpoints", void 0);
50
+ tslib_1.__decorate([
51
+ (0, inversify_1.inject)(common_1.CommandService),
52
+ tslib_1.__metadata("design:type", Object)
53
+ ], DebugBreakpointsSource.prototype, "commandService", void 0);
49
54
  tslib_1.__decorate([
50
55
  (0, inversify_1.postConstruct)(),
51
56
  tslib_1.__metadata("design:type", Function),
@@ -1 +1 @@
1
- {"version":3,"file":"debug-breakpoints-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-breakpoints-source.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,4DAAiF;AACjF,qEAA8E;AAC9E,yDAAoD;AACpD,yEAAqE;AACrE,6EAAwE;AAGjE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,wBAAU;IASxC,IAAI;QACV,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,CAAC,WAAW;QACR,KAAK,MAAM,mBAAmB,IAAI,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAC3E,MAAM,IAAI,qDAAwB,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9E,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;QAClC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;QACtC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;QACzC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAClC,CAAC;CACJ,CAAA;AAvBY,wDAAsB;AAGZ;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;qDAAC;AAGtB;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;sCACM,sCAAiB;2DAAC;AAGxC;IADT,IAAA,yBAAa,GAAE;;;;kDAIf;iCAZQ,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAuBlC"}
1
+ {"version":3,"file":"debug-breakpoints-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-breakpoints-source.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,4DAAiF;AACjF,qEAA8E;AAC9E,yDAAoD;AACpD,yEAAqE;AACrE,6EAAwE;AACxE,mDAAwD;AAGjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,wBAAU;IAYxC,IAAI;QACV,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,CAAC,WAAW;QACR,KAAK,MAAM,mBAAmB,IAAI,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAC3E,MAAM,IAAI,qDAAwB,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACnG,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;QAClC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;QACtC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;QACzC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAClC,CAAC;CACJ,CAAA;AA1BY,wDAAsB;AAGZ;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;qDAAC;AAGtB;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;sCACM,sCAAiB;2DAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,uBAAc,CAAC;;8DAC2B;AAGxC;IADT,IAAA,yBAAa,GAAE;;;;kDAIf;iCAfQ,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA0BlC"}
@@ -24,7 +24,7 @@ const React = require("@theia/core/shared/react");
24
24
  const browser_2 = require("@theia/workspace/lib/browser");
25
25
  const debug_console_contribution_1 = require("../console/debug-console-contribution");
26
26
  const debug_configuration_manager_1 = require("../debug-configuration-manager");
27
- const debug_frontend_application_contribution_1 = require("../debug-frontend-application-contribution");
27
+ const debug_commands_1 = require("../debug-commands");
28
28
  const debug_session_manager_1 = require("../debug-session-manager");
29
29
  const debug_action_1 = require("./debug-action");
30
30
  const debug_configuration_select_1 = require("./debug-configuration-select");
@@ -52,7 +52,7 @@ let DebugConfigurationWidget = class DebugConfigurationWidget extends browser_1.
52
52
  if (debug_session_options_1.DebugSessionOptions.isConfiguration(configuration)) {
53
53
  configuration.startedByUser = true;
54
54
  }
55
- this.commandRegistry.executeCommand(debug_frontend_application_contribution_1.DebugCommands.START.id, configuration);
55
+ this.commandRegistry.executeCommand(debug_commands_1.DebugCommands.START.id, configuration);
56
56
  };
57
57
  this.openConfiguration = () => this.manager.openConfiguration();
58
58
  this.openConsole = () => this.debugConsole.openView({
@@ -1 +1 @@
1
- {"version":3,"file":"debug-configuration-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-configuration-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-configuration-widget.tsx"],"names":[],"mappings":"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"}
@@ -3,12 +3,19 @@ import * as React from '@theia/core/shared/react';
3
3
  import { TreeElement } from '@theia/core/lib/browser/source-tree';
4
4
  import { BreakpointManager } from '../breakpoint/breakpoint-manager';
5
5
  import { ExceptionBreakpoint } from '../breakpoint/breakpoint-marker';
6
+ import { TreeWidget } from '@theia/core/lib/browser';
7
+ import { CommandService } from '@theia/core';
6
8
  export declare class DebugExceptionBreakpoint implements TreeElement {
7
9
  readonly data: ExceptionBreakpoint;
8
10
  readonly breakpoints: BreakpointManager;
11
+ protected readonly commandService: CommandService;
9
12
  readonly id: string;
10
- constructor(data: ExceptionBreakpoint, breakpoints: BreakpointManager);
11
- render(): React.ReactNode;
13
+ protected treeWidget?: TreeWidget;
14
+ constructor(data: ExceptionBreakpoint, breakpoints: BreakpointManager, commandService: CommandService);
15
+ render(host: TreeWidget): React.ReactNode;
16
+ protected renderActions(): React.ReactNode;
17
+ protected onEdit: () => Promise<void>;
18
+ protected selectInTree(): Promise<void>;
12
19
  protected toggle: () => void;
13
20
  editCondition(): Promise<void>;
14
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"debug-exception-breakpoint.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-exception-breakpoint.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAKtE,qBAAa,wBAAyB,YAAW,WAAW;IAKpD,QAAQ,CAAC,IAAI,EAAE,mBAAmB;IAClC,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IAJ3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAGP,IAAI,EAAE,mBAAmB,EACzB,WAAW,EAAE,iBAAiB;IAK3C,MAAM,IAAI,KAAK,CAAC,SAAS;IAazB,SAAS,CAAC,MAAM,aAA0E;IAEpF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBvC"}
1
+ {"version":3,"file":"debug-exception-breakpoint.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-exception-breakpoint.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAwD,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE3G,OAAO,EAAO,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,qBAAa,wBAAyB,YAAW,WAAW;IAMpD,QAAQ,CAAC,IAAI,EAAE,mBAAmB;IAClC,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IACvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IANrD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;gBAGrB,IAAI,EAAE,mBAAmB,EACzB,WAAW,EAAE,iBAAiB,EACpB,cAAc,EAAE,cAAc;IAKrD,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,KAAK,CAAC,SAAS;IAezC,SAAS,CAAC,aAAa,IAAI,KAAK,CAAC,SAAS;IAS1C,SAAS,CAAC,MAAM,sBAGd;cAEc,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAM7C,SAAS,CAAC,MAAM,aAA0E;IAEpF,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBvC"}
@@ -17,17 +17,24 @@
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DebugExceptionBreakpoint = void 0;
19
19
  const React = require("@theia/core/shared/react");
20
- const dialogs_1 = require("@theia/core/lib/browser/dialogs");
21
20
  const browser_1 = require("@theia/core/lib/browser");
21
+ const tree_selection_1 = require("@theia/core/lib/browser/tree/tree-selection");
22
22
  const core_1 = require("@theia/core");
23
+ const debug_commands_1 = require("../debug-commands");
23
24
  class DebugExceptionBreakpoint {
24
- constructor(data, breakpoints) {
25
+ constructor(data, breakpoints, commandService) {
25
26
  this.data = data;
26
27
  this.breakpoints = breakpoints;
28
+ this.commandService = commandService;
29
+ this.onEdit = async () => {
30
+ await this.selectInTree();
31
+ this.commandService.executeCommand(debug_commands_1.DebugCommands.EDIT_BREAKPOINT_CONDITION.id);
32
+ };
27
33
  this.toggle = () => this.breakpoints.toggleExceptionBreakpoint(this.data.raw.filter);
28
34
  this.id = data.raw.filter + ':' + data.raw.label;
29
35
  }
30
- render() {
36
+ render(host) {
37
+ this.treeWidget = host;
31
38
  return React.createElement("div", { title: this.data.raw.description || this.data.raw.label, className: 'theia-source-breakpoint' },
32
39
  React.createElement("span", { className: 'theia-debug-breakpoint-icon' }),
33
40
  React.createElement("input", { type: 'checkbox', checked: this.data.enabled, onChange: this.toggle }),
@@ -38,10 +45,24 @@ class DebugExceptionBreakpoint {
38
45
  this.data.condition &&
39
46
  React.createElement("span", { title: core_1.nls.localizeByDefault('Expression condition: {0}', this.data.condition), className: 'path ' + browser_1.TREE_NODE_INFO_CLASS },
40
47
  this.data.condition,
41
- " ")));
48
+ " ")),
49
+ this.renderActions());
50
+ }
51
+ renderActions() {
52
+ if (this.data.raw.supportsCondition) {
53
+ return React.createElement("div", { className: 'theia-debug-breakpoint-actions' },
54
+ React.createElement("div", { className: (0, browser_1.codicon)('edit', true), title: core_1.nls.localizeByDefault('Edit Condition...'), onClick: this.onEdit }));
55
+ }
56
+ return undefined;
57
+ }
58
+ async selectInTree() {
59
+ var _a;
60
+ if (((_a = this.treeWidget) === null || _a === void 0 ? void 0 : _a.model) && tree_selection_1.SelectableTreeNode.is(this)) {
61
+ this.treeWidget.model.selectNode(this);
62
+ }
42
63
  }
43
64
  async editCondition() {
44
- const inputDialog = new dialogs_1.SingleTextInputDialog({
65
+ const inputDialog = new browser_1.SingleTextInputDialog({
45
66
  title: this.data.raw.label,
46
67
  placeholder: this.data.raw.conditionDescription,
47
68
  initialValue: this.data.condition
@@ -1 +1 @@
1
- {"version":3,"file":"debug-exception-breakpoint.js","sourceRoot":"","sources":["../../../src/browser/view/debug-exception-breakpoint.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;AAIlD,6DAAwE;AACxE,qDAA+D;AAC/D,sCAAkC;AAElC,MAAa,wBAAwB;IAIjC,YACa,IAAyB,EACzB,WAA8B;QAD9B,SAAI,GAAJ,IAAI,CAAqB;QACzB,gBAAW,GAAX,WAAW,CAAmB;QAkBjC,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAhBtF,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;IACrD,CAAC;IAED,MAAM;QACF,OAAO,6BAAK,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAC,yBAAyB;YACpG,8BAAM,SAAS,EAAC,6BAA6B,GAAG;YAChD,+BAAO,IAAI,EAAC,UAAU,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,GAAI;YAC5E,8BAAM,SAAS,EAAC,WAAW;gBACvB,8BAAM,SAAS,EAAC,MAAM;oBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;wBAAS;gBACnD,IAAI,CAAC,IAAI,CAAC,SAAS;oBAChB,8BAAM,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAChF,SAAS,EAAE,OAAO,GAAG,8BAAoB;wBAAG,IAAI,CAAC,IAAI,CAAC,SAAS;4BAAS,CAC7E,CACL,CAAC;IACX,CAAC;IAID,KAAK,CAAC,aAAa;QACf,MAAM,WAAW,GAAG,IAAI,+BAAqB,CAAC;YAC1C,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;YAC1B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB;YAC/C,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;SACpC,CAAC,CAAC;QACH,IAAI,SAAS,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QACD,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;YACnB,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,IAAI,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACpF,CAAC;IACL,CAAC;CACJ;AA3CD,4DA2CC"}
1
+ {"version":3,"file":"debug-exception-breakpoint.js","sourceRoot":"","sources":["../../../src/browser/view/debug-exception-breakpoint.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;AAIlD,qDAA2G;AAC3G,gFAAiF;AACjF,sCAAkD;AAClD,sDAAkD;AAElD,MAAa,wBAAwB;IAKjC,YACa,IAAyB,EACzB,WAA8B,EACpB,cAA8B;QAFxC,SAAI,GAAJ,IAAI,CAAqB;QACzB,gBAAW,GAAX,WAAW,CAAmB;QACpB,mBAAc,GAAd,cAAc,CAAgB;QA6B3C,WAAM,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,8BAAa,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC,CAAC;QAQQ,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAtCtF,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,IAAgB;QACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,OAAO,6BAAK,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAC,yBAAyB;YACpG,8BAAM,SAAS,EAAC,6BAA6B,GAAG;YAChD,+BAAO,IAAI,EAAC,UAAU,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,GAAI;YAC5E,8BAAM,SAAS,EAAC,WAAW;gBACvB,8BAAM,SAAS,EAAC,MAAM;oBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;wBAAS;gBACnD,IAAI,CAAC,IAAI,CAAC,SAAS;oBAChB,8BAAM,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAChF,SAAS,EAAE,OAAO,GAAG,8BAAoB;wBAAG,IAAI,CAAC,IAAI,CAAC,SAAS;4BAAS,CAC7E;YACN,IAAI,CAAC,aAAa,EAAE,CACnB,CAAC;IACX,CAAC;IAES,aAAa;QACnB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAClC,OAAO,6BAAK,SAAS,EAAC,gCAAgC;gBAClD,6BAAK,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,GAAI,CAChH,CAAC;QACX,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAOS,KAAK,CAAC,YAAY;;QACxB,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,KAAK,KAAI,mCAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC;IAID,KAAK,CAAC,aAAa;QACf,MAAM,WAAW,GAAG,IAAI,+BAAqB,CAAC;YAC1C,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;YAC1B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB;YAC/C,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;SACpC,CAAC,CAAC;QACH,IAAI,SAAS,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QACD,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;YACnB,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,IAAI,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACpF,CAAC;IACL,CAAC;CACJ;AAnED,4DAmEC"}
@@ -20,7 +20,6 @@ export declare class DebugSessionWidget extends BaseWidget implements StatefulWi
20
20
  protected readonly widgetManager: WidgetManager;
21
21
  protected readonly stateService: FrontendApplicationStateService;
22
22
  protected init(): void;
23
- protected onActivateRequest(msg: Message): void;
24
23
  protected onAfterShow(msg: Message): void;
25
24
  getTrackableWidgets(): Widget[];
26
25
  storeState(): object;
@@ -1 +1 @@
1
- {"version":3,"file":"debug-session-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-session-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAe,cAAc,EAAE,aAAa,EAAW,yBAAyB,EAAE,aAAa,EAC/I,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,eAAO,MAAM,kCAAkC,EAAE,yBAIhD,CAAC;AAEF,qBACa,kBAAmB,SAAQ,UAAW,YAAW,cAAc,EAAE,gBAAgB,CAAC,uBAAuB;IAElH,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAS/D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,kBAAkB;IAIrE,MAAM,CAAC,UAAU,wJAAgH;IAEjI,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,OAAO,CAAC;IAG/D,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAG/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAElB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC9B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,+BAA+B,CAAC;IAG1G,SAAS,CAAC,IAAI,IAAI,IAAI;cAkCH,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;cAKrC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAKlD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,UAAU,IAAI,MAAM;IAIpB,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,GAAG,IAAI;CAGpD"}
1
+ {"version":3,"file":"debug-session-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-session-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAe,cAAc,EAAE,aAAa,EAAW,yBAAyB,EAAE,aAAa,EAC/I,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,eAAO,MAAM,kCAAkC,EAAE,yBAIhD,CAAC;AAEF,qBACa,kBAAmB,SAAQ,UAAW,YAAW,cAAc,EAAE,gBAAgB,CAAC,uBAAuB;IAElH,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAS/D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,kBAAkB;IAIrE,MAAM,CAAC,UAAU,wJAAgH;IAEjI,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,OAAO,CAAC;IAG/D,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAG/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAElB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC9B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,+BAA+B,CAAC;IAG1G,SAAS,CAAC,IAAI,IAAI,IAAI;cAkCH,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAKlD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,UAAU,IAAI,MAAM;IAIpB,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,GAAG,IAAI;CAGpD"}
@@ -75,10 +75,6 @@ let DebugSessionWidget = DebugSessionWidget_1 = class DebugSessionWidget extends
75
75
  layout.addWidget(this.toolbar);
76
76
  layout.addWidget(this.viewContainer);
77
77
  }
78
- onActivateRequest(msg) {
79
- super.onActivateRequest(msg);
80
- this.toolbar.focus();
81
- }
82
78
  onAfterShow(msg) {
83
79
  super.onAfterShow(msg);
84
80
  this.getTrackableWidgets().forEach(w => w.update());
@@ -1 +1 @@
1
- {"version":3,"file":"debug-session-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-session-widget.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-session-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-session-widget.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { MenuPath } from '@theia/core';
4
4
  import { TreeNode, NodeProps, SelectableTreeNode } from '@theia/core/lib/browser';
5
5
  import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
6
6
  import { DebugThreadsSource } from './debug-threads-source';
7
+ import { DebugThread } from '../model/debug-thread';
7
8
  import { DebugViewModel } from '../view/debug-view-model';
8
9
  import { DebugCallStackItemTypeKey } from '../debug-call-stack-item-type-key';
9
10
  export declare class DebugThreadsWidget extends SourceTreeWidget {
@@ -19,7 +20,11 @@ export declare class DebugThreadsWidget extends SourceTreeWidget {
19
20
  protected readonly debugCallStackItemTypeKey: DebugCallStackItemTypeKey;
20
21
  protected init(): void;
21
22
  protected updatingSelection: boolean;
22
- protected updateWidgetSelection(): void;
23
+ protected updateWidgetSelection(): Promise<void>;
24
+ /**
25
+ * Wait for a node to appear in the tree, expanding root children to populate the tree
26
+ */
27
+ protected waitForNode(thread: DebugThread): Promise<TreeNode | undefined>;
23
28
  protected updateModelSelection(): void;
24
29
  protected toContextMenuArgs(node: SelectableTreeNode): [number] | undefined;
25
30
  protected getDefaultNodeStyle(node: TreeNode, props: NodeProps): React.CSSProperties | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"debug-threads-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-threads-widget.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAmB,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAG9E,qBACa,kBAAmB,SAAQ,gBAAgB;IAEpD,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAkC;IAC/D,MAAM,CAAC,YAAY,WAAqD;IACxE,MAAM,CAAC,cAAc,WAAuD;IAC5E,MAAM,CAAC,SAAS,WAAkD;IAClE,MAAM,CAAC,UAAU,SAAmB;WACpB,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAWxE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,kBAAkB;IAKrE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;cAGrD,IAAI,IAAI,IAAI;IAW/B,SAAS,CAAC,iBAAiB,UAAS;IACpC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAiBvC,SAAS,CAAC,oBAAoB,IAAI,IAAI;cAsBnB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS;cAOjE,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,CAAC,aAAa,GAAG,SAAS;CAO5G"}
1
+ {"version":3,"file":"debug-threads-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-threads-widget.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,kBAAkB,EAAqB,MAAM,yBAAyB,CAAC;AACrG,OAAO,EAAE,gBAAgB,EAAmB,MAAM,qCAAqC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAG9E,qBACa,kBAAmB,SAAQ,gBAAgB;IAEpD,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAkC;IAC/D,MAAM,CAAC,YAAY,WAAqD;IACxE,MAAM,CAAC,cAAc,WAAuD;IAC5E,MAAM,CAAC,SAAS,WAAkD;IAClE,MAAM,CAAC,UAAU,SAAmB;WACpB,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAWxE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,kBAAkB;IAKrE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;cAGrD,IAAI,IAAI,IAAI;IAa/B,SAAS,CAAC,iBAAiB,UAAS;cACpB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDtD;;OAEG;cACa,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAsC/E,SAAS,CAAC,oBAAoB,IAAI,IAAI;cAsBnB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS;cAOjE,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,CAAC,aAAa,GAAG,SAAS;CAO5G"}
@@ -21,6 +21,7 @@ const tslib_1 = require("tslib");
21
21
  const inversify_1 = require("@theia/core/shared/inversify");
22
22
  const browser_1 = require("@theia/core/lib/browser");
23
23
  const source_tree_1 = require("@theia/core/lib/browser/source-tree");
24
+ const tree_expansion_1 = require("@theia/core/lib/browser/tree/tree-expansion");
24
25
  const debug_threads_source_1 = require("./debug-threads-source");
25
26
  const debug_session_1 = require("../debug-session");
26
27
  const debug_thread_1 = require("../model/debug-thread");
@@ -52,27 +53,90 @@ let DebugThreadsWidget = DebugThreadsWidget_1 = class DebugThreadsWidget extends
52
53
  this.title.label = nls_1.nls.localize('theia/debug/threads', 'Threads');
53
54
  this.toDispose.push(this.threads);
54
55
  this.source = this.threads;
55
- this.toDispose.push(this.viewModel.onDidChange(() => this.updateWidgetSelection()));
56
+ this.toDispose.push(this.viewModel.onDidChange(() => {
57
+ this.updateWidgetSelection();
58
+ }));
56
59
  this.toDispose.push(this.model.onSelectionChanged(() => this.updateModelSelection()));
57
60
  }
58
- updateWidgetSelection() {
61
+ async updateWidgetSelection() {
59
62
  if (this.updatingSelection) {
60
63
  return;
61
64
  }
62
65
  this.updatingSelection = true;
63
66
  try {
67
+ await this.model.refresh();
64
68
  const { currentThread } = this.viewModel;
65
- if (currentThread) {
66
- const node = this.model.getNode(currentThread.id);
67
- if (browser_1.SelectableTreeNode.is(node)) {
69
+ // Check if current selection still exists in the tree
70
+ const selectedNode = this.model.selectedNodes[0];
71
+ const selectionStillValid = selectedNode && this.model.getNode(selectedNode.id);
72
+ // Only update selection if:
73
+ // 1. Current selection is invalid (node no longer in tree), OR
74
+ // 2. There's a stopped thread to show
75
+ if (selectionStillValid && (!currentThread || !currentThread.stopped)) {
76
+ return;
77
+ }
78
+ // Try to select the current stopped thread, or clear if none
79
+ if (currentThread && currentThread.stopped) {
80
+ const node = await this.waitForNode(currentThread);
81
+ // Re-check stopped state after async wait
82
+ if (!currentThread.stopped) {
83
+ return;
84
+ }
85
+ if (node && browser_1.SelectableTreeNode.is(node)) {
68
86
  this.model.selectNode(node);
87
+ // Set context key
88
+ if (source_tree_1.TreeElementNode.is(node)) {
89
+ if (node.element instanceof debug_thread_1.DebugThread) {
90
+ this.debugCallStackItemTypeKey.set('thread');
91
+ }
92
+ else if (node.element instanceof debug_session_1.DebugSession) {
93
+ this.debugCallStackItemTypeKey.set('session');
94
+ }
95
+ }
69
96
  }
70
97
  }
98
+ else if (!selectionStillValid) {
99
+ // Selection is stale and no stopped thread to select
100
+ this.model.clearSelection();
101
+ }
71
102
  }
72
103
  finally {
73
104
  this.updatingSelection = false;
74
105
  }
75
106
  }
107
+ /**
108
+ * Wait for a node to appear in the tree, expanding root children to populate the tree
109
+ */
110
+ async waitForNode(thread) {
111
+ const maxAttempts = 10;
112
+ const delayMs = 50;
113
+ const threadId = thread.id;
114
+ for (let attempt = 0; attempt < maxAttempts; attempt++) {
115
+ // If thread continued during wait, abort
116
+ if (!thread.stopped) {
117
+ return undefined;
118
+ }
119
+ await this.model.refresh();
120
+ const root = this.model.root;
121
+ // Expand all root's direct children to populate the tree
122
+ if (root && browser_1.CompositeTreeNode.is(root)) {
123
+ for (const child of root.children) {
124
+ if (tree_expansion_1.ExpandableTreeNode.is(child) && !child.expanded) {
125
+ await this.model.expandNode(child);
126
+ }
127
+ }
128
+ }
129
+ // Now look directly for the thread node
130
+ const threadNode = this.model.getNode(threadId);
131
+ if (threadNode) {
132
+ return threadNode;
133
+ }
134
+ if (attempt < maxAttempts - 1) {
135
+ await new Promise(resolve => setTimeout(resolve, delayMs));
136
+ }
137
+ }
138
+ return undefined;
139
+ }
76
140
  updateModelSelection() {
77
141
  if (this.updatingSelection) {
78
142
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"debug-threads-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-threads-widget.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"debug-threads-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-threads-widget.ts"],"names":[],"mappings":"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"}