3943

Undo commit 3938 and almost everything after. Let's do this right.

4 files changed, 0 insertions, 45 deletions

diff --git a/edit/001-editor.mu b/edit/001-editor.mu
index d4e0a479..9e136b7e 100644
--- a/edit/001-editor.mu
+++ b/edit/001-editor.mu
@@ -218,7 +218,6 @@ def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num
   screen <- move-cursor screen, row, column
   clear-line-until screen, right
   clear-rest-of-screen screen, row, left, right
-#?   screen <- move-cursor screen, row, column
 ]
 
 def clear-rest-of-screen screen:&:screen, row:num, left:num, right:num -> screen:&:screen [
diff --git a/edit/002-typing.mu b/edit/002-typing.mu
index acb0a53c..3b29c322 100644
--- a/edit/002-typing.mu
+++ b/edit/002-typing.mu
@@ -1116,11 +1116,8 @@ after <handle-special-key> [
 def draw-horizontal screen:&:screen, row:num, x:num, right:num -> screen:&:screen [
   local-scope
   load-ingredients
-#?   a:num, b:num <- cursor-position screen
-#?   stash [draw-horizontal] row [--] a b
   height:num <- screen-height screen
   past-bottom?:bool <- greater-or-equal row, height
-#?   stash [  past-bottom?] past-bottom?
   return-if past-bottom?
   style:char, style-found?:bool <- next-ingredient
   {
@@ -1138,18 +1135,12 @@ def draw-horizontal screen:&:screen, row:num, x:num, right:num -> screen:&:scree
     break-if bg-color-found?
     bg-color <- copy 0/black
   }
-#?   stash [aa] x
   screen <- move-cursor screen, row, x
   {
     continue?:bool <- lesser-or-equal x, right  # right is inclusive, to match editor semantics
     break-unless continue?
-#?   a b <- cursor-position screen
-#?   stash [bb] x [--] a b
     print screen, style, color, bg-color
-#?   a b <- cursor-position screen
-#?   stash [cc] x [--] a b
     x <- add x, 1
     loop
   }
-#?   stash [draw-horizontal done]
 ]
diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu
index 021d9d73..897f2923 100644
--- a/edit/004-programming-environment.mu
+++ b/edit/004-programming-environment.mu
@@ -447,7 +447,6 @@ def render-recipes screen:&:screen, env:&:environment, render-editor:render-reci
   clear-screen-from screen, row, left, left, right
   #
   assert-no-scroll screen, old-top-idx
-#?   stash [render recipes done]
 ]
 
 # replaced in a later layer
@@ -468,7 +467,6 @@ def render-sandbox-side screen:&:screen, env:&:environment, render-editor:render
   clear-screen-from screen, row, left, left, right
   #
   assert-no-scroll screen, old-top-idx
-#?   stash [render sandbox side0 done]
 ]
 
 def update-cursor screen:&:screen, recipes:&:editor, current-sandbox:&:editor, sandbox-in-focus?:bool, env:&:environment -> screen:&:screen [
diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu
index f27c1a2c..9970bbae 100644
--- a/edit/005-sandbox.mu
+++ b/edit/005-sandbox.mu
@@ -14,8 +14,6 @@ def! main [
   env:&:environment <- new-programming-environment 0/filesystem, 0/screen
   env <- restore-sandboxes env, 0/filesystem
   render-all 0/screen, env, render
-  wait-for-some-interaction
-  $exit
   event-loop 0/screen, 0/console, env, 0/filesystem
 ]
 
@@ -270,15 +268,12 @@ def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:rende
   clear-rest-of-screen screen, row, left, right
   #
   assert-no-scroll screen, old-top-idx
-#?   stash [render sandbox side done]
 ]
 
 def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, row:num, render-from:num, idx:num -> row:num, screen:&:screen, sandbox:&:sandbox [
   local-scope
   load-ingredients
   return-unless sandbox
-#?   a:num b:num <- cursor-position screen
-#?   stash [render-sandboxes] idx [:] row [--] a b
   screen-height:num <- screen-height screen
   at-bottom?:bool <- greater-or-equal row, screen-height
   return-if at-bottom?
@@ -287,8 +282,6 @@ def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, ro
     break-if hidden?
     # render sandbox menu
     row <- add row, 1
-#?     at-bottom?:bool <- greater-or-equal row, screen-height
-#?     return-if at-bottom?
     screen <- move-cursor screen, row, left
     screen <- render-sandbox-menu screen, idx, left, right
     # save menu row so we can detect clicks to it later
@@ -350,32 +343,6 @@ def render-sandbox-menu screen:&:screen, sandbox-index:num, left:num, right:num
   clear-line-until screen, right, 52/background-red
 ]
 
-scenario skip-rendering-sandbox-menu-past-bottom-row [
-  trace-until 100/app  # trace too long
-  assume-screen 100/width, 6/height
-  # recipe editor is empty
-  assume-resources [
-    [lesson/0] <- [|add 2, 2|]
-    [lesson/1] <- [|add 1, 1|]
-  ]
-  # create two sandboxes such that the top one just barely fills the screen
-  env:&:environment <- new-programming-environment resources, screen, []
-  env <- restore-sandboxes env, resources
-#?   $clear-trace
-  run [
-    render-all screen, env, render
-  ]
-#?   $dump-trace [app]
-  screen-should-contain [
-    .                                                                                 run (F4)           .
-    .                                                  ┊                                                 .
-    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
-    .                                                  ┊0   edit       copy       to recipe    delete    .
-    .                                                  ┊add 2, 2                                         .
-    .                                                  ┊─────────────────────────────────────────────────.
-  ]
-]
-
 # divide up the menu bar for a sandbox into 3 segments, for edit/copy/delete buttons
 # delete-button-right == right
 # all left/right pairs are inclusive