tools/debugger/vscode-plugin/README.md

@@ -128,6 +128,8 @@ You can change the stepping granularity with a button at the lower panel:
 
 which is useful for evaluating complex expressions step-by-step.
 
+Use `Ctrl + F10` (`Cmd + F10` on Mac) to switch between the last and currently selected granularities.
+
 ## FAQ
 
 ### I've set `"entrypoint": "{AskOnStart}"` in the configuration, and I'm still not asked for an entrypoint when starting a debug session.

tools/debugger/vscode-plugin/package.json

@@ -22,7 +22,8 @@
     },
     "activationEvents": [
         "onDebugResolve:ligo",
-        "onCommand:extension.ligo-debugger.switchSteppingGranularity"
+        "onCommand:extension.ligo-debugger.switchSteppingGranularity",
+        "onCommand:extension.ligo-debugger.useLastSteppingGranularity"
     ],
 
     "icon": "logo.png",
@@ -248,6 +249,18 @@
                 "command": "extension.ligo-debugger.switchSteppingGranularity",
                 "title": "Debug: Switch stepping granularity",
                 "description": "Changes granularity used by StepIn and other buttons"
+            },
+            {
+                "command": "extension.ligo-debugger.useLastSteppingGranularity",
+                "title": "Debug: Switch to last stepping granularity",
+                "description": "Changes stepping granularity to the previously selected one"
+            }
+        ],
+        "keybindings": [
+            {
+                "command": "extension.ligo-debugger.useLastSteppingGranularity",
+                "key": "ctrl+f10",
+                "mac": "cmd+f10"
             }
         ]
     },

tools/debugger/vscode-plugin/src/ui.ts

@@ -31,6 +31,7 @@ export type SteppingGranularity
 export class DebugSteppingGranularityStatus implements vscode.Disposable {
 	private bar: vscode.StatusBarItem;
 	private _status: SteppingGranularity;
+	private lastStatus: Maybe<SteppingGranularity>
 	private readonly statusChangeEvent = new vscode.EventEmitter<SteppingGranularity>();
 	private disposables: vscode.Disposable[] = new Array();
 
@@ -40,7 +41,8 @@ export class DebugSteppingGranularityStatus implements vscode.Disposable {
 		// We will create a `StatusBarItem` and change stepping granularity
 		// through it.
 
-		const usedCommand = 'extension.ligo-debugger.switchSteppingGranularity';
+		const switchCommand = 'extension.ligo-debugger.switchSteppingGranularity';
+		const useLastCommand = 'extension.ligo-debugger.useLastSteppingGranularity';
 
 		// Note: VSCode has built-in status bar that is added on debug session start,
 		// At the moment of writing it has id='status.debug' and priority=30, and
@@ -52,7 +54,7 @@ export class DebugSteppingGranularityStatus implements vscode.Disposable {
 			);
 		this.bar.name = 'Debug Stepping Granularity Status';
 		this.bar.tooltip = 'Select debug step granularity';
-		this.bar.command = usedCommand;
+		this.bar.command = switchCommand;
 
 		this.status = 'statement';
 
@@ -63,12 +65,15 @@ export class DebugSteppingGranularityStatus implements vscode.Disposable {
 		}
 
 		this.disposables.push(
-			vscode.commands.registerCommand(usedCommand, async () => {
+			vscode.commands.registerCommand(switchCommand, async () => {
 				const newGranularity = await this.createStatusChoosingQuickPick();
 				if (newGranularity){
 					this.status = newGranularity;
 				}
-			})
+			}),
+			vscode.commands.registerCommand(useLastCommand, () =>
+				this.toLastStatus()
+			)
 		);
 
 	}
@@ -81,6 +86,12 @@ export class DebugSteppingGranularityStatus implements vscode.Disposable {
 		return this._status;
 	}
 	set status(newStatus: SteppingGranularity) {
+		if (this._status != newStatus) {
+			// We update the last used status - but only if an actual status change
+			// is performed, the other UX is annoying.
+			this.lastStatus = this._status;
+		}
+
 		this._status = newStatus;
 		this.bar.text =
 			`$(debug-step-over) ${DebugSteppingGranularityStatus.granularityToUIString(newStatus)}`;
@@ -93,6 +104,19 @@ export class DebugSteppingGranularityStatus implements vscode.Disposable {
 		// the latest message.
 	}
 
+	/**
+	 * Switch to the previously selected status.
+	 *
+	 * Does nothing and does not trigger any events if the status was never
+	 * changed.
+	 */
+	public toLastStatus() {
+		if (this.lastStatus) {
+			this.status = this.lastStatus
+      // this.lastStatus is updated in the smart setter
+		}
+	}
+
 	/**
 	 * Display the button in UI.
 	 */