Fix pause on error

ManuelHentschel · Mar 24, 2024 · 6f5ec63 · 6f5ec63
1 parent 72f84c6
commit 6f5ec63
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/R/communications.R b/R/communications.R
@@ -32,7 +32,9 @@
     host <- session$dapHost
     conn <- session$dapSocketConnection
     logCat('Listening on ', host, ':', toString(port), '\n', sep='')
-    sendStoppedEvent('step')
+    if(!session$state$isPaused()){
+      sendStoppedEvent('step')
+    }
     session$previousOptions <- options(session$internalOptions)
   }
 

diff --git a/R/flow.R b/R/flow.R
@@ -45,26 +45,27 @@
 showingPromptRequest <- function(response, args, request){
   whichPrompt <- lget(args, 'which', '')
   if(session$state$baseState %in% c('starting', 'loadLib', 'quitting')){
-    logPrint('ignoring callback...')
+    logPrint('showingPromptRequest: ignoring  callback...')
   } else if(whichPrompt == 'topLevel'){
-    logPrint('is showing toplevel prompt!!!')
+    logPrint('showingPromptRequest: is showing toplevel prompt!!!')
     if(session$allowGlobalDebugging){
-      logPrint('breakpoint on toplevel')
+      logPrint('showingPromptRequest: breakpoint on toplevel')
       session$state$changeBaseState('workspace', startPaused=TRUE)
       sendStoppedEvent(reason='step')
     } else{
-      logPrint('quit from toplevel')
+      logPrint('showingPromptRequest: quit from toplevel')
       session$state$changeBaseState('quitting')
       terminateSessionFromTopLevel()
       # session$stopListeningOnPort <- TRUE
     }
   } else if(session$state$isPausedOnError()){
+    logPrint('showingPromptRequest: paused on error -> ignore')
     # ignore
   } else if(session$state$isPausedOnBreakpoint()){
-    logPrint('starting paused on breakpoint!!!')
+    logPrint('showingPromptRequest: starting paused on breakpoint!!!')
     sendStoppedEvent(reason='breakpoint')
   } else{
-    logPrint('starting paused!!!')
+    logPrint('showingPromptRequest: starting paused!!!')
     session$state$startPaused('browser')
     session$clearStackTree <- TRUE
     sendStoppedEvent(reason='step')

diff --git a/R/global.R b/R/global.R
@@ -194,7 +194,7 @@ State <- R6::R6Class(
             self$hasHitError <- TRUE
           }
         }
-        logCat('starting paused on', toString(pausedOn), '\n')
+        logCat('State: starting paused on', toString(pausedOn), '\n')
       }
       return(prevState)
     },