Move editor commands to global command registry

2026-04-28 03:01:47 -04:00 · 2014-10-02 16:35:13 -06:00
parent 2d7aa2efda
commit 1e4f4e0882
2 changed files with 111 additions and 118 deletions
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -176,7 +176,6 @@ TextEditorComponent = React.createClass

    @observeEditor()
    @listenForDOMEvents()
-    @listenForCommands()

    @subscribe atom.themes.onDidAddStylesheet @onStylesheetsChanged
    @subscribe atom.themes.onDidUpdateStylesheet @onStylesheetsChanged
@@ -406,123 +405,6 @@ TextEditorComponent = React.createClass
      editor.insertText(selectedText, select: true, undo: 'skip')
      event.target.value = ''

-  listenForCommands: ->
-    {parentView, editor, mini} = @props
-
-    @addCommandListeners
-      'core:move-left': -> editor.moveLeft()
-      'core:move-right': -> editor.moveRight()
-      'core:select-left': -> editor.selectLeft()
-      'core:select-right': -> editor.selectRight()
-      'core:select-all': -> editor.selectAll()
-      'core:backspace': -> editor.backspace()
-      'core:delete': -> editor.delete()
-      'core:undo': -> editor.undo()
-      'core:redo': -> editor.redo()
-      'core:cut': -> editor.cutSelectedText()
-      'core:copy': -> editor.copySelectedText()
-      'core:paste': -> editor.pasteText()
-      'editor:move-to-previous-word': -> editor.moveToPreviousWord()
-      'editor:select-word': -> editor.selectWordsContainingCursors()
-      'editor:consolidate-selections': @consolidateSelections
-      'editor:delete-to-beginning-of-word': -> editor.deleteToBeginningOfWord()
-      'editor:delete-to-beginning-of-line': -> editor.deleteToBeginningOfLine()
-      'editor:delete-to-end-of-line': -> editor.deleteToEndOfLine()
-      'editor:delete-to-end-of-word': -> editor.deleteToEndOfWord()
-      'editor:delete-line': -> editor.deleteLine()
-      'editor:cut-to-end-of-line': -> editor.cutToEndOfLine()
-      'editor:move-to-beginning-of-next-paragraph': -> editor.moveToBeginningOfNextParagraph()
-      'editor:move-to-beginning-of-previous-paragraph': -> editor.moveToBeginningOfPreviousParagraph()
-      'editor:move-to-beginning-of-screen-line': -> editor.moveToBeginningOfScreenLine()
-      'editor:move-to-beginning-of-line': -> editor.moveToBeginningOfLine()
-      'editor:move-to-end-of-screen-line': -> editor.moveToEndOfScreenLine()
-      'editor:move-to-end-of-line': -> editor.moveToEndOfLine()
-      'editor:move-to-first-character-of-line': -> editor.moveToFirstCharacterOfLine()
-      'editor:move-to-beginning-of-word': -> editor.moveToBeginningOfWord()
-      'editor:move-to-end-of-word': -> editor.moveToEndOfWord()
-      'editor:move-to-beginning-of-next-word': -> editor.moveToBeginningOfNextWord()
-      'editor:move-to-previous-word-boundary': -> editor.moveToPreviousWordBoundary()
-      'editor:move-to-next-word-boundary': -> editor.moveToNextWordBoundary()
-      'editor:select-to-beginning-of-next-paragraph': -> editor.selectToBeginningOfNextParagraph()
-      'editor:select-to-beginning-of-previous-paragraph': -> editor.selectToBeginningOfPreviousParagraph()
-      'editor:select-to-end-of-line': -> editor.selectToEndOfLine()
-      'editor:select-to-beginning-of-line': -> editor.selectToBeginningOfLine()
-      'editor:select-to-end-of-word': -> editor.selectToEndOfWord()
-      'editor:select-to-beginning-of-word': -> editor.selectToBeginningOfWord()
-      'editor:select-to-beginning-of-next-word': -> editor.selectToBeginningOfNextWord()
-      'editor:select-to-next-word-boundary': -> editor.selectToNextWordBoundary()
-      'editor:select-to-previous-word-boundary': -> editor.selectToPreviousWordBoundary()
-      'editor:select-to-first-character-of-line': -> editor.selectToFirstCharacterOfLine()
-      'editor:select-line': -> editor.selectLinesContainingCursors()
-      'editor:transpose': -> editor.transpose()
-      'editor:upper-case': -> editor.upperCase()
-      'editor:lower-case': -> editor.lowerCase()
-
-    unless mini
-      @addCommandListeners
-        'core:move-up': -> editor.moveUp()
-        'core:move-down': -> editor.moveDown()
-        'core:move-to-top': -> editor.moveToTop()
-        'core:move-to-bottom': -> editor.moveToBottom()
-        'core:page-up': -> editor.pageUp()
-        'core:page-down': -> editor.pageDown()
-        'core:select-up': -> editor.selectUp()
-        'core:select-down': -> editor.selectDown()
-        'core:select-to-top': -> editor.selectToTop()
-        'core:select-to-bottom': -> editor.selectToBottom()
-        'core:select-page-up': -> editor.selectPageUp()
-        'core:select-page-down': -> editor.selectPageDown()
-        'editor:indent': -> editor.indent()
-        'editor:auto-indent': -> editor.autoIndentSelectedRows()
-        'editor:indent-selected-rows': -> editor.indentSelectedRows()
-        'editor:outdent-selected-rows': -> editor.outdentSelectedRows()
-        'editor:newline': -> editor.insertNewline()
-        'editor:newline-below': -> editor.insertNewlineBelow()
-        'editor:newline-above': -> editor.insertNewlineAbove()
-        'editor:add-selection-below': -> editor.addSelectionBelow()
-        'editor:add-selection-above': -> editor.addSelectionAbove()
-        'editor:split-selections-into-lines': -> editor.splitSelectionsIntoLines()
-        'editor:toggle-soft-tabs': -> editor.toggleSoftTabs()
-        'editor:toggle-soft-wrap': -> editor.toggleSoftWrapped()
-        'editor:fold-all': -> editor.foldAll()
-        'editor:unfold-all': -> editor.unfoldAll()
-        'editor:fold-current-row': -> editor.foldCurrentRow()
-        'editor:unfold-current-row': -> editor.unfoldCurrentRow()
-        'editor:fold-selection': -> editor.foldSelectedLines()
-        'editor:fold-at-indent-level-1': -> editor.foldAllAtIndentLevel(0)
-        'editor:fold-at-indent-level-2': -> editor.foldAllAtIndentLevel(1)
-        'editor:fold-at-indent-level-3': -> editor.foldAllAtIndentLevel(2)
-        'editor:fold-at-indent-level-4': -> editor.foldAllAtIndentLevel(3)
-        'editor:fold-at-indent-level-5': -> editor.foldAllAtIndentLevel(4)
-        'editor:fold-at-indent-level-6': -> editor.foldAllAtIndentLevel(5)
-        'editor:fold-at-indent-level-7': -> editor.foldAllAtIndentLevel(6)
-        'editor:fold-at-indent-level-8': -> editor.foldAllAtIndentLevel(7)
-        'editor:fold-at-indent-level-9': -> editor.foldAllAtIndentLevel(8)
-        'editor:toggle-line-comments': -> editor.toggleLineCommentsInSelection()
-        'editor:log-cursor-scope': -> editor.logCursorScope()
-        'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(editor)
-        'editor:copy-path': -> editor.copyPathToClipboard()
-        'editor:move-line-up': -> editor.moveLineUp()
-        'editor:move-line-down': -> editor.moveLineDown()
-        'editor:duplicate-lines': -> editor.duplicateLines()
-        'editor:join-lines': -> editor.joinLines()
-        'editor:toggle-indent-guide': -> atom.config.set('editor.showIndentGuide', not atom.config.get('editor.showIndentGuide'))
-        'editor:toggle-line-numbers': ->  atom.config.set('editor.showLineNumbers', not atom.config.get('editor.showLineNumbers'))
-        'editor:scroll-to-cursor': -> editor.scrollToCursorPosition()
-        'benchmark:scroll': @runScrollBenchmark
-
-  addCommandListeners: (listenersByCommandName) ->
-    {parentView} = @props
-
-    addListener = (command, listener) =>
-      @subscribe parentView.__spacePenView.command command, (event) ->
-        event.stopPropagation()
-        listener(event)
-
-    addListener(command, listener) for command, listener of listenersByCommandName
-
-    return
-
  observeConfig: ->
    @subscribe atom.config.observe 'editor.showIndentGuide', @setShowIndentGuide
    @subscribe atom.config.observe 'editor.showLineNumbers', @setShowLineNumbers
--- a/src/text-editor-element.coffee
+++ b/src/text-editor-element.coffee
@@ -79,6 +79,117 @@ class TextEditorElement extends HTMLElement
    grammarScope = @model.getGrammar()?.scopeName?.replace(/\./g, ' ')
    @setAttribute('data-grammar', grammarScope)

+stopCommandEventPropagation = (commandListeners) ->
+  newCommandListeners = {}
+  for commandName, commandListener of commandListeners
+    do (commandListener) ->
+      newCommandListeners[commandName] = (event) ->
+        event.stopPropagation()
+        commandListener.call(this, event)
+  newCommandListeners
+
+atom.commands.add '[is=atom-text-editor]', stopCommandEventPropagation(
+  'core:move-left': -> @getModel().moveLeft()
+  'core:move-right': -> @getModel().moveRight()
+  'core:select-left': -> @getModel().selectLeft()
+  'core:select-right': -> @getModel().selectRight()
+  'core:select-all': -> @getModel().selectAll()
+  'core:backspace': -> @getModel().backspace()
+  'core:delete': -> @getModel().delete()
+  'core:undo': -> @getModel().undo()
+  'core:redo': -> @getModel().redo()
+  'core:cut': -> @getModel().cutSelectedText()
+  'core:copy': -> @getModel().copySelectedText()
+  'core:paste': -> @getModel().pasteText()
+  'editor:move-to-previous-word': -> @getModel().moveToPreviousWord()
+  'editor:select-word': -> @getModel().selectWordsContainingCursors()
+  'editor:consolidate-selections': (event) -> event.abortKeyBinding() unless @getModel().consolidateSelections()
+  'editor:delete-to-beginning-of-word': -> @getModel().deleteToBeginningOfWord()
+  'editor:delete-to-beginning-of-line': -> @getModel().deleteToBeginningOfLine()
+  'editor:delete-to-end-of-line': -> @getModel().deleteToEndOfLine()
+  'editor:delete-to-end-of-word': -> @getModel().deleteToEndOfWord()
+  'editor:delete-line': -> @getModel().deleteLine()
+  'editor:cut-to-end-of-line': -> @getModel().cutToEndOfLine()
+  'editor:move-to-beginning-of-next-paragraph': -> @getModel().moveToBeginningOfNextParagraph()
+  'editor:move-to-beginning-of-previous-paragraph': -> @getModel().moveToBeginningOfPreviousParagraph()
+  'editor:move-to-beginning-of-screen-line': -> @getModel().moveToBeginningOfScreenLine()
+  'editor:move-to-beginning-of-line': -> @getModel().moveToBeginningOfLine()
+  'editor:move-to-end-of-screen-line': -> @getModel().moveToEndOfScreenLine()
+  'editor:move-to-end-of-line': -> @getModel().moveToEndOfLine()
+  'editor:move-to-first-character-of-line': -> @getModel().moveToFirstCharacterOfLine()
+  'editor:move-to-beginning-of-word': -> @getModel().moveToBeginningOfWord()
+  'editor:move-to-end-of-word': -> @getModel().moveToEndOfWord()
+  'editor:move-to-beginning-of-next-word': -> @getModel().moveToBeginningOfNextWord()
+  'editor:move-to-previous-word-boundary': -> @getModel().moveToPreviousWordBoundary()
+  'editor:move-to-next-word-boundary': -> @getModel().moveToNextWordBoundary()
+  'editor:select-to-beginning-of-next-paragraph': -> @getModel().selectToBeginningOfNextParagraph()
+  'editor:select-to-beginning-of-previous-paragraph': -> @getModel().selectToBeginningOfPreviousParagraph()
+  'editor:select-to-end-of-line': -> @getModel().selectToEndOfLine()
+  'editor:select-to-beginning-of-line': -> @getModel().selectToBeginningOfLine()
+  'editor:select-to-end-of-word': -> @getModel().selectToEndOfWord()
+  'editor:select-to-beginning-of-word': -> @getModel().selectToBeginningOfWord()
+  'editor:select-to-beginning-of-next-word': -> @getModel().selectToBeginningOfNextWord()
+  'editor:select-to-next-word-boundary': -> @getModel().selectToNextWordBoundary()
+  'editor:select-to-previous-word-boundary': -> @getModel().selectToPreviousWordBoundary()
+  'editor:select-to-first-character-of-line': -> @getModel().selectToFirstCharacterOfLine()
+  'editor:select-line': -> @getModel().selectLinesContainingCursors()
+  'editor:transpose': -> @getModel().transpose()
+  'editor:upper-case': -> @getModel().upperCase()
+  'editor:lower-case': -> @getModel().lowerCase()
+)
+
+atom.commands.add '[is=atom-text-editor]:not(.mini)', stopCommandEventPropagation(
+  'core:move-up': -> @getModel().moveUp()
+  'core:move-down': -> @getModel().moveDown()
+  'core:move-to-top': -> @getModel().moveToTop()
+  'core:move-to-bottom': -> @getModel().moveToBottom()
+  'core:page-up': -> @getModel().pageUp()
+  'core:page-down': -> @getModel().pageDown()
+  'core:select-up': -> @getModel().selectUp()
+  'core:select-down': -> @getModel().selectDown()
+  'core:select-to-top': -> @getModel().selectToTop()
+  'core:select-to-bottom': -> @getModel().selectToBottom()
+  'core:select-page-up': -> @getModel().selectPageUp()
+  'core:select-page-down': -> @getModel().selectPageDown()
+  'editor:indent': -> @getModel().indent()
+  'editor:auto-indent': -> @getModel().autoIndentSelectedRows()
+  'editor:indent-selected-rows': -> @getModel().indentSelectedRows()
+  'editor:outdent-selected-rows': -> @getModel().outdentSelectedRows()
+  'editor:newline': -> @getModel().insertNewline()
+  'editor:newline-below': -> @getModel().insertNewlineBelow()
+  'editor:newline-above': -> @getModel().insertNewlineAbove()
+  'editor:add-selection-below': -> @getModel().addSelectionBelow()
+  'editor:add-selection-above': -> @getModel().addSelectionAbove()
+  'editor:split-selections-into-lines': -> @getModel().splitSelectionsIntoLines()
+  'editor:toggle-soft-tabs': -> @getModel().toggleSoftTabs()
+  'editor:toggle-soft-wrap': -> @getModel().toggleSoftWrapped()
+  'editor:fold-all': -> @getModel().foldAll()
+  'editor:unfold-all': -> @getModel().unfoldAll()
+  'editor:fold-current-row': -> @getModel().foldCurrentRow()
+  'editor:unfold-current-row': -> @getModel().unfoldCurrentRow()
+  'editor:fold-selection': -> @getModel().foldSelectedLines()
+  'editor:fold-at-indent-level-1': -> @getModel().foldAllAtIndentLevel(0)
+  'editor:fold-at-indent-level-2': -> @getModel().foldAllAtIndentLevel(1)
+  'editor:fold-at-indent-level-3': -> @getModel().foldAllAtIndentLevel(2)
+  'editor:fold-at-indent-level-4': -> @getModel().foldAllAtIndentLevel(3)
+  'editor:fold-at-indent-level-5': -> @getModel().foldAllAtIndentLevel(4)
+  'editor:fold-at-indent-level-6': -> @getModel().foldAllAtIndentLevel(5)
+  'editor:fold-at-indent-level-7': -> @getModel().foldAllAtIndentLevel(6)
+  'editor:fold-at-indent-level-8': -> @getModel().foldAllAtIndentLevel(7)
+  'editor:fold-at-indent-level-9': -> @getModel().foldAllAtIndentLevel(8)
+  'editor:toggle-line-comments': -> @getModel().toggleLineCommentsInSelection()
+  'editor:log-cursor-scope': -> @getModel().logCursorScope()
+  'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(editor)
+  'editor:copy-path': -> @getModel().copyPathToClipboard()
+  'editor:move-line-up': -> @getModel().moveLineUp()
+  'editor:move-line-down': -> @getModel().moveLineDown()
+  'editor:duplicate-lines': -> @getModel().duplicateLines()
+  'editor:join-lines': -> @getModel().joinLines()
+  'editor:toggle-indent-guide': -> atom.config.set('editor.showIndentGuide', not atom.config.get('editor.showIndentGuide'))
+  'editor:toggle-line-numbers': -> atom.config.set('editor.showLineNumbers', not atom.config.get('editor.showLineNumbers'))
+  'editor:scroll-to-cursor': -> @getModel().scrollToCursorPosition()
+)
+
 module.exports = TextEditorElement = document.registerElement 'atom-text-editor',
  prototype: TextEditorElement.prototype
  extends: 'div'