Merge pull request #3132 from atom/bo-remove-oe

Remove old editor

exports/atom.coffee

@@ -15,10 +15,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.$ = $
   module.exports.$$ = $$
   module.exports.$$$ = $$$
-  if atom.config.get('core.useReactMiniEditors')
-    module.exports.EditorView = require '../src/react-editor-view'
-  else
-    module.exports.EditorView = require '../src/editor-view'
+  module.exports.EditorView = require '../src/editor-view'
   module.exports.ScrollView = require '../src/scroll-view'
   module.exports.SelectListView = require '../src/select-list-view'
   module.exports.Task = require '../src/task'

package.json

@@ -75,16 +75,16 @@
     "autoflow": "0.18.0",
     "autosave": "0.15.0",
     "background-tips": "0.15.0",
-    "bookmarks": "0.27.0",
+    "bookmarks": "0.28.0",
     "bracket-matcher": "0.54.0",
     "command-palette": "0.24.0",
     "deprecation-cop": "0.9.0",
     "dev-live-reload": "0.34.0",
     "exception-reporting": "0.20.0",
     "feedback": "0.33.0",
-    "find-and-replace": "0.129.0",
+    "find-and-replace": "0.130.0",
     "fuzzy-finder": "0.57.0",
-    "git-diff": "0.38.0",
+    "git-diff": "0.39.0",
     "go-to-line": "0.24.0",
     "grammar-selector": "0.29.0",
     "image-view": "0.36.0",

spec/editor-component-spec.coffee

@@ -1,7 +1,7 @@
 _ = require 'underscore-plus'
 {extend, flatten, toArray, last} = _
 
-ReactEditorView = require '../src/react-editor-view'
+EditorView = require '../src/editor-view'
 EditorComponent = require '../src/editor-component'
 nbsp = String.fromCharCode(160)
 
@@ -34,7 +34,7 @@ describe "EditorComponent", ->
       contentNode = document.querySelector('#jasmine-content')
       contentNode.style.width = '1000px'
 
-      wrapperView = new ReactEditorView(editor, {lineOverdrawMargin})
+      wrapperView = new EditorView(editor, {lineOverdrawMargin})
       wrapperView.attachToDom()
       wrapperNode = wrapperView.element
 
@@ -1911,7 +1911,7 @@ describe "EditorComponent", ->
         hiddenParent.style.display = 'none'
         contentNode.appendChild(hiddenParent)
 
-        wrapperView = new ReactEditorView(editor, {lineOverdrawMargin})
+        wrapperView = new EditorView(editor, {lineOverdrawMargin})
         wrapperNode = wrapperView.element
         wrapperView.appendTo(hiddenParent)
 

spec/spec-helper.coffee

@@ -95,8 +95,6 @@ beforeEach ->
   config.set "editor.autoIndent", false
   config.set "core.disabledPackages", ["package-that-throws-an-exception",
     "package-with-broken-package-json", "package-with-broken-keymap"]
-  config.set "core.useReactEditor", true
-  config.set "core.useReactMiniEditors", true
   config.save.reset()
   atom.config = config
 

src/editor.coffee

@@ -235,10 +235,7 @@ class Editor extends Model
     @subscribe @displayBuffer, "character-widths-changed", (changeCount) => @emit 'character-widths-changed', changeCount
 
   getViewClass: ->
-    if atom.config.get('core.useReactEditor')
-      require './react-editor-view'
-    else
-      require './editor-view'
+    require './editor-view'
 
   destroyed: ->
     @unsubscribe()
@@ -646,7 +643,8 @@ class Editor extends Model
   # text - A {String} representing the text to insert.
   # options - See {Selection::insertText}.
   #
-  # Returns a {Boolean} indicating whether or not the text was inserted.
+  # Returns a {Range} when the text has been inserted
+  # Returns a {Bool} false when the text has not been inserted
   insertText: (text, options={}) ->
     willInsert = true
     cancel = -> willInsert = false

src/react-editor-view.coffee

@@ -1,253 +0,0 @@
-{View, $} = require 'space-pen'
-React = require 'react-atom-fork'
-{defaults} = require 'underscore-plus'
-TextBuffer = require 'text-buffer'
-Editor = require './editor'
-EditorComponent = require './editor-component'
-
-module.exports =
-class ReactEditorView extends View
-  @content: (params) ->
-    attributes = params.attributes ? {}
-    attributes.class = 'editor react editor-colors'
-    attributes.tabIndex = -1
-    @div attributes
-
-  focusOnAttach: false
-
-  constructor: (editorOrParams, props) ->
-    super
-
-    if editorOrParams instanceof Editor
-      @editor = editorOrParams
-    else
-      {@editor, mini, placeholderText} = editorOrParams
-      props ?= {}
-      props.mini = mini
-      props.placeholderText = placeholderText
-      @editor ?= new Editor
-        buffer: new TextBuffer
-        softWrap: false
-        tabLength: 2
-        softTabs: true
-        mini: mini
-
-    props = defaults({@editor, parentView: this}, props)
-    @component = React.renderComponent(EditorComponent(props), @element)
-
-    node = @component.getDOMNode()
-
-    @scrollView = $(node).find('.scroll-view')
-    @underlayer = $(node).find('.highlights').addClass('underlayer')
-    @overlayer = $(node).find('.lines').addClass('overlayer')
-    @hiddenInput = $(node).find('.hidden-input')
-
-    # FIXME: there should be a better way to deal with the gutter element
-    @subscribe atom.config.observe 'editor.showLineNumbers', =>
-      @gutter = $(node).find('.gutter')
-
-      @gutter.removeClassFromAllLines = (klass) =>
-        @gutter.find('.line-number').removeClass(klass)
-
-      @gutter.getLineNumberElement = (bufferRow) =>
-        @gutter.find("[data-buffer-row='#{bufferRow}']")
-
-      @gutter.addClassToLine = (bufferRow, klass) =>
-        lines = @gutter.find("[data-buffer-row='#{bufferRow}']")
-        lines.addClass(klass)
-        lines.length > 0
-
-    @on 'focus', =>
-      if @component?
-        @component.onFocus()
-      else
-        @focusOnAttach = true
-
-  getEditor: -> @editor
-
-  getModel: -> @editor
-
-  Object.defineProperty @::, 'lineHeight', get: -> @editor.getLineHeightInPixels()
-  Object.defineProperty @::, 'charWidth', get: -> @editor.getDefaultCharWidth()
-  Object.defineProperty @::, 'firstRenderedScreenRow', get: -> @component.getRenderedRowRange()[0]
-  Object.defineProperty @::, 'lastRenderedScreenRow', get: -> @component.getRenderedRowRange()[1]
-  Object.defineProperty @::, 'active', get: -> @is(@getPane()?.activeView)
-  Object.defineProperty @::, 'isFocused', get: -> @component?.state.focused
-  Object.defineProperty @::, 'mini', get: -> @component?.props.mini
-
-  afterAttach: (onDom) ->
-    return unless onDom
-    return if @attached
-    @attached = true
-    @component.pollDOM()
-    @focus() if @focusOnAttach
-
-    @addGrammarScopeAttribute()
-    @subscribe @editor, 'grammar-changed', =>
-      @addGrammarScopeAttribute()
-
-    @trigger 'editor:attached', [this]
-
-  addGrammarScopeAttribute: ->
-    grammarScope = @editor.getGrammar()?.scopeName?.replace(/\./g, ' ')
-    @attr('data-grammar', grammarScope)
-
-  scrollTop: (scrollTop) ->
-    if scrollTop?
-      @editor.setScrollTop(scrollTop)
-    else
-      @editor.getScrollTop()
-
-  scrollLeft: (scrollLeft) ->
-    if scrollLeft?
-      @editor.setScrollLeft(scrollLeft)
-    else
-      @editor.getScrollLeft()
-
-  scrollToBottom: ->
-    @editor.setScrollBottom(Infinity)
-
-  scrollToScreenPosition: (screenPosition, options) ->
-    @editor.scrollToScreenPosition(screenPosition, options)
-
-  scrollToBufferPosition: (bufferPosition, options) ->
-    @editor.scrollToBufferPosition(bufferPosition, options)
-
-  scrollToCursorPosition: ->
-    @editor.scrollToCursorPosition()
-
-  scrollToPixelPosition: (pixelPosition) ->
-    screenPosition = screenPositionForPixelPosition(pixelPosition)
-    @editor.scrollToScreenPosition(screenPosition)
-
-  pixelPositionForBufferPosition: (bufferPosition) ->
-    @editor.pixelPositionForBufferPosition(bufferPosition)
-
-  pixelPositionForScreenPosition: (screenPosition) ->
-    @editor.pixelPositionForScreenPosition(screenPosition)
-
-  appendToLinesView: (view) ->
-    view.css('position', 'absolute')
-    view.css('z-index', 1)
-    @find('.lines').prepend(view)
-
-  beforeRemove: ->
-    return unless @attached
-    @attached = false
-    React.unmountComponentAtNode(@element) if @component.isMounted()
-    @trigger 'editor:detached', this
-
-  # Public: Split the editor view left.
-  splitLeft: ->
-    pane = @getPane()
-    pane?.splitLeft(pane?.copyActiveItem()).activeView
-
-  # Public: Split the editor view right.
-  splitRight: ->
-    pane = @getPane()
-    pane?.splitRight(pane?.copyActiveItem()).activeView
-
-  # Public: Split the editor view up.
-  splitUp: ->
-    pane = @getPane()
-    pane?.splitUp(pane?.copyActiveItem()).activeView
-
-  # Public: Split the editor view down.
-  splitDown: ->
-    pane = @getPane()
-    pane?.splitDown(pane?.copyActiveItem()).activeView
-
-  getPane: ->
-    @parent('.item-views').parents('.pane').view()
-
-  hide: ->
-    super
-    @pollComponentDOM()
-
-  show: ->
-    super
-    @pollComponentDOM()
-
-  pollComponentDOM: ->
-    return unless @component?
-    valueToRestore = @component.performSyncUpdates
-    @component.performSyncUpdates = true
-    @component.pollDOM()
-    @component.performSyncUpdates = valueToRestore
-
-  pageDown: ->
-    @editor.pageDown()
-
-  pageUp: ->
-    @editor.pageUp()
-
-  getFirstVisibleScreenRow: ->
-    @editor.getVisibleRowRange()[0]
-
-  getLastVisibleScreenRow: ->
-    @editor.getVisibleRowRange()[1]
-
-  getFontFamily: ->
-    @component?.getFontFamily()
-
-  setFontFamily: (fontFamily) ->
-    @component?.setFontFamily(fontFamily)
-
-  getFontSize: ->
-    @component?.getFontSize()
-
-  setFontSize: (fontSize) ->
-    @component?.setFontSize(fontSize)
-
-  setWidthInChars: (widthInChars) ->
-    @component.getDOMNode().style.width = (@editor.getDefaultCharWidth() * widthInChars) + 'px'
-
-  setLineHeight: (lineHeight) ->
-    @component.setLineHeight(lineHeight)
-
-  setShowIndentGuide: (showIndentGuide) ->
-    @component.setShowIndentGuide(showIndentGuide)
-
-  setSoftWrap: (softWrap) ->
-    @editor.setSoftWrap(softWrap)
-
-  setShowInvisibles: (showInvisibles) ->
-    @component.setShowInvisibles(showInvisibles)
-
-  toggleSoftWrap: ->
-    @editor.toggleSoftWrap()
-
-  toggleSoftTabs: ->
-    @editor.toggleSoftTabs()
-
-  getText: ->
-    @editor.getText()
-
-  setText: (text) ->
-    @editor.setText(text)
-
-  insertText: (text) ->
-    @editor.insertText(text)
-
-  isInputEnabled: ->
-    @component.isInputEnabled()
-
-  setInputEnabled: (inputEnabled) ->
-    @component.setInputEnabled(inputEnabled)
-
-  requestDisplayUpdate: -> # No-op shim for find-and-replace
-
-  updateDisplay: ->        # No-op shim for package specs
-
-  resetDisplay: ->         # No-op shim for package specs
-
-  redraw: ->               # No-op shim
-
-  setPlaceholderText: (placeholderText) ->
-    if @component?
-      @component.setProps({placeholderText})
-    else
-      @props.placeholderText = placeholderText
-
-  lineElementForScreenRow: (screenRow) ->
-    $(@component.lineNodeForScreenRow(screenRow))

src/select-list-view.coffee

@@ -1,8 +1,5 @@
 {$, View} = require './space-pen-extensions'
-if atom.config.get('core.useReactMiniEditors')
-  EditorView = require './react-editor-view'
-else
-  EditorView = require './editor-view'
+EditorView = require './editor-view'
 fuzzyFilter = require('fuzzaldrin').filter
 
 # Public: Provides a view that renders a list of items with an editor that

src/workspace-view.coffee

@@ -9,7 +9,6 @@ scrollbarStyle = require 'scrollbar-style'
 fs = require 'fs-plus'
 Workspace = require './workspace'
 CommandInstaller = require './command-installer'
-EditorView = require './editor-view'
 PaneView = require './pane-view'
 PaneColumnView = require './pane-column-view'
 PaneRowView = require './pane-row-view'
@@ -71,8 +70,6 @@ class WorkspaceView extends View
     projectHome: path.join(fs.getHomeDirectory(), 'github')
     audioBeep: true
     destroyEmptyPanes: true
-    useReactEditor: true
-    useReactMiniEditors: true
 
   @content: ->
     @div class: 'workspace', tabindex: -1, =>

static/editor.less

@@ -2,7 +2,18 @@
 @import "octicon-utf-codes";
 @import "octicon-mixins";
 
-.editor.react {
+.editor, .editor-contents {
+  overflow: hidden;
+  cursor: text;
+  display: -webkit-flex;
+  -webkit-user-select: none;
+  position: relative;
+}
+
+.editor {
+  font-family: Inconsolata, Monaco, Consolas, 'Courier New', Courier;
+  line-height: 1.3;
+
   .editor-contents {
     width: 100%;
   }
@@ -71,9 +82,19 @@
   }
 
   .gutter {
+    overflow: hidden;
+    text-align: right;
+    cursor: default;
+    min-width: 1em;
+    box-sizing: border-box;
+
+    .line-numbers {
+      position: relative;
+    }
     .line-number {
       white-space: nowrap;
       padding-left: .5em;
+      opacity: 0.6;
 
       .icon-right {
         padding: 0 .4em;
@@ -82,6 +103,9 @@
         }
       }
     }
+    .line-number.cursor-line {
+      opacity: 1;
+    }
   }
 }
 
@@ -96,45 +120,6 @@
   }
 }
 
-.editor {
-  z-index: 0;
-  font-family: Inconsolata, Monaco, Consolas, 'Courier New', Courier;
-  line-height: 1.3;
-}
-
-.editor, .editor-contents {
-  overflow: hidden;
-  cursor: text;
-  display: -webkit-flex;
-  -webkit-user-select: none;
-  position: relative;
-}
-
-.editor .gutter .line-number.cursor-line {
-  opacity: 1;
-}
-
-.editor .gutter {
-  overflow: hidden;
-  text-align: right;
-  cursor: default;
-  min-width: 1em;
-  box-sizing: border-box;
-}
-
-.editor .gutter .line-number {
-  padding-left: .5em;
-  opacity: 0.6;
-}
-
-.editor .gutter .line-numbers {
-  position: relative;
-}
-
-.editor .gutter .line-number.folded.cursor-line {
-  opacity: 1;
-}
-
 .editor .gutter .line-number .icon-right {
   .octicon(chevron-down, 0.8em);
   display: inline-block;
@@ -289,22 +274,3 @@
   pointer-events: none;
   z-index: -1;
 }
-
-.editor.mini:not(.react) {
-  height: auto;
-  line-height: 25px;
-
-  .cursor {
-    width: 2px;
-    line-height: 20px;
-    margin-top: 2px;
-  }
-
-  .gutter {
-    display: none;
-  }
-
-  .scroll-view {
-    overflow: hidden;
-  }
-}