Skip the multi-group frame for single groups & small app scope improv…

…ement
algorand · Sep 29, 2023 · d2aeca7 · d2aeca7
1 parent b5e6556
commit d2aeca7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/debugAdapter/debugRequestHandlers.ts b/src/debugAdapter/debugRequestHandlers.ts
@@ -312,8 +312,13 @@ export class TxnGroupDebugSession extends LoggingDebugSession {
 		if (typeof frame !== 'undefined') {
 			if (frame instanceof ProgramStackFrame) {
 				const programScope = new ProgramStateScope(args.frameId);
+				let scopeName = 'Program State';
+				const appID = frame.currentAppID();
+				if (typeof appID !== 'undefined') {
+					scopeName += `: App ${appID}`;
+				}
 				scopes.push(
-					new Scope("Program State", this._variableHandles.create(programScope), false)
+					new Scope(scopeName, this._variableHandles.create(programScope), false)
 				);
 			}
 			scopes.push(

diff --git a/src/debugAdapter/traceReplayEngine.ts b/src/debugAdapter/traceReplayEngine.ts
@@ -37,6 +37,11 @@ export class TraceReplayEngine {
         this.stack = [
             new TopLevelTransactionGroupsFrame(this, simulateResponse)
         ];
+        if (simulateResponse.txnGroups.length === 1) {
+            // If only a single group, get rid of the top-level frame
+            this.forward();
+            this.stack.shift();
+        }
 	}
 
     private resetCurrentAppState() {

diff --git a/tests/adapter.test.ts b/tests/adapter.test.ts
@@ -57,7 +57,7 @@ async function assertVariables(dc: DebugClient, {
 	assert.ok(scopesResponse.success);
 	const scopes = scopesResponse.body.scopes;
 
-	const executionScope = scopes.find(scope => scope.name === 'Program State');
+	const executionScope = scopes.find(scope => scope.name.startsWith('Program State'));
 	assert.ok(executionScope);
 
 	const executionScopeResponse = await dc.variablesRequest({ variablesReference: executionScope.variablesReference });