Replace editor instance variables with editorView

spec/atom-spec.coffee

@@ -95,14 +95,14 @@ describe "the `atom` global", ->
 
             it "triggers the activation event on all handlers registered during activation", ->
               rootView.openSync()
-              editor = rootView.getActiveView()
+              editorView = rootView.getActiveView()
               eventHandler = jasmine.createSpy("activation-event")
-              editor.command 'activation-event', eventHandler
-              editor.trigger 'activation-event'
+              editorView.command 'activation-event', eventHandler
+              editorView.trigger 'activation-event'
               expect(mainModule.activate.callCount).toBe 1
               expect(mainModule.activationEventCallCount).toBe 1
               expect(eventHandler.callCount).toBe 1
-              editor.trigger 'activation-event'
+              editorView.trigger 'activation-event'
               expect(mainModule.activationEventCallCount).toBe 2
               expect(eventHandler.callCount).toBe 2
               expect(mainModule.activate.callCount).toBe 1

spec/pane-spec.coffee

@@ -90,18 +90,18 @@ describe "Pane", ->
       describe "when no view has yet been appended for that item", ->
         it "appends and shows a view to display the item based on its `.getViewClass` method", ->
           pane.showItem(editSession1)
-          editor = pane.activeView
-          expect(editor.css('display')).not.toBe 'none'
-          expect(editor.activeEditSession).toBe editSession1
+          editorView = pane.activeView
+          expect(editorView.css('display')).not.toBe 'none'
+          expect(editorView.activeEditSession).toBe editSession1
 
       describe "when a valid view has already been appended for another item", ->
         it "multiple views are created for multiple items", ->
           pane.showItem(editSession1)
           pane.showItem(editSession2)
           expect(pane.itemViews.find('.editor').length).toBe 2
-          editor = pane.activeView
-          expect(editor.css('display')).not.toBe 'none'
-          expect(editor.activeEditSession).toBe editSession2
+          editorView = pane.activeView
+          expect(editorView.css('display')).not.toBe 'none'
+          expect(editorView.activeEditSession).toBe editSession2
 
         it "creates a new view with the item", ->
           initialViewCount = pane.itemViews.find('.test-view').length

spec/root-view-spec.coffee

@@ -100,9 +100,9 @@ describe "RootView", ->
     describe "when there is an active view", ->
       it "hands off focus to the active view", ->
         editor = rootView.getActiveView()
-        editor.isFocused = false
+        editorView.isFocused = false
         rootView.focus()
-        expect(editor.isFocused).toBeTruthy()
+        expect(editorView.isFocused).toBeTruthy()
 
     describe "when there is no active view", ->
       beforeEach ->

spec/spec-helper.coffee

@@ -174,8 +174,8 @@ window.keydownEvent = (key, properties={}) ->
 
 window.mouseEvent = (type, properties) ->
   if properties.point
-    {point, editor} = properties
-    {top, left} = @pagePixelPositionForPoint(editor, point)
+    {point, editorView} = properties
+    {top, left} = @pagePixelPositionForPoint(editorView, point)
     properties.pageX = left + 1
     properties.pageY = top + 1
   properties.originalEvent ?= {detail: 1}
@@ -236,22 +236,22 @@ window.advanceClock = (delta=1) ->
 
   callback() for callback in callbacks
 
-window.pagePixelPositionForPoint = (editor, point) ->
+window.pagePixelPositionForPoint = (editorView, point) ->
   point = Point.fromObject point
-  top = editor.renderedLines.offset().top + point.row * editor.lineHeight
-  left = editor.renderedLines.offset().left + point.column * editor.charWidth - editor.renderedLines.scrollLeft()
+  top = editorView.renderedLines.offset().top + point.row * editorView.lineHeight
+  left = editorView.renderedLines.offset().left + point.column * editorView.charWidth - editorView.renderedLines.scrollLeft()
   { top, left }
 
 window.tokensText = (tokens) ->
   _.pluck(tokens, 'value').join('')
 
-window.setEditorWidthInChars = (editor, widthInChars, charWidth=editor.charWidth) ->
-  editor.width(charWidth * widthInChars + editor.gutter.outerWidth())
-  $(window).trigger 'resize' # update width of editor's on-screen lines
+window.setEditorWidthInChars = (editorView, widthInChars, charWidth=editorView.charWidth) ->
+  editorView.width(charWidth * widthInChars + editorView.gutter.outerWidth())
+  $(window).trigger 'resize' # update width of editor view's on-screen lines
 
-window.setEditorHeightInLines = (editor, heightInChars, charHeight=editor.lineHeight) ->
-  editor.height(charHeight * heightInChars + editor.renderedLines.position().top)
-  $(window).trigger 'resize' # update editor's on-screen lines
+window.setEditorHeightInLines = (editorView, heightInChars, charHeight=editorView.lineHeight) ->
+  editorView.height(charHeight * heightInChars + editorView.renderedLines.position().top)
+  $(window).trigger 'resize' # update editor view's on-screen lines
 
 $.fn.resultOfTrigger = (type) ->
   event = $.Event(type)

src/cursor-view.coffee

@@ -9,14 +9,14 @@ class CursorView extends View
     @div class: 'cursor idle', => @raw ' '
 
   blinkPeriod: 800
-  editor: null
+  editorView: null
   visible: true
 
   needsUpdate: true
   needsRemoval: false
   shouldPauseBlinking: false
 
-  initialize: (@cursor, @editor) ->
+  initialize: (@cursor, @editorView) ->
     @cursor.on 'moved.cursor-view', =>
       @needsUpdate = true
       @shouldPauseBlinking = true
@@ -25,7 +25,7 @@ class CursorView extends View
       @needsUpdate = true
 
     @cursor.on 'autoscrolled.cursor-view', =>
-      @editor.requestDisplayUpdate()
+      @editorView.requestDisplayUpdate()
 
     @cursor.on 'destroyed.cursor-view', =>
       @needsRemoval = true
@@ -34,7 +34,7 @@ class CursorView extends View
       @addClass("site-#{@cursor.marker.getOriginSiteId()}")
 
   beforeRemove: ->
-    @editor.removeCursorView(this)
+    @editorView.removeCursorView(this)
     @cursor.off('.cursor-view')
     @stopBlinking()
 
@@ -52,7 +52,7 @@ class CursorView extends View
     else if !@startBlinkingTimeout
       @startBlinking()
 
-    @setVisible(@cursor.isVisible() and not @editor.isFoldedAtScreenRow(screenPosition.row))
+    @setVisible(@cursor.isVisible() and not @editorView.isFoldedAtScreenRow(screenPosition.row))
 
   # Override for speed. The base function checks the computedStyle
   isHidden: ->
@@ -69,7 +69,7 @@ class CursorView extends View
     @cursor.clearAutoscroll()
 
   getPixelPosition: ->
-    @editor.pixelPositionForScreenPosition(@getScreenPosition())
+    @editorView.pixelPositionForScreenPosition(@getScreenPosition())
 
   setVisible: (visible) ->
     unless @visible == visible

src/gutter.coffee

@@ -25,37 +25,37 @@ class Gutter extends View
     @attached = true
 
     highlightLines = => @highlightLines()
-    @getEditor().on 'cursor:moved', highlightLines
-    @getEditor().on 'selection:changed', highlightLines
+    @getEditorView().on 'cursor:moved', highlightLines
+    @getEditorView().on 'selection:changed', highlightLines
     @on 'mousedown', (e) => @handleMouseEvents(e)
 
   beforeRemove: ->
-    $(document).off(".gutter-#{@getEditor().id}")
+    $(document).off(".gutter-#{@getEditorView().id}")
 
   handleMouseEvents: (e) ->
-    editor = @getEditor()
-    startRow = editor.screenPositionFromMouseEvent(e).row
+    editorView = @getEditorView()
+    startRow = editorView.screenPositionFromMouseEvent(e).row
     if e.shiftKey
-      editor.selectToScreenPosition([startRow + 1, 0])
+      editorView.selectToScreenPosition([startRow + 1, 0])
       return
     else
-      editor.getSelection().setScreenRange([[startRow, 0], [startRow, 0]])
+      editorView.getSelection().setScreenRange([[startRow, 0], [startRow, 0]])
 
     moveHandler = (e) =>
       start = startRow
-      end = editor.screenPositionFromMouseEvent(e).row
+      end = editorView.screenPositionFromMouseEvent(e).row
       if end > start then end++ else start++
-      editor.getSelection().setScreenRange([[start, 0], [end, 0]])
+      editorView.getSelection().setScreenRange([[start, 0], [end, 0]])
 
-    $(document).on "mousemove.gutter-#{@getEditor().id}", moveHandler
-    $(document).one "mouseup.gutter-#{@getEditor().id}", => $(document).off 'mousemove', moveHandler
+    $(document).on "mousemove.gutter-#{@getEditorView().id}", moveHandler
+    $(document).one "mouseup.gutter-#{@getEditorView().id}", => $(document).off 'mousemove', moveHandler
 
   ### Public ###
 
   # Retrieves the containing {TextEditorView}.
   #
   # Returns an {TextEditorView}.
-  getEditor: ->
+  getEditorView: ->
     @parentView
 
   # Defines whether to show the gutter or not.
@@ -192,9 +192,9 @@ class Gutter extends View
     @elementBuilder.children
 
   buildLineElementsHtml: (startScreenRow, endScreenRow) =>
-    editor = @getEditor()
-    maxDigits = editor.getLineCount().toString().length
-    rows = editor.bufferRowsForScreenRows(startScreenRow, endScreenRow)
+    editorView = @getEditorView()
+    maxDigits = editorView.getLineCount().toString().length
+    rows = editorView.bufferRowsForScreenRows(startScreenRow, endScreenRow)
 
     html = ''
     for row in rows
@@ -204,7 +204,7 @@ class Gutter extends View
         rowValue = (row + 1).toString()
 
       classes = "line-number line-number-#{row}"
-      classes += ' fold' if editor.isFoldedAtBufferRow(row)
+      classes += ' fold' if editorView.isFoldedAtBufferRow(row)
 
       rowValuePadding = _.multiplyString(' ', maxDigits - rowValue.length)
 
@@ -230,8 +230,8 @@ class Gutter extends View
       @highlightedLineNumbers.push(highlightedLineNumber)
 
   highlightLines: ->
-    if @getEditor().getSelection().isEmpty()
-      row = @getEditor().getCursorScreenPosition().row
+    if @getEditorView().getSelection().isEmpty()
+      row = @getEditorView().getCursorScreenPosition().row
       rowRange = new Range([row, 0], [row, 0])
       return if @selectionEmpty and @highlightedRows?.isEqual(rowRange)
 
@@ -240,7 +240,7 @@ class Gutter extends View
       @highlightedRows = rowRange
       @selectionEmpty = true
     else
-      selectedRows = @getEditor().getSelection().getScreenRange()
+      selectedRows = @getEditorView().getSelection().getScreenRange()
       endRow = selectedRows.end.row
       endRow-- if selectedRows.end.column is 0
       selectedRows = new Range([selectedRows.start.row, 0], [endRow, 0])

src/root-view.coffee

@@ -267,7 +267,7 @@ class RootView extends View
   #
   # Returns an {Array} of {String}s.
   getOpenBufferPaths: ->
-    _.uniq(_.flatten(@getEditors().map (editor) -> editor.getOpenBufferPaths()))
+    _.uniq(_.flatten(@getEditors().map (editorView) -> editorView.getOpenBufferPaths()))
 
   # Public: Returns the currently focused {Pane}.
   getActivePane: ->
@@ -325,6 +325,6 @@ class RootView extends View
 
   # Private: Destroys everything.
   remove: ->
-    editor.remove() for editor in @getEditors()
+    editorView.remove() for editorView in @getEditors()
     project?.destroy()
     super

src/selection-view.coffee

@@ -11,12 +11,12 @@ class SelectionView extends View
   regions: null
   needsRemoval: false
 
-  initialize: ({@editor, @selection} = {}) ->
+  initialize: ({@editorView, @selection} = {}) ->
     @regions = []
-    @selection.on 'screen-range-changed', => @editor.requestDisplayUpdate()
+    @selection.on 'screen-range-changed', => @editorView.requestDisplayUpdate()
     @selection.on 'destroyed', =>
       @needsRemoval = true
-      @editor.requestDisplayUpdate()
+      @editorView.requestDisplayUpdate()
 
     if @selection.marker.isRemote()
       @addClass("site-#{@selection.marker.getOriginSiteId()}")
@@ -26,7 +26,7 @@ class SelectionView extends View
     range = @getScreenRange()
 
     @trigger 'selection:changed'
-    @editor.highlightFoldsContainingBufferRange(@getBufferRange())
+    @editorView.highlightFoldsContainingBufferRange(@getBufferRange())
     return if range.isEmpty()
 
     rowSpan = range.end.row - range.start.row
@@ -40,11 +40,11 @@ class SelectionView extends View
       @appendRegion(1, { row: range.end.row, column: 0 }, range.end)
 
   appendRegion: (rows, start, end) ->
-    { lineHeight, charWidth } = @editor
-    css = @editor.pixelPositionForScreenPosition(start)
+    { lineHeight, charWidth } = @editorView
+    css = @editorView.pixelPositionForScreenPosition(start)
     css.height = lineHeight * rows
     if end
-      css.width = @editor.pixelPositionForScreenPosition(end).left - css.left
+      css.width = @editorView.pixelPositionForScreenPosition(end).left - css.left
     else
       css.right = 0
 
@@ -57,7 +57,7 @@ class SelectionView extends View
     startRow = start.row
     endRow = end.row
     endRow-- if end.column == 0
-    @editor.pixelPositionForScreenPosition([((startRow + endRow + 1) / 2), start.column])
+    @editorView.pixelPositionForScreenPosition([((startRow + endRow + 1) / 2), start.column])
 
   clearRegions: ->
     region.remove() for region in @regions
@@ -85,5 +85,5 @@ class SelectionView extends View
     @removeClass('highlighted')
 
   remove: ->
-    @editor.removeSelectionView(this)
+    @editorView.removeSelectionView(this)
     super