diff --git a/spec/extensions/editor-command-spec.coffee b/spec/extensions/editor-command-spec.coffee index e6d8e4234..27912bd71 100644 --- a/spec/extensions/editor-command-spec.coffee +++ b/spec/extensions/editor-command-spec.coffee @@ -17,7 +17,7 @@ describe "EditorCommand", -> afterEach -> rootView.remove() - describe "@editSelectedText()", -> + describe "@replaceSelectedText()", -> it "returns true when transformed text is non-empty", -> transformed = false edited = false @@ -26,7 +26,7 @@ describe "EditorCommand", -> 'meta-V': 'custom' @execute: (editor, event) -> - edited = @editSelectedText editor, (text) -> + edited = @replaceSelectedText editor, (text) -> transformed = true 'new' @@ -45,7 +45,7 @@ describe "EditorCommand", -> 'meta-V': 'custom' @execute: (editor, event) -> - edited = @editSelectedText editor, (text) -> + edited = @replaceSelectedText editor, (text) -> transformed = true null @@ -64,7 +64,7 @@ describe "EditorCommand", -> 'meta-V': 'custom' @execute: (editor, event) -> - edited = @editSelectedText editor, (text) -> + edited = @replaceSelectedText editor, (text) -> transformed = true undefined @@ -82,7 +82,7 @@ describe "EditorCommand", -> 'meta-V': 'devowel' @execute: (editor, event) -> - @editSelectedText editor, (text) -> + @replaceSelectedText editor, (text) -> text.replace(/[aeiouy]/gi, '') VowelRemover.activate(rootView) @@ -99,7 +99,7 @@ describe "EditorCommand", -> 'meta-V': 'custom' @execute: (editor, event) -> - @editSelectedText editor, (text) -> + @replaceSelectedText editor, (text) -> callbackCount++ text @@ -120,7 +120,7 @@ describe "EditorCommand", -> 'meta-B': 'custom2' @execute: (editor, event) -> - @editSelectedText editor, (text) -> + @replaceSelectedText editor, (text) -> callbackCount++ text diff --git a/src/extensions/editor-command.coffee b/src/extensions/editor-command.coffee index f3310b2ff..22d11adda 100644 --- a/src/extensions/editor-command.coffee +++ b/src/extensions/editor-command.coffee @@ -20,13 +20,13 @@ class EditorCommand for key, event of keymaps editor.on event, => @execute(editor, event) - @editSelectedText: (editor, transform) -> + @replaceSelectedText: (editor, replace) -> selection = editor.getSelection() return false if selection.isEmpty() range = selection.getBufferRange() reverse = selection.isReversed() - text = transform(editor.getTextInRange(range)) + text = replace(editor.getTextInRange(range)) return false if text is null or text is undefined editor.insertText(text) selection.setBufferRange(range, {reverse}) diff --git a/src/extensions/lowercase-command.coffee b/src/extensions/lowercase-command.coffee index 51bc9654a..1dd6d7a33 100644 --- a/src/extensions/lowercase-command.coffee +++ b/src/extensions/lowercase-command.coffee @@ -7,5 +7,5 @@ class LowerCaseCommand extends EditorCommand 'meta-Y': 'lowercase' @execute: (editor, event) -> - @editSelectedText editor, (text) -> + @replaceSelectedText editor, (text) -> text.toLowerCase() diff --git a/src/extensions/uppercase-command.coffee b/src/extensions/uppercase-command.coffee index 2bc7e8e18..a79b1969b 100644 --- a/src/extensions/uppercase-command.coffee +++ b/src/extensions/uppercase-command.coffee @@ -7,5 +7,5 @@ class UpperCaseCommand extends EditorCommand 'meta-X': 'uppercase' @execute: (editor, event) -> - @editSelectedText editor, (text) -> + @replaceSelectedText editor, (text) -> text.toUpperCase()