From 38ac1d1e4363abf8521d16f9aec2352ae8123b90 Mon Sep 17 00:00:00 2001
From: Austin Cory Bart <acbart@vt.edu>
Date: Sat, 31 Aug 2019 09:45:57 -0400
Subject: [PATCH] allow line highlighting

---
 .idea/workspace.xml  | 14 ++------------
 dist/block_mirror.js | 41 ++++++++++++++++++++++++++++++++++++++++-
 src/block_editor.js  |  9 ++++++++-
 src/block_mirror.js  | 13 ++++++++++++-
 src/text_editor.js   | 17 +++++++++++++++++
 5 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2ea1b1a..75b47c8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,21 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="Basics of packaging, bug fixes, better updating">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/block_mirror.css" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_Call.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Call.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_FunctionDef.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_FunctionDef.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_If.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_If.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_Import.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Import.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_Str.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_Str.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ast/ast_functions.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/ast/ast_functions.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/block_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_editor.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/block_mirror.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/blockly_shims.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/blockly_shims.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/text_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_editor.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text_to_blocks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_to_blocks.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/simple_dev.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/simple_dev.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -170,7 +159,8 @@
       <workItem from="1566485855097" duration="1907000" />
       <workItem from="1566563017463" duration="16000" />
       <workItem from="1567085840789" duration="2056000" />
-      <workItem from="1567195590761" duration="628000" />
+      <workItem from="1567195590761" duration="1369000" />
+      <workItem from="1567227774065" duration="2465000" />
     </task>
     <task id="LOCAL-00001" summary="Basics of packaging, bug fixes, better updating">
       <created>1564063805490</created>
diff --git a/dist/block_mirror.js b/dist/block_mirror.js
index 40a9b09..7f1edd0 100644
--- a/dist/block_mirror.js
+++ b/dist/block_mirror.js
@@ -355,11 +355,21 @@ BlockMirror.prototype.VISIBLE_MODES = {
 };
 BlockMirror.prototype.BREAK_WIDTH = 675;
 
+BlockMirror.prototype.setHighlightedLines = function (lines, style) {
+  this.textEditor.clearHighlightedLines();
+  this.textEditor.setHighlightedLines(lines, style); //this.blockEditor.highlightLines(lines, style);
+};
+
+BlockMirror.prototype.clearHighlightedLines = function () {
+  this.textEditor.clearHighlightedLines(); //this.blockEditor.unhighlightLines(lines, style);
+};
+
 function BlockMirrorTextEditor(blockMirror) {
   this.blockMirror = blockMirror;
   this.textContainer = blockMirror.tags.textContainer;
   this.textArea = blockMirror.tags.textArea;
-  this.textSidebar = blockMirror.tags.textSidebar; // notification
+  this.textSidebar = blockMirror.tags.textSidebar;
+  this.highlightedHandles = []; // notification
 
   this.silentEvents_ = false; // Do we need to force an update?
 
@@ -568,6 +578,28 @@ BlockMirrorTextEditor.prototype.changed = function (codeMirror, event) {
 BlockMirrorTextEditor.prototype.isVisible = function () {
   return this.blockMirror.VISIBLE_MODES.text.indexOf(this.blockMirror.mode_) !== -1;
 };
+
+BlockMirrorTextEditor.prototype.setHighlightedLines = function (lines, style) {
+  var _this2 = this;
+
+  var handles = lines.map(function (l) {
+    return {
+      "handle": _this2.codeMirror.doc.addLineClass(l - 1, "background", style),
+      "style": style
+    };
+  });
+  this.highlightedHandles = this.highlightedHandles.concat(handles);
+};
+
+BlockMirrorTextEditor.prototype.clearHighlightedLines = function () {
+  var _this3 = this;
+
+  return this.highlightedHandles.map(function (h) {
+    _this3.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
+
+    return _this3.codeMirror.doc.lineInfo(h.handle).line + 1;
+  });
+};
 /**
  * Worth noting - Blockly uses a setTimeOut of 0 steps to make events
  * wait. That has some confusing interaction with trying to make things percolate.
@@ -933,6 +965,13 @@ BlockMirrorBlockEditor.prototype.getPngFromBlocks = function (callback) {
   }
 };
 
+BlockMirrorBlockEditor.prototype.highlightLines = function (lines, style) {// Make some kind of block map?
+
+  /*this.workspace.getAllBlocks().map((block) => {
+      block
+  });*/
+};
+
 function BlockMirrorTextToBlocks(blockMirror) {
   this.blockMirror = blockMirror;
   this.hiddenImports = ["plt"];
diff --git a/src/block_editor.js b/src/block_editor.js
index 9830f70..f344bfa 100644
--- a/src/block_editor.js
+++ b/src/block_editor.js
@@ -340,4 +340,11 @@ BlockMirrorBlockEditor.prototype.getPngFromBlocks = function(callback) {
         callback("", document.createElement("img"));
         console.error("PNG image creation not supported!", e);
     }
-}
\ No newline at end of file
+};
+
+BlockMirrorBlockEditor.prototype.highlightLines = function(lines, style) {
+    // Make some kind of block map?
+    /*this.workspace.getAllBlocks().map((block) => {
+        block
+    });*/
+};
\ No newline at end of file
diff --git a/src/block_mirror.js b/src/block_mirror.js
index 2e23c25..8bc2100 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -214,4 +214,15 @@ BlockMirror.prototype.VISIBLE_MODES = {
     'text': ['text', 'split']
 };
 
-BlockMirror.prototype.BREAK_WIDTH = 675;
\ No newline at end of file
+BlockMirror.prototype.BREAK_WIDTH = 675;
+
+BlockMirror.prototype.setHighlightedLines = function(lines, style) {
+    this.textEditor.clearHighlightedLines();
+    this.textEditor.setHighlightedLines(lines, style);
+    //this.blockEditor.highlightLines(lines, style);
+};
+
+BlockMirror.prototype.clearHighlightedLines = function() {
+    this.textEditor.clearHighlightedLines();
+    //this.blockEditor.unhighlightLines(lines, style);
+};
\ No newline at end of file
diff --git a/src/text_editor.js b/src/text_editor.js
index 7ebf616..731e69a 100644
--- a/src/text_editor.js
+++ b/src/text_editor.js
@@ -4,6 +4,8 @@ function BlockMirrorTextEditor(blockMirror) {
     this.textArea = blockMirror.tags.textArea;
     this.textSidebar = blockMirror.tags.textSidebar;
 
+    this.highlightedHandles = [];
+
     // notification
     this.silentEvents_ = false;
 
@@ -204,4 +206,19 @@ BlockMirrorTextEditor.prototype.changed = function (codeMirror, event) {
 
 BlockMirrorTextEditor.prototype.isVisible = function () {
     return this.blockMirror.VISIBLE_MODES.text.indexOf(this.blockMirror.mode_) !== -1;
+};
+
+BlockMirrorTextEditor.prototype.setHighlightedLines = function (lines, style) {
+    let handles = lines.map((l) => { return {
+        "handle": this.codeMirror.doc.addLineClass(l-1, "background", style),
+        "style": style
+    }});
+    this.highlightedHandles = this.highlightedHandles.concat(handles);
+};
+
+BlockMirrorTextEditor.prototype.clearHighlightedLines = function () {
+    return this.highlightedHandles.map((h) => {
+        this.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
+        return this.codeMirror.doc.lineInfo(h.handle).line+1;
+    });
 };
\ No newline at end of file