updating mid merge

src/app.js

@@ -509,9 +509,8 @@ function run () {
         if (config.get('currentFile') !== this.source) {
           fileManager.switchFile(this.source)
         }
-        this.statementMarker = editor.addMarker(lineColumnPos, this.source, 'highlightcode')
-        editor.scrollToLine(lineColumnPos.start.line, true, true, function () {})
-
+        this.statementMarker = editor.addMarker(lineColumnPos, 'highlightcode')
+        editor.gotoLine(lineColumnPos.start.line, lineColumnPos.start.column)
         if (lineColumnPos.start.line === lineColumnPos.end.line) {
           this.fullLineMarker = editor.addMarker({
             start: {

src/app/editor/editor.js

@@ -68,6 +68,12 @@ function Editor (opts = {}) {
     editor.session.setBreakpoint(row, css)
   }
 
+  this.setPosition = function (line, column, noClip) {
+    editor.moveCursorTo(line, column)
+    //var anchor = new ace.Anchor(editor, line, column)
+    //anchor.setPosition(line, column, noClip)
+  }
+
   this.editorFontSize = function (incr) {
     editor.setFontSize(editor.getFontSize() + incr)
   }

src/app/files/browser-files.js

@@ -176,4 +176,5 @@ function Files (storage) {
   }
 }
 
+
 module.exports = Files