From e3d2e24d6742201758cea4e4fd9c8e1514a5b4af Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 6 May 2020 16:10:26 +0000
Subject: [PATCH] Added line class to hightlighter

---
 src/app/editor/sourceHighlighter.js |  2 +-
 test-browser/commands/scrollUp.js   | 25 ++++++++
 test-browser/tests/editor.test.js   | 97 ++++++++++++++++-------------
 3 files changed, 79 insertions(+), 45 deletions(-)
 create mode 100644 test-browser/commands/scrollUp.js

diff --git a/src/app/editor/sourceHighlighter.js b/src/app/editor/sourceHighlighter.js
index daec7811f1..b6582e1fa9 100644
--- a/src/app/editor/sourceHighlighter.js
+++ b/src/app/editor/sourceHighlighter.js
@@ -60,7 +60,7 @@ class SourceHighlighter {
         }
         `
 
-      this.statementMarker = this._deps.editor.addMarker(lineColumnPos, this.source, css.highlightcode.className + ' ' + css.customBackgroundColor.className)
+      this.statementMarker = this._deps.editor.addMarker(lineColumnPos, this.source, css.highlightcode.className + ' ' + css.customBackgroundColor.className + ' ' + `highlightLine${lineColumnPos.start.line}`)
       this._deps.editor.scrollToLine(lineColumnPos.start.line, true, true, function () {})
       this.position = lineColumnPos
       if (lineColumnPos.start.line === lineColumnPos.end.line) {
diff --git a/test-browser/commands/scrollUp.js b/test-browser/commands/scrollUp.js
new file mode 100644
index 0000000000..28d5be2db2
--- /dev/null
+++ b/test-browser/commands/scrollUp.js
@@ -0,0 +1,25 @@
+const EventEmitter = require('events')
+
+class ScrollUp extends EventEmitter {
+  command (target, height) {
+    this.api.perform((done) => {
+      _scrollUp(this.api, target, height, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function _scrollUp (browser, target, height, cb) {
+  browser.execute(function (target, height) {
+    const element = document.querySelector(target)
+
+    element.scrollTop = element.scrollHeight - height
+  }, [target, height], function () {
+    cb()
+  })
+}
+
+module.exports = ScrollUp
diff --git a/test-browser/tests/editor.test.js b/test-browser/tests/editor.test.js
index bd2e04769e..47ddd6e34c 100644
--- a/test-browser/tests/editor.test.js
+++ b/test-browser/tests/editor.test.js
@@ -73,9 +73,16 @@ module.exports = {
   },
 
   'Should highlight source code': function (browser) {
-    browser.addFile('browser/sourcehighlight.js', sourcehighlightScript)
+    browser.addFile('sourcehighlight.js', sourcehighlightScript)
     .switchFile('browser/sourcehighlight.js')
     .executeScript('remix.exeCurrent()')
+    .scrollUp('*[data-id="editorInput"]', 100)
+    .pause(5000)
+    .scrollUp('.ace_scroller', 100)
+    .waitForElementPresent('.highlightLine32')
+    .checkElementStyle('.highlightLine32', 'background-color', 'rgb(8, 108, 181)')
+    .waitForElementPresent('.highlightLine40')
+    .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)')
     .end()
   },
 
@@ -97,46 +104,48 @@ var aceThemes = {
   }
 }
 
-const sourcehighlightScript = `
-(async () => {
-  try {
-      const pos = {
-          start: {
-              line: 32,
-              column: 3
-          },
-          end: {
-              line: 32,
-              column: 20
-          }
-      }
-      await remix.call('editor', 'highlight', pos, 'browser/3_Ballot.sol')
-      
-       const pos2 = {
-          start: {
-              line: 40,
-              column: 3
-          },
-          end: {
-              line: 40,
-              column: 20
-          }
-      }
-      await remix.call('editor', 'highlight', pos2, 'browser/3_Ballot.sol')
-      
-       const pos3 = {
-          start: {
-              line: 50,
-              column: 3
-          },
-          end: {
-              line: 50,
-              column: 20
-          }
-      }
-      await remix.call('editor', 'highlight', pos3, 'browser/3_Ballot.sol')
-  } catch (e) {
-      console.log(e.message)
-  }
-})()
-`
+const sourcehighlightScript = {
+  content: `
+  (async () => {
+    try {
+        const pos = {
+            start: {
+                line: 32,
+                column: 3
+            },
+            end: {
+                line: 32,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos, 'browser/3_Ballot.sol')
+        
+         const pos2 = {
+            start: {
+                line: 40,
+                column: 3
+            },
+            end: {
+                line: 40,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos2, 'browser/3_Ballot.sol')
+        
+         const pos3 = {
+            start: {
+                line: 50,
+                column: 3
+            },
+            end: {
+                line: 50,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos3, 'browser/3_Ballot.sol')
+    } catch (e) {
+        console.log(e.message)
+    }
+  })()
+  `  
+}
\ No newline at end of file