From 73bec71db3a7632b80167d0cd2274b243e0ddb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Wed, 19 Feb 2020 14:32:37 +0100
Subject: [PATCH] [apps/code] Allow interruption of infinite print loops

while (True):
  print("hello")
is now interruptible when the user presses Back
---
 apps/code/console_controller.cpp | 33 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp
index 9e53b9d30..4316725b1 100644
--- a/apps/code/console_controller.cpp
+++ b/apps/code/console_controller.cpp
@@ -394,21 +394,26 @@ void ConsoleController::printText(const char * text, size_t length) {
     /* If there is no new line in text, just append it to the output
      * accumulation buffer. */
     appendTextToOutputAccumulationBuffer(text, length);
-    return;
+  } else {
+    if (textCutIndex < length - 1) {
+      /* If there is a new line in the middle of the text, we have to store at
+       * least two new console lines in the console store. */
+      printText(text, textCutIndex + 1);
+      printText(&text[textCutIndex+1], length - (textCutIndex + 1));
+      return;
+    }
+    /* There is a new line at the end of the text, we have to store the line in
+     * the console store. */
+    assert(textCutIndex == length - 1);
+    appendTextToOutputAccumulationBuffer(text, length-1);
+    flushOutputAccumulationBufferToStore();
+    micropython_port_vm_hook_refresh_print();
   }
-  if (textCutIndex < length - 1) {
-    /* If there is a new line in the middle of the text, we have to store at
-     * least two new console lines in the console store. */
-    printText(text, textCutIndex + 1);
-    printText(&text[textCutIndex+1], length - (textCutIndex + 1));
-    return;
-  }
-  /* There is a new line at the end of the text, we have to store the line in
-   * the console store. */
-  assert(textCutIndex == length - 1);
-  appendTextToOutputAccumulationBuffer(text, length-1);
-  flushOutputAccumulationBufferToStore();
-  micropython_port_vm_hook_refresh_print();
+  /* micropython_port_vm_hook_loop is not enough to detect user interruptions,
+   * because it calls micropython_port_interrupt_if_needed every 20000
+   * operations, and a print operation is quite long. We thus explicitely call
+   * micropython_port_interrupt_if_needed here. */
+  micropython_port_interrupt_if_needed();
 }
 
 void ConsoleController::autoImportScript(Script script, bool force) {