From 09fc5d86b728babeef069c3d68af69a157dfabb3 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 10 Sep 2026 14:55:48 +0200
Subject: [PATCH] fix disappearing shortcut chips when pause/resume

---
 src/ide/ui.ts            | 8 +++++++-
 src/ide/views/editors.ts | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ide/ui.ts b/src/ide/ui.ts
index 1a599e9b..ae31a2e3 100644
--- a/src/ide/ui.ts
+++ b/src/ide/ui.ts
@@ -1288,6 +1288,7 @@ function pause() {
   clearBreakpoint();
   _pause();
   userPaused = true;
+  refreshShortcutBar(); // debug chips appear once the session starts
 }
 
 // F8 pauses a running emulator and resumes a paused one. Unmodified and not
@@ -1311,7 +1312,8 @@ function _resume() {
 function resume() {
   if (!checkRunReady()) return;
 
-  // If there are enabled breakpoints, resume with them armed
+  // If there are enabled breakpoints, resume with them armed; the debug
+  // session stays active so the debug chips keep showing
   if (bpStore.getEnabled().length > 0 && armBreakpoints()) {
     if (!platform.isRunning()) {
       projectWindows.refresh(false);
@@ -1322,12 +1324,16 @@ function resume() {
   }
 
   clearBreakpoint();
+  // plain run: end the debug session so the Reset & Run / Search chips return
+  // (pause() set debugSessionActive; undo it here unless breakpoints were armed)
+  debugSessionActive = false;
   if (!platform.isRunning()) {
     projectWindows.refresh(false);
   }
   _resume();
   userPaused = false;
   lastViewClicked = null;
+  refreshShortcutBar();
 }
 
 function singleStep() {
diff --git a/src/ide/views/editors.ts b/src/ide/views/editors.ts
index 31f070ea..26f7dd8e 100644
--- a/src/ide/views/editors.ts
+++ b/src/ide/views/editors.ts
@@ -154,8 +154,8 @@ export class SourceEditor implements ProjectView {
       mk('mod+f', 'Find', openSearchPanel),
       mk('mod+g', 'Find Next', findNext),
       mk('mod+d', 'Next Occurrence', selectNextOccurrence),
-      mk('mod+shift+backspace', 'Delete Line', deleteLine),
-      mk('mod+/', 'Toggle Comment', toggleComment),
+      //mk('mod+shift+backspace', 'Delete Line', deleteLine),
+      //mk('mod+/', 'Toggle Comment', toggleComment),
       mk('mod+z', 'Undo', undo),
       mk('mod+shift+z', 'Redo', redo),
     ];