about summary refs log tree commit diff stats
path: root/edit
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-09-12 13:49:50 -0700
committerKartik K. Agaram <vc@akkartik.com>2015-09-12 13:51:25 -0700
commitfa94f4d92340f001560b16dd0c2e5681ca5db031 (patch)
tree8de1aa88979d8d8606cf0a7f737d33fbb633f7b7 /edit
parent7169c636272a71a9f18d6c90e458c8089346c1fe (diff)
downloadmu-fa94f4d92340f001560b16dd0c2e5681ca5db031.tar.gz
2183 - environment + external editor using tmux
Thanks Jack and Caleb Couch for the idea.
Diffstat (limited to 'edit')
-rw-r--r--edit/005-sandbox.mu5
-rw-r--r--edit/006-sandbox-edit.mu9
-rw-r--r--edit/007-sandbox-delete.mu4
-rw-r--r--edit/008-sandbox-test.mu2
-rw-r--r--edit/009-sandbox-trace.mu8
5 files changed, 10 insertions, 18 deletions
diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu
index adf39f6a..5d2e575e 100644
--- a/edit/005-sandbox.mu
+++ b/edit/005-sandbox.mu
@@ -405,10 +405,7 @@ z:number <- add 2, 2
   assume-console [
     press F4
   ]
-  run [
-    event-loop screen:address, console:address, 3:address:programming-environment-data
-  ]
-  # check that screen prints the results
+  event-loop screen:address, console:address, 3:address:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
diff --git a/edit/006-sandbox-edit.mu b/edit/006-sandbox-edit.mu
index e43e09b2..90be2de7 100644
--- a/edit/006-sandbox-edit.mu
+++ b/edit/006-sandbox-edit.mu
@@ -63,8 +63,7 @@ recipe foo [
 ]
 
 after <global-touch> [
-  # right side of screen and below sandbox editor? pop appropriate sandbox
-  # contents back into sandbox editor provided it's empty
+  # below sandbox editor? pop appropriate sandbox contents back into sandbox editor
   {
     sandbox-left-margin:number <- get *current-sandbox, left:offset
     click-column:number <- get *t, column:offset
@@ -77,7 +76,7 @@ after <global-touch> [
     below-sandbox-editor?:boolean <- greater-or-equal click-row, first-sandbox-begins
     break-unless below-sandbox-editor?
     empty-sandbox-editor?:boolean <- empty-editor? current-sandbox
-    break-unless empty-sandbox-editor?  # make the user hit F4 before editing a new sandbox
+    break-unless empty-sandbox-editor?  # don't clobber existing contents
     # identify the sandbox to edit and remove it from the sandbox list
     sandbox:address:sandbox-data <- extract-sandbox env, click-row
     text:address:array:character <- get *sandbox, data:offset
@@ -139,9 +138,7 @@ scenario sandbox-with-print-can-be-edited [
   assume-console [
     press F4
   ]
-  run [
-    event-loop screen:address, console:address, 3:address:programming-environment-data
-  ]
+  event-loop screen:address, console:address, 3:address:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
diff --git a/edit/007-sandbox-delete.mu b/edit/007-sandbox-delete.mu
index b4b317e0..12c84adf 100644
--- a/edit/007-sandbox-delete.mu
+++ b/edit/007-sandbox-delete.mu
@@ -14,9 +14,7 @@ scenario deleting-sandboxes [
     type [add 2, 2]
     press F4
   ]
-  run [
-    event-loop screen:address, console:address, 3:address:programming-environment-data
-  ]
+  event-loop screen:address, console:address, 3:address:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
diff --git a/edit/008-sandbox-test.mu b/edit/008-sandbox-test.mu
index cdad7d3c..63da5822 100644
--- a/edit/008-sandbox-test.mu
+++ b/edit/008-sandbox-test.mu
@@ -83,7 +83,7 @@ recipe foo [
 
 # clicks on sandbox responses save it as 'expected'
 after <global-touch> [
-  # right side of screen? check if it's inside the output of any sandbox
+  # check if it's inside the output of any sandbox
   {
     sandbox-left-margin:number <- get *current-sandbox, left:offset
     click-column:number <- get *t, column:offset
diff --git a/edit/009-sandbox-trace.mu b/edit/009-sandbox-trace.mu
index 1091981e..a7a9b2e0 100644
--- a/edit/009-sandbox-trace.mu
+++ b/edit/009-sandbox-trace.mu
@@ -24,7 +24,7 @@ recipe foo [
     .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━.
     .                    ┊                   .
   ]
-  # click on the 'foo' line in the sandbox
+  # click on the code in the sandbox
   assume-console [
     left-click 4, 21
   ]
@@ -99,14 +99,14 @@ recipe foo [
     .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊━━━━━━━━━━━━━━━━━━━.
     .                    ┊                   .
   ]
-  # click on the 'foo' line in the sandbox
+  # click on the code in the sandbox
   assume-console [
     left-click 4, 21
   ]
   run [
     event-loop screen:address, console:address, 3:address:programming-environment-data
   ]
-  # trace now printed
+  # trace now printed above result
   screen-should-contain [
     .                     run (F4)           .
     .                    ┊                   .
@@ -138,7 +138,7 @@ recipe! update-sandbox [
 
 # clicks on sandbox code toggle its display-trace? flag
 after <global-touch> [
-  # right side of screen? check if it's inside the code of any sandbox
+  # check if it's inside the code of any sandbox
   {
     sandbox-left-margin:number <- get *current-sandbox, left:offset
     click-column:number <- get *t, column:offset