Merge pull request #378 from jtpio/notebook-switch

Handle switching between two active debug sessions

src/callstack/model.ts

@@ -21,8 +21,12 @@ export class CallstackModel {
    */
   set frames(newFrames: CallstackModel.IFrame[]) {
     this._state = newFrames;
-    // default to the new frame is the previous one can't be found
-    if (!this.frame || !newFrames.find(frame => frame.id === this.frame.id)) {
+    const frame = newFrames.find(
+      frame => Private.getFrameId(frame) === Private.getFrameId(this.frame)
+    );
+    // Default to the first frame if the previous one can't be found.
+    // Otherwise keep the current frame selected.
+    if (!frame) {
       this.frame = newFrames[0];
     }
     this._framesChanged.emit(newFrames);
@@ -72,3 +76,16 @@ export namespace CallstackModel {
    */
   export interface IFrame extends DebugProtocol.StackFrame {}
 }
+
+/**
+ * A namespace for private data.
+ */
+namespace Private {
+  /**
+   * Construct an id for the given frame.
+   * @param frame The frame.
+   */
+  export function getFrameId(frame: CallstackModel.IFrame) {
+    return `${frame?.source?.path}-${frame?.id}`;
+  }
+}

src/variables/tree.tsx

@@ -86,12 +86,9 @@ const VariablesComponent = ({
     <>
       <ul>
         {variables.map(variable => {
+          const key = `${variable.evaluateName}-${variable.type}-${variable.value}`;
           return (
-            <VariableComponent
-              key={variable.evaluateName}
-              data={variable}
-              service={service}
-            />
+            <VariableComponent key={key} data={variable} service={service} />
           );
         })}
       </ul>