From dfa44b5fa2ab287260076d021e3b4974097b1d13 Mon Sep 17 00:00:00 2001 From: Brian Vanderbusch Date: Fri, 17 Jun 2016 18:27:37 -0500 Subject: [PATCH 01/76] Prepare 0.10.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f7e102..05fa7bc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.9.0", + "version": "0.10.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 959ad085914a01effb8e245cff3b6c192f972553 Mon Sep 17 00:00:00 2001 From: Asa Ayers Date: Tue, 2 Aug 2016 15:17:41 -0700 Subject: [PATCH 02/76] Stop using non-standard Promise.defer() Fixes #147 --- lib/ex.coffee | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index c91beb7..21e4add 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -4,8 +4,17 @@ fs = require 'fs-plus' VimOption = require './vim-option' _ = require 'underscore-plus' +defer = () -> + deferred = {} + deferred.promise = new Promise((resolve, reject) -> + deferred.resolve = resolve + deferred.reject = reject + ) + return deferred + + trySave = (func) -> - deferred = Promise.defer() + deferred = defer() try func() @@ -194,7 +203,7 @@ class Ex if filePath.indexOf(' ') isnt -1 throw new CommandError('Only one file name allowed') - deferred = Promise.defer() + deferred = defer() editor = atom.workspace.getActiveTextEditor() saved = false From ccf4c99b2b7f441eacfdb130216670b0726054ba Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 3 Aug 2016 12:21:51 +0200 Subject: [PATCH 03/76] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 334f338..2ff456c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.0 + +* Stop using non-standard Promise.defer (fixes issue with `:w`) (@AsaAyers) + ## 0.9.0 * Added support for yank commands, ex `:1,10y` (@posgarou) From 74451db75f5f050ac468d7f04e670f64d74f25d1 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 3 Aug 2016 12:24:04 +0200 Subject: [PATCH 04/76] Wrong version in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ff456c..c8430d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.10.0 +## 0.11.0 * Stop using non-standard Promise.defer (fixes issue with `:w`) (@AsaAyers) From a59a6f9364399af4b813b45ad7a9d30553dab0b0 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 3 Aug 2016 12:24:34 +0200 Subject: [PATCH 05/76] Prepare 0.11.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05fa7bc..9efaf15 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.10.0", + "version": "0.11.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 7e1e03284ae0195864f0cff3a342d886dcfd83ef Mon Sep 17 00:00:00 2001 From: Stuart Quin Date: Wed, 3 Aug 2016 18:41:13 +0100 Subject: [PATCH 06/76] Issue #29 Command and file autocomplete --- lib/autocomplete.coffee | 66 ++++++++++++++++++++++++++++ lib/ex-view-model.coffee | 18 ++++++++ lib/ex.coffee | 3 ++ spec/autocomplete-spec.coffee | 82 +++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+) create mode 100644 lib/autocomplete.coffee create mode 100644 spec/autocomplete-spec.coffee diff --git a/lib/autocomplete.coffee b/lib/autocomplete.coffee new file mode 100644 index 0000000..d33ffc3 --- /dev/null +++ b/lib/autocomplete.coffee @@ -0,0 +1,66 @@ +fs = require 'fs' +path = require 'path' +Ex = require './ex' + +module.exports = +class AutoComplete + constructor: (commands) -> + @commands = commands + @resetCompletion() + + resetCompletion: () -> + @autoCompleteIndex = 0 + @autoCompleteText = null + @completions = [] + + getAutocomplete: (text) -> + if !@autoCompleteText + @autoCompleteText = text + + parts = @autoCompleteText.split(' ') + cmd = parts[0] + + if parts.length > 1 + filePath = parts.slice(1).join(' ') + return @getCompletion(() => @getFilePathCompletion(cmd, filePath)) + else + return @getCompletion(() => @getCommandCompletion(cmd)) + + filterByPrefix: (commands, prefix) -> + commands.filter((f) => f.startsWith(prefix)) + + getCompletion: (completeFunc) -> + if @completions.length == 0 + @completions = completeFunc() + + if @completions.length + complete = @completions[@autoCompleteIndex % @completions.length] + @autoCompleteIndex++ + + # Only one result so lets return this directory + if complete.endsWith('/') && @completions.length == 1 + @resetCompletion() + + return complete + + getCommandCompletion: (command) -> + if @completions.length == 0 + return @filterByPrefix(@commands, command) + + getFilePathCompletion: (command, filePath) -> + if filePath.endsWith(path.sep) + basePath = path.dirname(filePath + '.') + baseName = '' + else + basePath = path.dirname(filePath) + baseName = path.basename(filePath) + + files = fs.readdirSync(basePath) + + return @filterByPrefix(files, baseName).map((f) => + filePath = path.join(basePath, f) + if fs.lstatSync(filePath).isDirectory() + return command + ' ' + filePath + path.sep + else + return command + ' ' + filePath + ) diff --git a/lib/ex-view-model.coffee b/lib/ex-view-model.coffee index 0c99be9..c8f1202 100644 --- a/lib/ex-view-model.coffee +++ b/lib/ex-view-model.coffee @@ -1,4 +1,6 @@ {ViewModel, Input} = require './view-model' +AutoComplete = require './autocomplete' +Ex = require './ex' module.exports = class ExViewModel extends ViewModel @@ -6,15 +8,31 @@ class ExViewModel extends ViewModel super(@exCommand, class: 'command') @historyIndex = -1 + @view.editorElement.addEventListener('keydown', @tabAutocomplete) atom.commands.add(@view.editorElement, 'core:move-up', @increaseHistoryEx) atom.commands.add(@view.editorElement, 'core:move-down', @decreaseHistoryEx) + @autoComplete = new AutoComplete(Ex.getCommands()) + restoreHistory: (index) -> @view.editorElement.getModel().setText(@history(index).value) history: (index) -> @exState.getExHistoryItem(index) + tabAutocomplete: (event) => + if event.keyCode == 9 + event.stopPropagation() + event.preventDefault() + + completed = @autoComplete.getAutocomplete(@view.editorElement.getModel().getText()) + if completed + @view.editorElement.getModel().setText(completed) + + return false + else + @autoComplete.resetCompletion() + increaseHistoryEx: => if @history(@historyIndex + 1)? @historyIndex += 1 diff --git a/lib/ex.coffee b/lib/ex.coffee index c91beb7..0e46110 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -109,6 +109,9 @@ class Ex @registerAlias: (alias, name) => @singleton()[alias] = (args) => @singleton()[name](args) + @getCommands: () => + Object.keys(@singleton()) + quit: -> atom.workspace.getActivePane().destroyActiveItem() diff --git a/spec/autocomplete-spec.coffee b/spec/autocomplete-spec.coffee new file mode 100644 index 0000000..49b5a1e --- /dev/null +++ b/spec/autocomplete-spec.coffee @@ -0,0 +1,82 @@ +fs = require 'fs-plus' +path = require 'path' +os = require 'os' +uuid = require 'node-uuid' + +helpers = require './spec-helper' +AutoComplete = require '../lib/autocomplete' + +describe "autocomplete functionality", -> + beforeEach -> + @autoComplete = new AutoComplete(['taba', 'tabb', 'tabc']) + @testDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}") + @testFile1 = path.join(@testDir, "atom-ex-testfile-a.txt") + @testFile2 = path.join(@testDir, "atom-ex-testfile-b.txt") + + runs => + fs.makeTreeSync(@testDir) + fs.closeSync(fs.openSync(@testFile1, 'w')); + fs.closeSync(fs.openSync(@testFile2, 'w')); + spyOn(@autoComplete, 'resetCompletion').andCallThrough() + spyOn(@autoComplete, 'getFilePathCompletion').andCallThrough() + spyOn(@autoComplete, 'getCommandCompletion').andCallThrough() + + afterEach -> + fs.removeSync(@testDir) + + describe "autocomplete commands", -> + beforeEach -> + @completed = @autoComplete.getAutocomplete('tab') + + it "returns taba", -> + expect(@completed).toEqual('taba') + + it "calls command function", -> + expect(@autoComplete.getCommandCompletion.callCount).toBe(1) + + describe "autocomplete commands, then autoComplete again", -> + beforeEach -> + @completed = @autoComplete.getAutocomplete('tab') + @completed = @autoComplete.getAutocomplete('tab') + + it "returns tabb", -> + expect(@completed).toEqual('tabb') + + it "calls command function", -> + expect(@autoComplete.getCommandCompletion.callCount).toBe(1) + + describe "autocomplete directory", -> + beforeEach -> + filePath = path.join(os.tmpdir(), 'atom-ex-mode-spec-') + @completed = @autoComplete.getAutocomplete('tabe ' + filePath) + + it "returns testDir", -> + expected = 'tabe ' + @testDir + path.sep + expect(@completed).toEqual(expected) + + it "clears autocomplete", -> + expect(@autoComplete.resetCompletion.callCount).toBe(1) + + describe "autocomplete directory, then autocomplete again", -> + beforeEach -> + filePath = path.join(os.tmpdir(), 'atom-ex-mode-spec-') + @completed = @autoComplete.getAutocomplete('tabe ' + filePath) + @completed = @autoComplete.getAutocomplete(@completed) + + it "returns test file 1", -> + expect(@completed).toEqual('tabe ' + @testFile1) + + it "lists files twice", -> + expect(@autoComplete.getFilePathCompletion.callCount).toBe(2) + + describe "autocomplete full directory, then autocomplete again", -> + beforeEach -> + filePath = path.join(@testDir, 'a') + @completed = @autoComplete.getAutocomplete('tabe ' + filePath) + @completed = @autoComplete.getAutocomplete(@completed) + + it "returns test file 2", -> + expect(@completed).toEqual('tabe ' + @testFile2) + + it "lists files once", -> + expect(@autoComplete.getFilePathCompletion.callCount).toBe(1) From 6f03cd8bc76ac942a56bbdb3e488496b593ecad5 Mon Sep 17 00:00:00 2001 From: Stuart Quin Date: Wed, 3 Aug 2016 21:34:49 +0100 Subject: [PATCH 07/76] Add support for ~ expansion --- lib/autocomplete.coffee | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/autocomplete.coffee b/lib/autocomplete.coffee index d33ffc3..7f8608f 100644 --- a/lib/autocomplete.coffee +++ b/lib/autocomplete.coffee @@ -1,5 +1,6 @@ fs = require 'fs' path = require 'path' +os = require 'os' Ex = require './ex' module.exports = @@ -13,6 +14,12 @@ class AutoComplete @autoCompleteText = null @completions = [] + expandTilde: (filePath) -> + if filePath.charAt(0) == '~' + return os.homedir() + filePath.slice(1) + else + return filePath + getAutocomplete: (text) -> if !@autoCompleteText @autoCompleteText = text @@ -48,6 +55,8 @@ class AutoComplete return @filterByPrefix(@commands, command) getFilePathCompletion: (command, filePath) -> + filePath = @expandTilde(filePath) + if filePath.endsWith(path.sep) basePath = path.dirname(filePath + '.') baseName = '' From 2b9b2f26e5aa2c5da7929737271eb305904cbb76 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 10 Aug 2016 01:29:21 +0200 Subject: [PATCH 08/76] Update editor when saving a new file with `:w` or `:saveas` Fixes #156 --- lib/ex.coffee | 2 +- spec/ex-commands-spec.coffee | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 21e4add..0f7fee9 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -222,7 +222,7 @@ class Ex if not saved and fullPath? if not force and fs.existsSync(fullPath) throw new CommandError("File exists (add ! to override)") - if saveas + if saveas or editor.getFileName() == null editor = atom.workspace.getActiveTextEditor() trySave(-> editor.saveAs(fullPath, editor)).then(deferred.resolve) else diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 08237e3..1b1178e 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -79,6 +79,7 @@ describe "the commands", -> submitNormalModeInputText('write') expect(fs.existsSync(filePath)).toBe(true) expect(fs.readFileSync(filePath, 'utf-8')).toEqual('abc\ndef') + expect(editor.isModified()).toBe(false) it "saves when a path is specified in the save dialog", -> spyOn(atom, 'showSaveDialogSync').andReturn(undefined) From 7bec719a6f8ea7b8f93e7178f68d5750beac9fb0 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 10 Aug 2016 02:01:01 +0200 Subject: [PATCH 09/76] Add splitbelow and splitright options to `:set` --- lib/vim-option.coffee | 24 ++++++++++++++++++++++++ spec/ex-commands-spec.coffee | 28 ++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/lib/vim-option.coffee b/lib/vim-option.coffee index 2ee056c..4d5968c 100644 --- a/lib/vim-option.coffee +++ b/lib/vim-option.coffee @@ -20,4 +20,28 @@ class VimOption nonu: => @nonumber() + splitright: => + atom.config.set("ex-mode.splitright", true) + + spr: => + @splitright() + + nosplitright: => + atom.config.set("ex-mode.splitright", false) + + nospr: => + @nosplitright() + + splitbelow: => + atom.config.set("ex-mode.splitbelow", true) + + sb: => + @splitbelow() + + nosplitbelow: => + atom.config.set("ex-mode.splitbelow", false) + + nosb: => + @nosplitbelow() + module.exports = VimOption diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 08237e3..e8c48f1 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -802,6 +802,34 @@ describe "the commands", -> submitNormalModeInputText(':set nonumber') expect(atom.config.get('editor.showLineNumbers')).toBe(false) + it "sets (no)sp(lit)r(ight)", -> + keydown(':') + submitNormalModeInputText(':set spr') + expect(atom.config.get('ex-mode.splitright')).toBe(true) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set nospr') + expect(atom.config.get('ex-mode.splitright')).toBe(false) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set splitright') + expect(atom.config.get('ex-mode.splitright')).toBe(true) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set nosplitright') + expect(atom.config.get('ex-mode.splitright')).toBe(false) + + it "sets (no)s(plit)b(elow)", -> + keydown(':') + submitNormalModeInputText(':set sb') + expect(atom.config.get('ex-mode.splitbelow')).toBe(true) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set nosb') + expect(atom.config.get('ex-mode.splitbelow')).toBe(false) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set splitbelow') + expect(atom.config.get('ex-mode.splitbelow')).toBe(true) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set nosplitbelow') + expect(atom.config.get('ex-mode.splitbelow')).toBe(false) + describe "aliases", -> it "calls the aliased function without arguments", -> ExClass.registerAlias('W', 'w') From 70a1987cf7fc25abc355173eac87bd25f3e8cf41 Mon Sep 17 00:00:00 2001 From: Stuart Quin Date: Wed, 10 Aug 2016 08:28:33 +0100 Subject: [PATCH 10/76] Sort commands before autocomplete --- lib/autocomplete.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/autocomplete.coffee b/lib/autocomplete.coffee index 7f8608f..8dcb910 100644 --- a/lib/autocomplete.coffee +++ b/lib/autocomplete.coffee @@ -34,7 +34,7 @@ class AutoComplete return @getCompletion(() => @getCommandCompletion(cmd)) filterByPrefix: (commands, prefix) -> - commands.filter((f) => f.startsWith(prefix)) + commands.sort().filter((f) => f.startsWith(prefix)) getCompletion: (completeFunc) -> if @completions.length == 0 @@ -51,8 +51,7 @@ class AutoComplete return complete getCommandCompletion: (command) -> - if @completions.length == 0 - return @filterByPrefix(@commands, command) + return @filterByPrefix(@commands, command) getFilePathCompletion: (command, filePath) -> filePath = @expandTilde(filePath) From d6090058104eb4ac82946f3ec3058b273b191e5b Mon Sep 17 00:00:00 2001 From: Stuart Quin Date: Thu, 11 Aug 2016 12:55:24 +0100 Subject: [PATCH 11/76] Get Ex commands from instance and prototype --- lib/ex.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 0e46110..d8b87b2 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -110,7 +110,9 @@ class Ex @singleton()[alias] = (args) => @singleton()[name](args) @getCommands: () => - Object.keys(@singleton()) + Object.keys(Ex.singleton()).concat(Object.keys(Ex.prototype)).filter((cmd, index, list) -> + list.indexOf(cmd) == index + ) quit: -> atom.workspace.getActivePane().destroyActiveItem() From 3a104fe061c92cf9f4cb643a9a0e5a9d271af075 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Sun, 14 Aug 2016 21:54:02 +0200 Subject: [PATCH 12/76] Prepare 0.12.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9efaf15..c5cd8aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.11.0", + "version": "0.12.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 1b8f6238c27cc5468febecdc42156d49eab1136c Mon Sep 17 00:00:00 2001 From: jazzpi Date: Mon, 15 Aug 2016 21:13:32 +0200 Subject: [PATCH 13/76] Add basic support for visual marks < and > Only works with range '<,'>. If there are multiple selections, run the command for each one. Closes #31. --- lib/command.coffee | 63 ++++++++++++++++++++++-------------- lib/ex-state.coffee | 9 ++++++ lib/ex-view-model.coffee | 5 ++- spec/ex-commands-spec.coffee | 25 +++++++++++++- spec/ex-input-spec.coffee | 9 ++++++ 5 files changed, 84 insertions(+), 27 deletions(-) diff --git a/lib/command.coffee b/lib/command.coffee index 172cefb..9097c6c 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -5,7 +5,8 @@ CommandError = require './command-error' class Command constructor: (@editor, @exState) -> - @viewModel = new ExViewModel(@) + @selections = @exState.getSelections() + @viewModel = new ExViewModel(@, Object.keys(@selections).length > 0) parseAddr: (str, curPos) -> if str is '.' @@ -97,32 +98,39 @@ class Command curPos = @editor.getCursorBufferPosition() - if addr1? - address1 = @parseAddr(addr1, curPos) + # Special case: run command on selection. This can't be handled by simply + # parsing the mark since vim-mode doesn't set it (and it would be fairly + # useless with multiple selections) + if addr1 is "'<" and addr2 is "'>" + runOverSelections = true else - # If no addr1 is given (,+3), assume it is '.' - address1 = curPos.row - if off1? - address1 += @parseOffset(off1) + runOverSelections = false + if addr1? + address1 = @parseAddr(addr1, curPos) + else + # If no addr1 is given (,+3), assume it is '.' + address1 = curPos.row + if off1? + address1 += @parseOffset(off1) - address1 = 0 if address1 is -1 + address1 = 0 if address1 is -1 - if address1 < 0 or address1 > lastLine - throw new CommandError('Invalid range') + if address1 < 0 or address1 > lastLine + throw new CommandError('Invalid range') - if addr2? - address2 = @parseAddr(addr2, curPos) - if off2? - address2 += @parseOffset(off2) + if addr2? + address2 = @parseAddr(addr2, curPos) + if off2? + address2 += @parseOffset(off2) - if address2 < 0 or address2 > lastLine - throw new CommandError('Invalid range') + if address2 < 0 or address2 > lastLine + throw new CommandError('Invalid range') - if address2 < address1 - throw new CommandError('Backwards range given') + if address2 < address1 + throw new CommandError('Backwards range given') range = [address1, if address2? then address2 else address1] - cl = cl[match?.length..] + cl = cl[match?.length..] # Step 5: Leading blanks are ignored cl = cl.trimLeft() @@ -149,9 +157,7 @@ class Command [m, command, args] = cl.match(/^(\w+)(.*)/) # If the command matches an existing one exactly, execute that one - if (func = Ex.singleton()[command])? - func({ range, args, @vimState, @exState, @editor }) - else + unless (func = Ex.singleton()[command])? # Step 8: Match command against existing commands matching = (name for name, val of Ex.singleton() when \ name.indexOf(command) is 0) @@ -161,9 +167,16 @@ class Command command = matching[0] func = Ex.singleton()[command] - if func? - func({ range, args, @vimState, @exState, @editor }) + + if func? + if runOverSelections + for id, selection of @selections + bufferRange = selection.getBufferRange() + range = [bufferRange.start.row, bufferRange.end.row] + func({ range, args, @vimState, @exState, @editor }) else - throw new CommandError("Not an editor command: #{input.characters}") + func({ range, args, @vimState, @exState, @editor }) + else + throw new CommandError("Not an editor command: #{input.characters}") module.exports = Command diff --git a/lib/ex-state.coffee b/lib/ex-state.coffee index 7c0f37c..89fbeeb 100644 --- a/lib/ex-state.coffee +++ b/lib/ex-state.coffee @@ -60,4 +60,13 @@ class ExState @clearOpStack() @emitter.emit('processed-op-stack') + # Returns all non-empty selections + getSelections: -> + filtered = {} + for id, selection of @editor.getSelections() + unless selection.isEmpty() + filtered[id] = selection + + return filtered + module.exports = ExState diff --git a/lib/ex-view-model.coffee b/lib/ex-view-model.coffee index c8f1202..08dd9f6 100644 --- a/lib/ex-view-model.coffee +++ b/lib/ex-view-model.coffee @@ -4,10 +4,13 @@ Ex = require './ex' module.exports = class ExViewModel extends ViewModel - constructor: (@exCommand) -> + constructor: (@exCommand, withSelection) -> super(@exCommand, class: 'command') @historyIndex = -1 + if withSelection + @view.editorElement.getModel().setText("'<,'>") + @view.editorElement.addEventListener('keydown', @tabAutocomplete) atom.commands.add(@view.editorElement, 'core:move-up', @increaseHistoryEx) atom.commands.add(@view.editorElement, 'core:move-down', @decreaseHistoryEx) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index b58c31a..1dd24a6 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -36,7 +36,8 @@ describe "the commands", -> helpers.getEditorElement (element) -> atom.commands.dispatch(element, "ex-mode:open") - keydown('escape') + atom.commands.dispatch(element.getModel().normalModeInputView.editorElement, + "core:cancel") editorElement = element editor = editorElement.getModel() vimState = vimMode.mainModule.getEditorState(editor) @@ -848,3 +849,25 @@ describe "the commands", -> WArgs = Ex.W.calls[0].args[0] writeArgs = Ex.write.calls[0].args[0] expect(WArgs).toBe writeArgs + + describe "with selections", -> + it "executes on the selected range", -> + spyOn(Ex, 's') + editor.setCursorBufferPosition([0, 0]) + editor.selectToBufferPosition([2, 1]) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText("'<,'>s/abc/def") + expect(Ex.s.calls[0].args[0].range).toEqual [0, 2] + + it "calls the functions multiple times if there are multiple selections", -> + spyOn(Ex, 's') + editor.setCursorBufferPosition([0, 0]) + editor.selectToBufferPosition([2, 1]) + editor.addCursorAtBufferPosition([3, 0]) + editor.selectToBufferPosition([3, 2]) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText("'<,'>s/abc/def") + calls = Ex.s.calls + expect(calls.length).toEqual 2 + expect(calls[0].args[0].range).toEqual [0, 2] + expect(calls[1].args[0].range).toEqual [3, 3] diff --git a/spec/ex-input-spec.coffee b/spec/ex-input-spec.coffee index 4555c6f..3d076b9 100644 --- a/spec/ex-input-spec.coffee +++ b/spec/ex-input-spec.coffee @@ -70,6 +70,7 @@ describe "the input element", -> expect(getVisibility()).toBe true commandEditor = getCommandEditor() model = commandEditor.getModel() + expect(model.getText()).toBe '' model.setText('abc') atom.commands.dispatch(commandEditor, "core:backspace") expect(getVisibility()).toBe true @@ -82,3 +83,11 @@ describe "the input element", -> expect(model.getText()).toBe '' atom.commands.dispatch(commandEditor, "core:backspace") expect(getVisibility()).toBe false + + it "contains '<,'> when opened while there are selections", -> + editor.setCursorBufferPosition([0, 0]) + editor.selectToBufferPosition([0, 1]) + editor.addCursorAtBufferPosition([2, 0]) + editor.selectToBufferPosition([2, 1]) + atom.commands.dispatch(editorElement, "ex-mode:open") + expect(getCommandEditor().getModel().getText()).toBe "'<,'>" From 5f56b62b7ba50a9c5a0f6512cf6097893c73f94a Mon Sep 17 00:00:00 2001 From: jazzpi Date: Mon, 15 Aug 2016 21:21:52 +0200 Subject: [PATCH 14/76] Fix specs Apparently `keydown(':')` was never actually opening the Ex line (and `keydown('escape')` wasn't closing it so it wasn't noticeable), so now we open it directly with `ex-mode:open`. --- spec/ex-commands-spec.coffee | 163 ++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 1dd24a6..f4c30cf 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -62,6 +62,9 @@ describe "the commands", -> commandEditor.getModel().setText(text) atom.commands.dispatch(commandEditor, "core:confirm") + openEx = -> + atom.commands.dispatch(editorElement, "ex-mode:open") + describe ":write", -> describe "when editing a new file", -> beforeEach -> @@ -69,14 +72,14 @@ describe "the commands", -> it "opens the save dialog", -> spyOn(atom, 'showSaveDialogSync') - keydown(':') + openEx() submitNormalModeInputText('write') expect(atom.showSaveDialogSync).toHaveBeenCalled() it "saves when a path is specified in the save dialog", -> filePath = projectPath('write-from-save-dialog') spyOn(atom, 'showSaveDialogSync').andReturn(filePath) - keydown(':') + openEx() submitNormalModeInputText('write') expect(fs.existsSync(filePath)).toBe(true) expect(fs.readFileSync(filePath, 'utf-8')).toEqual('abc\ndef') @@ -85,7 +88,7 @@ describe "the commands", -> it "saves when a path is specified in the save dialog", -> spyOn(atom, 'showSaveDialogSync').andReturn(undefined) spyOn(fs, 'writeFileSync') - keydown(':') + openEx() submitNormalModeInputText('write') expect(fs.writeFileSync.calls.length).toBe(0) @@ -101,7 +104,7 @@ describe "the commands", -> it "saves the file", -> editor.setText('abc') - keydown(':') + openEx() submitNormalModeInputText('write') expect(fs.readFileSync(filePath, 'utf-8')).toEqual('abc') expect(editor.isModified()).toBe(false) @@ -112,7 +115,7 @@ describe "the commands", -> beforeEach -> newPath = path.relative(dir, "#{filePath}.new") editor.getBuffer().setText('abc') - keydown(':') + openEx() afterEach -> submitNormalModeInputText("write #{newPath}") @@ -134,7 +137,7 @@ describe "the commands", -> newPath = path.join('~', newPath) it "throws an error with more than one path", -> - keydown(':') + openEx() submitNormalModeInputText('write path1 path2') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: Only one file name allowed' @@ -151,7 +154,7 @@ describe "the commands", -> fs.removeSync(existsPath) it "throws an error if the file already exists", -> - keydown(':') + openEx() submitNormalModeInputText("write #{existsPath}") expect(atom.notifications.notifications[0].message).toEqual( 'Command error: File exists (add ! to override)' @@ -159,7 +162,7 @@ describe "the commands", -> expect(fs.readFileSync(existsPath, 'utf-8')).toEqual('abc') it "writes if forced with :write!", -> - keydown(':') + openEx() submitNormalModeInputText("write! #{existsPath}") expect(atom.notifications.notifications).toEqual([]) expect(fs.readFileSync(existsPath, 'utf-8')).toEqual('abc\ndef') @@ -167,7 +170,7 @@ describe "the commands", -> describe ":wall", -> it "saves all", -> spyOn(atom.workspace, 'saveAll') - keydown(':') + openEx() submitNormalModeInputText('wall') expect(atom.workspace.saveAll).toHaveBeenCalled() @@ -178,14 +181,14 @@ describe "the commands", -> it "opens the save dialog", -> spyOn(atom, 'showSaveDialogSync') - keydown(':') + openEx() submitNormalModeInputText('saveas') expect(atom.showSaveDialogSync).toHaveBeenCalled() it "saves when a path is specified in the save dialog", -> filePath = projectPath('saveas-from-save-dialog') spyOn(atom, 'showSaveDialogSync').andReturn(filePath) - keydown(':') + openEx() submitNormalModeInputText('saveas') expect(fs.existsSync(filePath)).toBe(true) expect(fs.readFileSync(filePath, 'utf-8')).toEqual('abc\ndef') @@ -193,7 +196,7 @@ describe "the commands", -> it "saves when a path is specified in the save dialog", -> spyOn(atom, 'showSaveDialogSync').andReturn(undefined) spyOn(fs, 'writeFileSync') - keydown(':') + openEx() submitNormalModeInputText('saveas') expect(fs.writeFileSync.calls.length).toBe(0) @@ -209,7 +212,7 @@ describe "the commands", -> it "complains if no path given", -> editor.setText('abc') - keydown(':') + openEx() submitNormalModeInputText('saveas') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: Argument required' @@ -221,7 +224,7 @@ describe "the commands", -> beforeEach -> newPath = path.relative(dir, "#{filePath}.new") editor.getBuffer().setText('abc') - keydown(':') + openEx() afterEach -> submitNormalModeInputText("saveas #{newPath}") @@ -243,7 +246,7 @@ describe "the commands", -> newPath = path.join('~', newPath) it "throws an error with more than one path", -> - keydown(':') + openEx() submitNormalModeInputText('saveas path1 path2') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: Only one file name allowed' @@ -260,7 +263,7 @@ describe "the commands", -> fs.removeSync(existsPath) it "throws an error if the file already exists", -> - keydown(':') + openEx() submitNormalModeInputText("saveas #{existsPath}") expect(atom.notifications.notifications[0].message).toEqual( 'Command error: File exists (add ! to override)' @@ -268,7 +271,7 @@ describe "the commands", -> expect(fs.readFileSync(existsPath, 'utf-8')).toEqual('abc') it "writes if forced with :saveas!", -> - keydown(':') + openEx() submitNormalModeInputText("saveas! #{existsPath}") expect(atom.notifications.notifications).toEqual([]) expect(fs.readFileSync(existsPath, 'utf-8')).toEqual('abc\ndef') @@ -282,7 +285,7 @@ describe "the commands", -> atom.workspace.open() it "closes the active pane item if not modified", -> - keydown(':') + openEx() submitNormalModeInputText('quit') expect(pane.destroyActiveItem).toHaveBeenCalled() expect(pane.getItems().length).toBe(1) @@ -293,14 +296,14 @@ describe "the commands", -> it "opens the prompt to save", -> spyOn(pane, 'promptToSaveItem') - keydown(':') + openEx() submitNormalModeInputText('quit') expect(pane.promptToSaveItem).toHaveBeenCalled() describe ":quitall", -> it "closes Atom", -> spyOn(atom, 'close') - keydown(':') + openEx() submitNormalModeInputText('quitall') expect(atom.close).toHaveBeenCalled() @@ -308,7 +311,7 @@ describe "the commands", -> it "acts as an alias to :quit", -> spyOn(Ex, 'tabclose').andCallThrough() spyOn(Ex, 'quit').andCallThrough() - keydown(':') + openEx() submitNormalModeInputText('tabclose') expect(Ex.quit).toHaveBeenCalledWith(Ex.tabclose.calls[0].args...) @@ -322,13 +325,13 @@ describe "the commands", -> it "switches to the next tab", -> pane.activateItemAtIndex(1) - keydown(':') + openEx() submitNormalModeInputText('tabnext') expect(pane.getActiveItemIndex()).toBe(2) it "wraps around", -> pane.activateItemAtIndex(pane.getItems().length - 1) - keydown(':') + openEx() submitNormalModeInputText('tabnext') expect(pane.getActiveItemIndex()).toBe(0) @@ -342,13 +345,13 @@ describe "the commands", -> it "switches to the previous tab", -> pane.activateItemAtIndex(1) - keydown(':') + openEx() submitNormalModeInputText('tabprevious') expect(pane.getActiveItemIndex()).toBe(0) it "wraps around", -> pane.activateItemAtIndex(0) - keydown(':') + openEx() submitNormalModeInputText('tabprevious') expect(pane.getActiveItemIndex()).toBe(pane.getItems().length - 1) @@ -359,7 +362,7 @@ describe "the commands", -> it "writes the file, then quits", -> spyOn(atom, 'showSaveDialogSync').andReturn(projectPath('wq-1')) - keydown(':') + openEx() submitNormalModeInputText('wq') expect(Ex.write).toHaveBeenCalled() # Since `:wq` only calls `:quit` after `:write` is finished, we need to @@ -368,7 +371,7 @@ describe "the commands", -> it "doesn't quit when the file is new and no path is specified in the save dialog", -> spyOn(atom, 'showSaveDialogSync').andReturn(undefined) - keydown(':') + openEx() submitNormalModeInputText('wq') expect(Ex.write).toHaveBeenCalled() wasNotCalled = false @@ -378,7 +381,7 @@ describe "the commands", -> waitsFor((-> wasNotCalled), 100) it "passes the file name", -> - keydown(':') + openEx() submitNormalModeInputText('wq wq-2') expect(Ex.write) .toHaveBeenCalled() @@ -388,7 +391,7 @@ describe "the commands", -> describe ":xit", -> it "acts as an alias to :wq", -> spyOn(Ex, 'wq') - keydown(':') + openEx() submitNormalModeInputText('xit') expect(Ex.wq).toHaveBeenCalled() @@ -396,7 +399,7 @@ describe "the commands", -> it "calls :wall, then :quitall", -> spyOn(Ex, 'wall') spyOn(Ex, 'quitall') - keydown(':') + openEx() submitNormalModeInputText('wqall') expect(Ex.wall).toHaveBeenCalled() expect(Ex.quitall).toHaveBeenCalled() @@ -408,7 +411,7 @@ describe "the commands", -> editor.getBuffer().setText('abc') editor.saveAs(filePath) fs.writeFileSync(filePath, 'def') - keydown(':') + openEx() submitNormalModeInputText('edit') # Reloading takes a bit waitsFor((-> editor.getText() is 'def'), @@ -420,7 +423,7 @@ describe "the commands", -> editor.saveAs(filePath) editor.getBuffer().setText('abcd') fs.writeFileSync(filePath, 'def') - keydown(':') + openEx() submitNormalModeInputText('edit') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: No write since last change (add ! to override)') @@ -434,7 +437,7 @@ describe "the commands", -> editor.saveAs(filePath) editor.getBuffer().setText('abcd') fs.writeFileSync(filePath, 'def') - keydown(':') + openEx() submitNormalModeInputText('edit!') expect(atom.notifications.notifications.length).toBe(0) waitsFor((-> editor.getText() is 'def') @@ -442,7 +445,7 @@ describe "the commands", -> it "throws an error when editing a new file", -> editor.getBuffer().reload() - keydown(':') + openEx() submitNormalModeInputText('edit') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: No file name') @@ -458,18 +461,18 @@ describe "the commands", -> it "opens the specified path", -> filePath = projectPath('edit-new-test') - keydown(':') + openEx() submitNormalModeInputText("edit #{filePath}") expect(atom.workspace.open).toHaveBeenCalledWith(filePath) it "opens a relative path", -> - keydown(':') + openEx() submitNormalModeInputText('edit edit-relative-test') expect(atom.workspace.open).toHaveBeenCalledWith( projectPath('edit-relative-test')) it "throws an error if trying to open more than one file", -> - keydown(':') + openEx() submitNormalModeInputText('edit edit-new-test-1 edit-new-test-2') expect(atom.workspace.open.callCount).toBe(0) expect(atom.notifications.notifications[0].message).toEqual( @@ -479,14 +482,14 @@ describe "the commands", -> it "acts as an alias to :edit if supplied with a path", -> spyOn(Ex, 'tabedit').andCallThrough() spyOn(Ex, 'edit') - keydown(':') + openEx() submitNormalModeInputText('tabedit tabedit-test') expect(Ex.edit).toHaveBeenCalledWith(Ex.tabedit.calls[0].args...) it "acts as an alias to :tabnew if not supplied with a path", -> spyOn(Ex, 'tabedit').andCallThrough() spyOn(Ex, 'tabnew') - keydown(':') + openEx() submitNormalModeInputText('tabedit ') expect(Ex.tabnew) .toHaveBeenCalledWith(Ex.tabedit.calls[0].args...) @@ -494,14 +497,14 @@ describe "the commands", -> describe ":tabnew", -> it "opens a new tab", -> spyOn(atom.workspace, 'open') - keydown(':') + openEx() submitNormalModeInputText('tabnew') expect(atom.workspace.open).toHaveBeenCalled() it "opens a new tab for editing when provided an argument", -> spyOn(Ex, 'tabnew').andCallThrough() spyOn(Ex, 'tabedit') - keydown(':') + openEx() submitNormalModeInputText('tabnew tabnew-test') expect(Ex.tabedit) .toHaveBeenCalledWith(Ex.tabnew.calls[0].args...) @@ -513,14 +516,14 @@ describe "the commands", -> spyOn(pane, 'splitDown').andCallThrough() filePath = projectPath('split') editor.saveAs(filePath) - keydown(':') + openEx() submitNormalModeInputText('split') expect(pane.splitDown).toHaveBeenCalled() else spyOn(pane, 'splitUp').andCallThrough() filePath = projectPath('split') editor.saveAs(filePath) - keydown(':') + openEx() submitNormalModeInputText('split') expect(pane.splitUp).toHaveBeenCalled() # FIXME: Should test whether the new pane contains a TextEditor @@ -533,7 +536,7 @@ describe "the commands", -> spyOn(pane, 'splitRight').andCallThrough() filePath = projectPath('vsplit') editor.saveAs(filePath) - keydown(':') + openEx() submitNormalModeInputText('vsplit') expect(pane.splitLeft).toHaveBeenCalled() else @@ -541,7 +544,7 @@ describe "the commands", -> spyOn(pane, 'splitLeft').andCallThrough() filePath = projectPath('vsplit') editor.saveAs(filePath) - keydown(':') + openEx() submitNormalModeInputText('vsplit') expect(pane.splitLeft).toHaveBeenCalled() # FIXME: Should test whether the new pane contains a TextEditor @@ -553,19 +556,19 @@ describe "the commands", -> editor.setCursorBufferPosition([2, 0]) it "deletes the current line", -> - keydown(':') + openEx() submitNormalModeInputText('delete') expect(editor.getText()).toEqual('abc\ndef\njkl') it "copies the deleted text", -> - keydown(':') + openEx() submitNormalModeInputText('delete') expect(atom.clipboard.read()).toEqual('ghi\n') it "deletes the lines in the given range", -> processedOpStack = false exState.onDidProcessOpStack -> processedOpStack = true - keydown(':') + openEx() submitNormalModeInputText('1,2delete') expect(editor.getText()).toEqual('ghi\njkl') @@ -578,7 +581,7 @@ describe "the commands", -> expect(editor.getText()).toEqual('abc\n') it "undos deleting several lines at once", -> - keydown(':') + openEx() submitNormalModeInputText('-1,.delete') expect(editor.getText()).toEqual('abc\njkl') atom.commands.dispatch(editorElement, 'core:undo') @@ -590,17 +593,17 @@ describe "the commands", -> editor.setCursorBufferPosition([0, 0]) it "replaces a character on the current line", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute /a/x') expect(editor.getText()).toEqual('xbcaABC\ndefdDEF\nabcaABC') it "doesn't need a space before the arguments", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute/a/x') expect(editor.getText()).toEqual('xbcaABC\ndefdDEF\nabcaABC') it "respects modifiers passed to it", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute/a/x/g') expect(editor.getText()).toEqual('xbcxABC\ndefdDEF\nabcaABC') @@ -609,7 +612,7 @@ describe "the commands", -> expect(editor.getText()).toEqual('xbcxxBC\ndefdDEF\nabcaABC') it "replaces on multiple lines", -> - keydown(':') + openEx() submitNormalModeInputText(':%substitute/abc/ghi') expect(editor.getText()).toEqual('ghiaABC\ndefdDEF\nghiaABC') @@ -623,18 +626,18 @@ describe "the commands", -> editor.setCursorBufferPosition([2, 0]) it "yanks the current line", -> - keydown(':') + openEx() submitNormalModeInputText('yank') expect(atom.clipboard.read()).toEqual('ghi\n') it "yanks the lines in the given range", -> - keydown(':') + openEx() submitNormalModeInputText('1,2yank') expect(atom.clipboard.read()).toEqual('abc\ndef\n') describe "illegal delimiters", -> test = (delim) -> - keydown(':') + openEx() submitNormalModeInputText(":substitute #{delim}a#{delim}x#{delim}gi") expect(atom.notifications.notifications[0].message).toEqual( "Command error: Regular expressions can't be delimited by alphanumeric characters, '\\', '\"' or '|'") @@ -651,12 +654,12 @@ describe "the commands", -> editor.setText('abcabc\nabcabc') it "removes the pattern without modifiers", -> - keydown(':') + openEx() submitNormalModeInputText(":substitute/abc//") expect(editor.getText()).toEqual('abc\nabcabc') it "removes the pattern with modifiers", -> - keydown(':') + openEx() submitNormalModeInputText(":substitute/abc//g") expect(editor.getText()).toEqual('\nabcabc') @@ -665,7 +668,7 @@ describe "the commands", -> editor.setText('abc,def,ghi') test = (escapeChar, escaped) -> - keydown(':') + openEx() submitNormalModeInputText(":substitute/,/\\#{escapeChar}/g") expect(editor.getText()).toEqual("abc#{escaped}def#{escaped}ghi") @@ -680,26 +683,26 @@ describe "the commands", -> it "uses case sensitive search if smartcase is off and the pattern is lowercase", -> atom.config.set('vim-mode.useSmartcaseForSearch', false) - keydown(':') + openEx() submitNormalModeInputText(':substitute/abc/ghi/g') expect(editor.getText()).toEqual('ghiaABC\ndefdDEF\nabcaABC') it "uses case sensitive search if smartcase is off and the pattern is uppercase", -> editor.setText('abcaABC\ndefdDEF\nabcaABC') - keydown(':') + openEx() submitNormalModeInputText(':substitute/ABC/ghi/g') expect(editor.getText()).toEqual('abcaghi\ndefdDEF\nabcaABC') it "uses case insensitive search if smartcase is on and the pattern is lowercase", -> editor.setText('abcaABC\ndefdDEF\nabcaABC') atom.config.set('vim-mode.useSmartcaseForSearch', true) - keydown(':') + openEx() submitNormalModeInputText(':substitute/abc/ghi/g') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nabcaABC') it "uses case sensitive search if smartcase is on and the pattern is uppercase", -> editor.setText('abcaABC\ndefdDEF\nabcaABC') - keydown(':') + openEx() submitNormalModeInputText(':substitute/ABC/ghi/g') expect(editor.getText()).toEqual('abcaghi\ndefdDEF\nabcaABC') @@ -709,37 +712,37 @@ describe "the commands", -> it "uses case insensitive search if smartcase is off and \c is in the pattern", -> atom.config.set('vim-mode.useSmartcaseForSearch', false) - keydown(':') + openEx() submitNormalModeInputText(':substitute/abc\\c/ghi/g') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nabcaABC') it "doesn't matter where in the pattern \\c is", -> atom.config.set('vim-mode.useSmartcaseForSearch', false) - keydown(':') + openEx() submitNormalModeInputText(':substitute/a\\cbc/ghi/g') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nabcaABC') it "uses case sensitive search if smartcase is on, \\C is in the pattern and the pattern is lowercase", -> atom.config.set('vim-mode.useSmartcaseForSearch', true) - keydown(':') + openEx() submitNormalModeInputText(':substitute/a\\Cbc/ghi/g') expect(editor.getText()).toEqual('ghiaABC\ndefdDEF\nabcaABC') it "overrides \\C with \\c if \\C comes first", -> atom.config.set('vim-mode.useSmartcaseForSearch', true) - keydown(':') + openEx() submitNormalModeInputText(':substitute/a\\Cb\\cc/ghi/g') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nabcaABC') it "overrides \\C with \\c if \\c comes first", -> atom.config.set('vim-mode.useSmartcaseForSearch', true) - keydown(':') + openEx() submitNormalModeInputText(':substitute/a\\cb\\Cc/ghi/g') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nabcaABC') it "overrides an appended /i flag with \\C", -> atom.config.set('vim-mode.useSmartcaseForSearch', true) - keydown(':') + openEx() submitNormalModeInputText(':substitute/ab\\Cc/ghi/gi') expect(editor.getText()).toEqual('ghiaABC\ndefdDEF\nabcaABC') @@ -748,23 +751,23 @@ describe "the commands", -> editor.setText('abcaABC\ndefdDEF\nabcaABC') it "replaces \\1 with the first group", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute/bc(.{2})/X\\1X') expect(editor.getText()).toEqual('aXaAXBC\ndefdDEF\nabcaABC') it "replaces multiple groups", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute/a([a-z]*)aA([A-Z]*)/X\\1XY\\2Y') expect(editor.getText()).toEqual('XbcXYBCY\ndefdDEF\nabcaABC') it "replaces \\0 with the entire match", -> - keydown(':') + openEx() submitNormalModeInputText(':substitute/ab(ca)AB/X\\0X') expect(editor.getText()).toEqual('XabcaABXC\ndefdDEF\nabcaABC') describe ":set", -> it "throws an error without a specified option", -> - keydown(':') + openEx() submitNormalModeInputText(':set') expect(atom.notifications.notifications[0].message).toEqual( 'Command error: No option specified') @@ -772,7 +775,7 @@ describe "the commands", -> it "sets multiple options at once", -> atom.config.set('editor.showInvisibles', false) atom.config.set('editor.showLineNumbers', false) - keydown(':') + openEx() submitNormalModeInputText(':set list number') expect(atom.config.get('editor.showInvisibles')).toBe(true) expect(atom.config.get('editor.showLineNumbers')).toBe(true) @@ -783,7 +786,7 @@ describe "the commands", -> atom.config.set('editor.showLineNumbers', false) it "sets (no)list", -> - keydown(':') + openEx() submitNormalModeInputText(':set list') expect(atom.config.get('editor.showInvisibles')).toBe(true) atom.commands.dispatch(editorElement, 'ex-mode:open') @@ -791,7 +794,7 @@ describe "the commands", -> expect(atom.config.get('editor.showInvisibles')).toBe(false) it "sets (no)nu(mber)", -> - keydown(':') + openEx() submitNormalModeInputText(':set nu') expect(atom.config.get('editor.showLineNumbers')).toBe(true) atom.commands.dispatch(editorElement, 'ex-mode:open') @@ -805,7 +808,7 @@ describe "the commands", -> expect(atom.config.get('editor.showLineNumbers')).toBe(false) it "sets (no)sp(lit)r(ight)", -> - keydown(':') + openEx() submitNormalModeInputText(':set spr') expect(atom.config.get('ex-mode.splitright')).toBe(true) atom.commands.dispatch(editorElement, 'ex-mode:open') @@ -819,7 +822,7 @@ describe "the commands", -> expect(atom.config.get('ex-mode.splitright')).toBe(false) it "sets (no)s(plit)b(elow)", -> - keydown(':') + openEx() submitNormalModeInputText(':set sb') expect(atom.config.get('ex-mode.splitbelow')).toBe(true) atom.commands.dispatch(editorElement, 'ex-mode:open') @@ -836,7 +839,7 @@ describe "the commands", -> it "calls the aliased function without arguments", -> ExClass.registerAlias('W', 'w') spyOn(Ex, 'write') - keydown(':') + openEx() submitNormalModeInputText('W') expect(Ex.write).toHaveBeenCalled() @@ -844,7 +847,7 @@ describe "the commands", -> ExClass.registerAlias('W', 'write') spyOn(Ex, 'W').andCallThrough() spyOn(Ex, 'write') - keydown(':') + openEx() submitNormalModeInputText('W') WArgs = Ex.W.calls[0].args[0] writeArgs = Ex.write.calls[0].args[0] From 773c3c733db6fd5d0b2cbe1ec35f7e3abc4169b3 Mon Sep 17 00:00:00 2001 From: "Jasper v. B" Date: Mon, 15 Aug 2016 23:24:32 +0200 Subject: [PATCH 15/76] Update PR template Remove the @mentions because I'm watching the repository and LongLiveCHIEF no longer maintains it. --- .github/PULL_REQUEST_TEMPLATE.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ae22d79..1b3c90e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,14 +1,15 @@ Fixes # . Changes Proposed in this Pull Request: -- -- -- + +- foo +- bar +- baz I have written tests for: -- [ ] New features introduced -- [ ] Bugs fixed -- [ ] Neither (I'm just enhancing tests!) +[](Remove the `[]()` to uncomment the appropriate lines) -@jazzpi @LongLiveCHIEF +[](- New features introduced) +[](- Bugs fixed) +[](- Neither (I'm just enhancing tests!)) From a450f5853fef15567ef5f785a353a4fed36726d0 Mon Sep 17 00:00:00 2001 From: "Jasper v. B" Date: Mon, 15 Aug 2016 23:31:08 +0200 Subject: [PATCH 16/76] Update contributing guidelines LongLiveCHIEF no longer maintains this repository and I'm watching it, so the @mentions are unnecessary. Also, only collaborators can assign issues so step #2 doesn't work anyways. --- .github/CONTRIBUTING.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 31132f0..2231100 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -3,13 +3,8 @@ Current Maintainers: - [@jazzpi](https://github.com/jazzpi) -- [@LongLiveCHIEF](https://github.com/LongLiveCHIEF) -This project is accepting new maintainers. Interested parties should - -1. Open a new issue, titled: `New Maintainer Request` -2. Assign the issue to [@lloeki](https://github.com/lloeki) -3. The last line of your request should `/cc @jazzpi @LongLiveCHIEF` +This project is accepting new maintainers. Interested parties should open a new issue titled `New Maintainer Request`. ## Pull Requests @@ -19,7 +14,6 @@ close when your PR is merged to speed up the merge of your PR, please contribute these tests - *note*: if you submit a PR but are unsure how to write tests, please begin your PR title with `[needs tests]` - Please use the [pull request template](PULL_REQUEST_TEMPLATE.md) as a guide for submitting your PR. -- Include a `/cc` for @LongLiveCHIEF and @jazzpi the current maintainers ## Issues From c6efc0d46c461fe69d32c426844d7892831ae771 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Mon, 15 Aug 2016 23:47:34 +0200 Subject: [PATCH 17/76] Add 'smartcase' option --- lib/vim-option.coffee | 12 ++++++++++++ spec/ex-commands-spec.coffee | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/vim-option.coffee b/lib/vim-option.coffee index 4d5968c..ddf4688 100644 --- a/lib/vim-option.coffee +++ b/lib/vim-option.coffee @@ -44,4 +44,16 @@ class VimOption nosb: => @nosplitbelow() + smartcase: => + atom.config.set("vim-mode.useSmartcaseForSearch", true) + + scs: => + @smartcase() + + nosmartcase: => + atom.config.set("vim-mode.useSmartcaseForSearch", false) + + noscs: => + @nosmartcase() + module.exports = VimOption diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index f4c30cf..72775f8 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -835,6 +835,20 @@ describe "the commands", -> submitNormalModeInputText(':set nosplitbelow') expect(atom.config.get('ex-mode.splitbelow')).toBe(false) + it "sets (no)s(mart)c(a)s(e)", -> + openEx() + submitNormalModeInputText(':set scs') + expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(true) + openEx() + submitNormalModeInputText(':set noscs') + expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(false) + openEx() + submitNormalModeInputText(':set smartcase') + expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(true) + openEx() + submitNormalModeInputText(':set nosmartcase') + expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(false) + describe "aliases", -> it "calls the aliased function without arguments", -> ExClass.registerAlias('W', 'w') From 3c952ccbfe36d0eb72446275b5e576dda5cac308 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 16 Aug 2016 00:36:05 +0200 Subject: [PATCH 18/76] Fix mark addresses and add specs for addresses Enables properly parsing marks as addresses. Also adds some specs for addresses by checking how ex-mode behaves when used as a motion. Fixes #70. --- lib/command.coffee | 2 +- spec/ex-commands-spec.coffee | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/lib/command.coffee b/lib/command.coffee index 9097c6c..ffb9b28 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -24,7 +24,7 @@ class Command mark = @vimState.marks[str[1]] unless mark? throw new CommandError("Mark #{str} not set.") - addr = mark.bufferMarker.range.end.row + addr = mark.getEndBufferPosition().row else if str[0] is "/" addr = Find.findNextInBuffer(@editor.buffer, curPos, str[1...-1]) unless addr? diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 72775f8..4db66ce 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -65,6 +65,68 @@ describe "the commands", -> openEx = -> atom.commands.dispatch(editorElement, "ex-mode:open") + describe "as a motion", -> + beforeEach -> + editor.setCursorBufferPosition([0, 0]) + + it "moves the cursor to a specific line", -> + openEx() + submitNormalModeInputText '2' + + expect(editor.getCursorBufferPosition()).toEqual [1, 0] + + it "moves to the second address", -> + openEx() + submitNormalModeInputText '1,3' + + expect(editor.getCursorBufferPosition()).toEqual [2, 0] + + it "works with offsets", -> + openEx() + submitNormalModeInputText '2+1' + expect(editor.getCursorBufferPosition()).toEqual [2, 0] + + openEx() + submitNormalModeInputText '-2' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + it "doesn't move when the address is the current line", -> + openEx() + submitNormalModeInputText '.' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + openEx() + submitNormalModeInputText ',' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + it "moves to the last line", -> + openEx() + submitNormalModeInputText '$' + expect(editor.getCursorBufferPosition()).toEqual [3, 0] + + it "moves to a mark's line", -> + keydown('l') + keydown('m') + commandModeInputKeydown 'a' + keydown('j') + openEx() + submitNormalModeInputText "'a" + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + it "moves to a specified search", -> + openEx() + submitNormalModeInputText '/def' + expect(editor.getCursorBufferPosition()).toEqual [1, 0] + + openEx() + submitNormalModeInputText '?abc' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + editor.setCursorBufferPosition([3, 0]) + openEx() + submitNormalModeInputText '/ef' + expect(editor.getCursorBufferPosition()).toEqual [1, 0] + describe ":write", -> describe "when editing a new file", -> beforeEach -> From 31ac3a98ed407cbaa5429bd04f72487b0c03c6b2 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 16 Aug 2016 12:33:00 +0200 Subject: [PATCH 19/76] Fix spec for movement to mark --- spec/ex-commands-spec.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 4db66ce..311f18b 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -107,7 +107,7 @@ describe "the commands", -> it "moves to a mark's line", -> keydown('l') keydown('m') - commandModeInputKeydown 'a' + normalModeInputKeydown 'a' keydown('j') openEx() submitNormalModeInputText "'a" @@ -637,7 +637,6 @@ describe "the commands", -> waitsFor -> processedOpStack editor.setText('abc\ndef\nghi\njkl') editor.setCursorBufferPosition([1, 1]) - # For some reason, keydown(':') doesn't work here :/ atom.commands.dispatch(editorElement, 'ex-mode:open') submitNormalModeInputText(',/k/delete') expect(editor.getText()).toEqual('abc\n') From 0f91ab5ae06f981af4da65e67b53f35d9be44c83 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 16 Aug 2016 12:55:19 +0200 Subject: [PATCH 20/76] Fix search not working without a closing delimiter --- lib/command.coffee | 33 ++++++++++++-------- lib/find.coffee | 59 ++++++++++++++++++++++++++++++++++++ spec/ex-commands-spec.coffee | 5 +-- 3 files changed, 83 insertions(+), 14 deletions(-) diff --git a/lib/command.coffee b/lib/command.coffee index ffb9b28..48e9616 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -8,14 +8,15 @@ class Command @selections = @exState.getSelections() @viewModel = new ExViewModel(@, Object.keys(@selections).length > 0) - parseAddr: (str, curPos) -> + parseAddr: (str, cursor) -> + row = cursor.getBufferRow() if str is '.' - addr = curPos.row + addr = row else if str is '$' # Lines are 0-indexed in Atom, but 1-indexed in vim. addr = @editor.getBuffer().lines.length - 1 else if str[0] in ["+", "-"] - addr = curPos.row + @parseOffset(str) + addr = row + @parseOffset(str) else if not isNaN(str) addr = parseInt(str) - 1 else if str[0] is "'" # Parse Mark... @@ -26,13 +27,21 @@ class Command throw new CommandError("Mark #{str} not set.") addr = mark.getEndBufferPosition().row else if str[0] is "/" - addr = Find.findNextInBuffer(@editor.buffer, curPos, str[1...-1]) + str = str[1...] + if str[str.length-1] is "/" + str = str[...-1] + addr = Find.scanEditor(str, @editor, cursor.getCurrentLineBufferRange().end)[0] unless addr? - throw new CommandError("Pattern not found: #{str[1...-1]}") + throw new CommandError("Pattern not found: #{str}") + addr = addr.start.row else if str[0] is "?" - addr = Find.findPreviousInBuffer(@editor.buffer, curPos, str[1...-1]) + str = str[1...] + if str[str.length-1] is "?" + str = str[...-1] + addr = Find.scanEditor(str, @editor, cursor.getCurrentLineBufferRange().start, true)[0] unless addr? throw new CommandError("Pattern not found: #{str[1...-1]}") + addr = addr.start.row return addr @@ -76,8 +85,8 @@ class Command \$| # Last line \d+| # n-th line '[\[\]<>'`"^.(){}a-zA-Z]| # Marks - /.*?[^\\]/| # Regex - \?.*?[^\\]\?| # Backwards search + /.*?(?:[^\\]/|$)| # Regex + \?.*?(?:[^\\]\?|$)| # Backwards search [+-]\d* # Current line +/- a number of lines )((?:\s*[+-]\d*)*) # Line offset )? @@ -96,7 +105,7 @@ class Command [match, addr1, off1, addr2, off2] = cl.match(addrPattern) - curPos = @editor.getCursorBufferPosition() + cursor = @editor.getLastCursor() # Special case: run command on selection. This can't be handled by simply # parsing the mark since vim-mode doesn't set it (and it would be fairly @@ -106,10 +115,10 @@ class Command else runOverSelections = false if addr1? - address1 = @parseAddr(addr1, curPos) + address1 = @parseAddr(addr1, cursor) else # If no addr1 is given (,+3), assume it is '.' - address1 = curPos.row + address1 = cursor.getBufferRow() if off1? address1 += @parseOffset(off1) @@ -119,7 +128,7 @@ class Command throw new CommandError('Invalid range') if addr2? - address2 = @parseAddr(addr2, curPos) + address2 = @parseAddr(addr2, cursor) if off2? address2 += @parseOffset(off2) diff --git a/lib/find.coffee b/lib/find.coffee index 53dffc5..60e98b8 100644 --- a/lib/find.coffee +++ b/lib/find.coffee @@ -1,3 +1,40 @@ +_ = require 'underscore-plus' + +getSearchTerm = (term, modifiers = {'g': true}) -> + + escaped = false + hasc = false + hasC = false + term_ = term + term = '' + for char in term_ + if char is '\\' and not escaped + escaped = true + term += char + else + if char is 'c' and escaped + hasc = true + term = term[...-1] + else if char is 'C' and escaped + hasC = true + term = term[...-1] + else if char isnt '\\' + term += char + escaped = false + + if hasC + modifiers['i'] = false + if (not hasC and not term.match('[A-Z]') and \ + atom.config.get("vim-mode:useSmartcaseForSearch")) or hasc + modifiers['i'] = true + + modFlags = Object.keys(modifiers).filter((key) -> modifiers[key]).join('') + + try + new RegExp(term, modFlags) + catch + new RegExp(_.escapeRegExp(term), modFlags) + module.exports = { findInBuffer : (buffer, pattern) -> found = [] @@ -23,4 +60,26 @@ module.exports = { return found[found.length - 1].start.row else return null + + # Returns an array of ranges of all occurences of `term` in `editor`. + # The array is sorted so that the first occurences after the cursor come + # first (and the search wraps around). If `reverse` is true, the array is + # reversed so that the first occurence before the cursor comes first. + scanEditor: (term, editor, position, reverse = false) -> + [rangesBefore, rangesAfter] = [[], []] + editor.scan getSearchTerm(term), ({range}) -> + if reverse + isBefore = range.start.compare(position) < 0 + else + isBefore = range.start.compare(position) <= 0 + + if isBefore + rangesBefore.push(range) + else + rangesAfter.push(range) + + if reverse + rangesAfter.concat(rangesBefore).reverse() + else + rangesAfter.concat(rangesBefore) } diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 311f18b..bfee143 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -118,9 +118,10 @@ describe "the commands", -> submitNormalModeInputText '/def' expect(editor.getCursorBufferPosition()).toEqual [1, 0] + editor.setCursorBufferPosition([2, 0]) openEx() - submitNormalModeInputText '?abc' - expect(editor.getCursorBufferPosition()).toEqual [0, 0] + submitNormalModeInputText '?def' + expect(editor.getCursorBufferPosition()).toEqual [1, 0] editor.setCursorBufferPosition([3, 0]) openEx() From 17be8f025ae873de85864a5196fa945a670a2cfc Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 16 Aug 2016 13:29:31 +0200 Subject: [PATCH 21/76] Update changelog for v0.12.0 and v0.13.0 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8430d6..78d1819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.13.0 +* Added basic support for visual marks (e.g. `:'<,'>s/foo/bar`) +* Added `smartcase` option to `:set` +* Fixed using marks as addresses (e.g. `:'a,.delete`) +* Fixed search not working without a closing delimiter (e.g. `:/foo`) + +## 0.12.0 +* Added file and command autocomplete (@stuartquin) +* Added `splitbelow` and `splitright` options to `:set` +* Fixed the editor not updating when saving a new file with `:w` or `:saveas` + ## 0.11.0 * Stop using non-standard Promise.defer (fixes issue with `:w`) (@AsaAyers) From 03a36d11cdd5d3d91c99eed3aea0e834f0e2dab6 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 16 Aug 2016 14:42:03 +0200 Subject: [PATCH 22/76] Prepare 0.13.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c5cd8aa..8db31b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.12.0", + "version": "0.13.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From fd0aa7a6c33f7fa029ff0b631183679cd09bbc0f Mon Sep 17 00:00:00 2001 From: Michael Nicholls Date: Tue, 23 Aug 2016 07:07:44 +0100 Subject: [PATCH 23/76] Add tests for autocompleting a non existent directory Also add tests for autocompleting a file as a directory --- spec/autocomplete-spec.coffee | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/spec/autocomplete-spec.coffee b/spec/autocomplete-spec.coffee index 49b5a1e..000e9c2 100644 --- a/spec/autocomplete-spec.coffee +++ b/spec/autocomplete-spec.coffee @@ -10,6 +10,7 @@ describe "autocomplete functionality", -> beforeEach -> @autoComplete = new AutoComplete(['taba', 'tabb', 'tabc']) @testDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}") + @nonExistentTestDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}") @testFile1 = path.join(@testDir, "atom-ex-testfile-a.txt") @testFile2 = path.join(@testDir, "atom-ex-testfile-b.txt") @@ -80,3 +81,20 @@ describe "autocomplete functionality", -> it "lists files once", -> expect(@autoComplete.getFilePathCompletion.callCount).toBe(1) + + describe "autocomplete non existent directory", -> + beforeEach -> + @completed = @autoComplete.getAutocomplete('tabe ' + @nonExistentTestDir) + + it "returns no completions", -> + expected = ''; + expect(@completed).toEqual(expected) + + describe "autocomplete existing file as directory", -> + beforeEach -> + filePath = @testFile1 + path.sep + @completed = @autoComplete.getAutocomplete('tabe ' + filePath) + + it "returns no completions", -> + expected = ''; + expect(@completed).toEqual(expected) From 0441b24c21a21bb35b2e7acbf4e7c4392bd3df02 Mon Sep 17 00:00:00 2001 From: Michael Nicholls Date: Tue, 23 Aug 2016 07:11:11 +0100 Subject: [PATCH 24/76] Fix autocompleting a non existent directory --- lib/autocomplete.coffee | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/autocomplete.coffee b/lib/autocomplete.coffee index 8dcb910..6775bac 100644 --- a/lib/autocomplete.coffee +++ b/lib/autocomplete.coffee @@ -40,6 +40,7 @@ class AutoComplete if @completions.length == 0 @completions = completeFunc() + complete = '' if @completions.length complete = @completions[@autoCompleteIndex % @completions.length] @autoCompleteIndex++ @@ -48,7 +49,7 @@ class AutoComplete if complete.endsWith('/') && @completions.length == 1 @resetCompletion() - return complete + return complete getCommandCompletion: (command) -> return @filterByPrefix(@commands, command) @@ -63,12 +64,17 @@ class AutoComplete basePath = path.dirname(filePath) baseName = path.basename(filePath) - files = fs.readdirSync(basePath) - - return @filterByPrefix(files, baseName).map((f) => - filePath = path.join(basePath, f) - if fs.lstatSync(filePath).isDirectory() - return command + ' ' + filePath + path.sep - else - return command + ' ' + filePath - ) + try + basePathStat = fs.statSync(basePath) + if basePathStat.isDirectory() + files = fs.readdirSync(basePath) + return @filterByPrefix(files, baseName).map((f) => + filePath = path.join(basePath, f) + if fs.lstatSync(filePath).isDirectory() + return command + ' ' + filePath + path.sep + else + return command + ' ' + filePath + ) + return [] + catch err + return [] From d5acbd3f53c7ecab7dd43a57a30554bdfc5d6a76 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Fri, 4 Nov 2016 12:51:30 +0100 Subject: [PATCH 25/76] Limit addresses to the last line --- lib/command.coffee | 8 ++++++-- spec/ex-commands-spec.coffee | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lib/command.coffee b/lib/command.coffee index 48e9616..0cfd6f2 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -123,8 +123,9 @@ class Command address1 += @parseOffset(off1) address1 = 0 if address1 is -1 + address1 = lastLine if address1 > lastLine - if address1 < 0 or address1 > lastLine + if address1 < 0 throw new CommandError('Invalid range') if addr2? @@ -132,7 +133,10 @@ class Command if off2? address2 += @parseOffset(off2) - if address2 < 0 or address2 > lastLine + address2 = 0 if address2 is -1 + address2 = lastLine if address2 > lastLine + + if address2 < 0 throw new CommandError('Invalid range') if address2 < address1 diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index bfee143..2054a38 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -90,6 +90,33 @@ describe "the commands", -> submitNormalModeInputText '-2' expect(editor.getCursorBufferPosition()).toEqual [0, 0] + it "limits to the last line", -> + openEx() + submitNormalModeInputText '10' + expect(editor.getCursorBufferPosition()).toEqual [3, 0] + editor.setCursorBufferPosition([0, 0]) + + openEx() + submitNormalModeInputText '3,10' + expect(editor.getCursorBufferPosition()).toEqual [3, 0] + editor.setCursorBufferPosition([0, 0]) + + openEx() + submitNormalModeInputText '$+1000' + expect(editor.getCursorBufferPosition()).toEqual [3, 0] + editor.setCursorBufferPosition([0, 0]) + + it "goes to the first line with address 0", -> + editor.setCursorBufferPosition([2, 0]) + openEx() + submitNormalModeInputText '0' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + + editor.setCursorBufferPosition([2, 0]) + openEx() + submitNormalModeInputText '0,0' + expect(editor.getCursorBufferPosition()).toEqual [0, 0] + it "doesn't move when the address is the current line", -> openEx() submitNormalModeInputText '.' From d3c3603eb467a6741babbd55b6113a0683ac5a77 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Fri, 4 Nov 2016 13:07:34 +0100 Subject: [PATCH 26/76] Prepare 0.13.1 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8db31b3..d57a669 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.13.0", + "version": "0.13.1", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From cd80a163cb932c3a8ed59fab1ab1126410dcae2e Mon Sep 17 00:00:00 2001 From: Joey Marianer Date: Sun, 8 Jan 2017 14:29:07 -0800 Subject: [PATCH 27/76] Support :tabonly. Code shamelessly copied from the close-other-tabs extension. --- lib/ex.coffee | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/ex.coffee b/lib/ex.coffee index 7c9a6fa..b3d7513 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -163,6 +163,16 @@ class Ex tabp: => @tabprevious() + tabonly: -> + tabBar = atom.workspace.getPanes()[0] + tabBarElement = atom.views.getView(tabBar).querySelector(".tab-bar") + tabBarElement.querySelector(".right-clicked") && tabBarElement.querySelector(".right-clicked").classList.remove("right-clicked") + tabBarElement.querySelector(".active").classList.add("right-clicked") + atom.commands.dispatch(tabBarElement, 'tabs:close-other-tabs') + tabBarElement.querySelector(".active").classList.remove("right-clicked") + + tabo: => @tabonly() + edit: ({ range, args, editor }) -> filePath = args.trim() if filePath[0] is '!' From ba01f8a1b188c6e4757ae521c542120da55a8f52 Mon Sep 17 00:00:00 2001 From: Joey Marianer Date: Sun, 8 Jan 2017 14:27:21 -0800 Subject: [PATCH 28/76] ex-mode supports vim-mode-plus --- README.md | 4 +++- keymaps/ex-mode.cson | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 58bcc45..3f247de 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ ex-mode for Atom's vim-mode ## Use -Install both [vim-mode](https://github.com/atom/vim-mode) and ex-mode. Type `:` in command mode. Enter `w` or `write`. +Install both [vim-mode-plus](https://github.com/t9md/atom-vim-mode-plus) (or +the deprecated `vim-mode`) and ex-mode. Type `:` in command mode. Enter `w` or +`write`. ## Extend diff --git a/keymaps/ex-mode.cson b/keymaps/ex-mode.cson index 5abddd0..1c70132 100644 --- a/keymaps/ex-mode.cson +++ b/keymaps/ex-mode.cson @@ -7,5 +7,7 @@ # For more detailed documentation see # https://atom.io/docs/latest/advanced/keymaps +'atom-text-editor.vim-mode-plus:not(.insert-mode)': + ':': 'ex-mode:open' 'atom-text-editor.vim-mode:not(.insert-mode)': ':': 'ex-mode:open' From ccf6aa22f87a16e9a642f2d7451d3f19d1eb30d8 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 15 Mar 2017 13:55:20 +0100 Subject: [PATCH 29/76] Fix `:x` closing Atom instead of the current pane `x` was being matched with `xall` instead of `xit`, so add an alias. --- lib/ex.coffee | 1 + spec/ex-commands-spec.coffee | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/lib/ex.coffee b/lib/ex.coffee index b3d7513..5edf5a8 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -276,6 +276,7 @@ class Ex xit: (args) => @wq(args) + x: (args) => @xit(args) split: ({ range, args }) -> args = args.trim() diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 2054a38..cc349ac 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -485,6 +485,13 @@ describe "the commands", -> submitNormalModeInputText('xit') expect(Ex.wq).toHaveBeenCalled() + describe ":x", -> + it "acts as an alias to :xit", -> + spyOn(Ex, 'xit') + openEx() + submitNormalModeInputText('x') + expect(Ex.xit).toHaveBeenCalled() + describe ":wqall", -> it "calls :wall, then :quitall", -> spyOn(Ex, 'wall') From cf3e250ea0822eecf021dacd06b6d72e54003646 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 15 Mar 2017 14:59:12 +0100 Subject: [PATCH 30/76] Add changelog for v0.13.1 and v0.14.0 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78d1819..d7a3578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.14.0 +* Support `:tabonly` (@jmarianer) +* Fix `:x` closing Atom instead of the current pane + +## 0.13.1 +* Limit addresses to the last line +* Fix autocompleting a non existent directory (@mcnicholls) + ## 0.13.0 * Added basic support for visual marks (e.g. `:'<,'>s/foo/bar`) * Added `smartcase` option to `:set` From 28b451f33dead93b1d3ce9474759906f96b23a52 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Wed, 15 Mar 2017 15:01:12 +0100 Subject: [PATCH 31/76] Prepare 0.14.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d57a669..7fa69ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.13.1", + "version": "0.14.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From f4eb1aef7d0607f6c4d12fc0ff91cb648c1a1a0a Mon Sep 17 00:00:00 2001 From: mkiken Date: Mon, 20 Mar 2017 12:03:35 +0900 Subject: [PATCH 32/76] test package.json change. --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 7fa69ff..9f8c99d 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,11 @@ }, "consumedServices": { "vim-mode": { + "versions": { + "^0.1.0": "_consumeVim" + } + }, + "vim-mode-plus": { "versions": { "^0.1.0": "consumeVim" } From 50f1beb1e987db5f7c181c8d9c9a3af4b2b7204e Mon Sep 17 00:00:00 2001 From: mkiken Date: Mon, 20 Mar 2017 13:49:33 +0900 Subject: [PATCH 33/76] switch searchHistory --- lib/ex.coffee | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 5edf5a8..d2e9ed9 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -335,12 +335,23 @@ class Ex [pattern, substition, flags] = parsed if pattern is '' - pattern = vimState.getSearchHistoryItem() + if vimState.getSearchHistoryItem? + # vim-mode + pattern = vimState.getSearchHistoryItem() + else if vimState.searchHistory? + #vim-mode-plus + pattern = vimState.searchHistory.get('prev') + if not pattern? atom.beep() throw new CommandError('No previous regular expression') else - vimState.pushSearchHistory(pattern) + if vimState.pushSearchHistory? + # vim-mode + vimState.pushSearchHistory(pattern) + else if vimState.searchHistory? + #vim-mode-plus + vimState.searchHistory.save(pattern) try flagsObj = {} From 0abb61fcb8970658d13fb1fc42d405fbb7fb4748 Mon Sep 17 00:00:00 2001 From: mkiken Date: Mon, 20 Mar 2017 14:02:05 +0900 Subject: [PATCH 34/76] add consumeVimModePlus. --- lib/ex-mode.coffee | 3 +++ package.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/ex-mode.coffee b/lib/ex-mode.coffee index 490003e..5274e0a 100644 --- a/lib/ex-mode.coffee +++ b/lib/ex-mode.coffee @@ -36,6 +36,9 @@ module.exports = ExMode = @vim = vim @globalExState.setVim(vim) + consumeVimModePlus: (vim) -> + this.consumeVim(vim) + config: splitbelow: title: 'Split below' diff --git a/package.json b/package.json index 9f8c99d..0984409 100644 --- a/package.json +++ b/package.json @@ -21,12 +21,12 @@ "consumedServices": { "vim-mode": { "versions": { - "^0.1.0": "_consumeVim" + "^0.1.0": "consumeVim" } }, "vim-mode-plus": { "versions": { - "^0.1.0": "consumeVim" + "^0.1.0": "consumeVimModePlus" } } }, From 378cf6cff4e9db8d7af5cb3b2666c97004b08309 Mon Sep 17 00:00:00 2001 From: mkiken Date: Mon, 20 Mar 2017 14:07:44 +0900 Subject: [PATCH 35/76] comment refactoring. --- lib/ex.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index d2e9ed9..e026b96 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -339,7 +339,7 @@ class Ex # vim-mode pattern = vimState.getSearchHistoryItem() else if vimState.searchHistory? - #vim-mode-plus + # vim-mode-plus pattern = vimState.searchHistory.get('prev') if not pattern? @@ -350,7 +350,7 @@ class Ex # vim-mode vimState.pushSearchHistory(pattern) else if vimState.searchHistory? - #vim-mode-plus + # vim-mode-plus vimState.searchHistory.save(pattern) try From 02ab74465c68e9976c57a91bdc26c257e3dc0fd9 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:08:21 +0200 Subject: [PATCH 36/76] Support vim-mode-plus marks --- lib/command.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/command.coffee b/lib/command.coffee index 0cfd6f2..fcc1144 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -22,7 +22,7 @@ class Command else if str[0] is "'" # Parse Mark... unless @vimState? throw new CommandError("Couldn't get access to vim-mode.") - mark = @vimState.marks[str[1]] + mark = @vimState.mark.marks[str[1]] unless mark? throw new CommandError("Mark #{str} not set.") addr = mark.getEndBufferPosition().row From 708aa94eb0d94b3cb951ab35255739b6428f6dbe Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:08:38 +0200 Subject: [PATCH 37/76] Use vim-mode-plus in specs --- spec/ex-commands-spec.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index cc349ac..4e3d839 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -11,7 +11,7 @@ describe "the commands", -> [editor, editorElement, vimState, exState, dir, dir2] = [] projectPath = (fileName) -> path.join(dir, fileName) beforeEach -> - vimMode = atom.packages.loadPackage('vim-mode') + vimMode = atom.packages.loadPackage('vim-mode-plus') exMode = atom.packages.loadPackage('ex-mode') waitsForPromise -> activationPromise = exMode.activate() @@ -42,7 +42,6 @@ describe "the commands", -> editor = editorElement.getModel() vimState = vimMode.mainModule.getEditorState(editor) exState = exMode.mainModule.exStates.get(editor) - vimState.activateNormalMode() vimState.resetNormalMode() editor.setText("abc\ndef\nabc\ndef") From 99dd953370ded740057119fda1a4761cbd8a4b12 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:18:58 +0200 Subject: [PATCH 38/76] Use vim-mode-plus on Travis Also use Linux on Travis because there are more machines available --- .travis.yml | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a85896..e8e09d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,45 @@ -language: objective-c +## Project specific config ### +language: generic + env: - - APM_TEST_PACKAGES="vim-mode" + global: + - APM_TEST_PACKAGES="vim-mode-plus" + - ATOM_LINT_WITH_BUNDLED_NODE="true" + + matrix: + - ATOM_CHANNEL=stable + - ATOM_CHANNEL=beta + +os: + - linux + +dist: trusty + +### Generic setup follows ### +script: + - curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh + - chmod u+x build-package.sh + - ./build-package.sh notifications: email: on_success: never on_failure: change -script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh' +branches: + only: + - master git: depth: 10 + +sudo: false + +addons: + apt: + packages: + - build-essential + - git + - libgnome-keyring-dev + - libsecret-1-dev + - fakeroot From 546aa9f95c42aaa8b439d64ac85207423e54f710 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:33:11 +0200 Subject: [PATCH 39/76] Use vim-mode-plus in ex-input-spec as well --- spec/ex-input-spec.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/ex-input-spec.coffee b/spec/ex-input-spec.coffee index 3d076b9..cd7fbd0 100644 --- a/spec/ex-input-spec.coffee +++ b/spec/ex-input-spec.coffee @@ -2,7 +2,7 @@ helpers = require './spec-helper' describe "the input element", -> [editor, editorElement, vimState, exState] = [] beforeEach -> - vimMode = atom.packages.loadPackage('vim-mode') + vimMode = atom.packages.loadPackage('vim-mode-plus') exMode = atom.packages.loadPackage('ex-mode') waitsForPromise -> activationPromise = exMode.activate() @@ -26,7 +26,6 @@ describe "the input element", -> atom.commands.dispatch(getCommandEditor(), "core:cancel") vimState = vimMode.mainModule.getEditorState(editor) exState = exMode.mainModule.exStates.get(editor) - vimState.activateNormalMode() vimState.resetNormalMode() editor.setText("abc\ndef\nabc\ndef") From 9b62ba70ca6fe2d27f7d6f05946a380dcdf80c9c Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:43:49 +0200 Subject: [PATCH 40/76] Add Changelog for v0.15.0 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7a3578..d767be1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.15.0 +* `vim-mode-plus` support! + - Add keybinding (@jmarianer) + - Support `:substitute` command (@mkiken) + - Support marks + - Use `vim-mode-plus` in specs + ## 0.14.0 * Support `:tabonly` (@jmarianer) * Fix `:x` closing Atom instead of the current pane From 545f13294e925d5e7b2407aa70f41390eee1c666 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Thu, 25 May 2017 01:45:07 +0200 Subject: [PATCH 41/76] Prepare 0.15.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0984409..8dc63b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.14.0", + "version": "0.15.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From abb5cd207f025b122522aed40dffe11e08d3d9aa Mon Sep 17 00:00:00 2001 From: Sophie Haskins Date: Thu, 29 Jun 2017 10:32:17 -0400 Subject: [PATCH 42/76] use Atom 1.19 buffer API for finding the length of a buffer --- lib/command.coffee | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/command.coffee b/lib/command.coffee index fcc1144..15e74fe 100644 --- a/lib/command.coffee +++ b/lib/command.coffee @@ -14,7 +14,11 @@ class Command addr = row else if str is '$' # Lines are 0-indexed in Atom, but 1-indexed in vim. - addr = @editor.getBuffer().lines.length - 1 + # The two ways of getting length let us support Atom 1.19's new buffer + # implementation (https://github.com/atom/atom/pull/14435) and still + # support 1.18 and below + buffer = @editor.getBuffer() + addr = (buffer.getLineCount?() ? buffer.lines.length) - 1 else if str[0] in ["+", "-"] addr = row + @parseOffset(str) else if not isNaN(str) @@ -73,7 +77,9 @@ class Command return # Step 4: Address parsing - lastLine = @editor.getBuffer().lines.length - 1 + # see comment in parseAddr about line length + buffer = @editor.getBuffer() + lastLine = (buffer.getLineCount?() ? buffer.lines.length) - 1 if cl[0] is '%' range = [0, lastLine] cl = cl[1..] From dfbbdadfbcd04c3c7a89e10b73c18862b0c7e357 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:14:39 +0200 Subject: [PATCH 43/76] :memo: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d767be1..47ae57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.16.0 + +* Support for Atom 1.18 and 1.19 (#184) + ## 0.15.0 * `vim-mode-plus` support! - Add keybinding (@jmarianer) From 78a479bf9b8f9fc008d89673dfac00d9a71f273e Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:16:12 +0200 Subject: [PATCH 44/76] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47ae57c..d708c94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.16.0 -* Support for Atom 1.18 and 1.19 (#184) +* Support for Atom 1.18 and 1.19 ([#184](https://github.com/lloeki/ex-mode/pull/184)) ## 0.15.0 * `vim-mode-plus` support! From d0e7afe164f9f9b1b2d695972f8aa94ef6b4d4b6 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:17:32 +0200 Subject: [PATCH 45/76] Prepare 0.16.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8dc63b8..26d692b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.15.0", + "version": "0.16.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 3dbcf76ff79cbae59ff30054efa01d919131d414 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:18:20 +0200 Subject: [PATCH 46/76] Prepare 0.17.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26d692b..1b23c20 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.16.0", + "version": "0.17.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From f2ee5516e03696aa7b3a6bc45c622b51aa13cc7a Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:20:06 +0200 Subject: [PATCH 47/76] Prepare 0.18.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b23c20..cda6de9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.17.0", + "version": "0.18.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From eb7a23717ada8f945c5f42b694b2e05afa2d3e94 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:20:56 +0200 Subject: [PATCH 48/76] Revert back versions, apm publish strugles.. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cda6de9..8dc63b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.18.0", + "version": "0.15.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 4747bcf5e8dc212f50223799d816fee5406c96bd Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:22:18 +0200 Subject: [PATCH 49/76] :arrow_up: version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8dc63b8..26d692b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.15.0", + "version": "0.16.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From b5cb054b3976288785051b11b2a2ab6365fce32d Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 15:58:50 +0200 Subject: [PATCH 50/76] Support Promise response in trySave In Atom 1.19, TextBuffer.save returns a Promise. This commit adds support to catch this and resolve our internal callbacks when promise resolves. --- lib/ex.coffee | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index e026b96..4b13d1a 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -17,8 +17,13 @@ trySave = (func) -> deferred = defer() try - func() - deferred.resolve() + response = func() + + if response instanceof Promise + response.then -> + deferred.resolve() + else + deferred.resolve() catch error if error.message.endsWith('is a directory') atom.notifications.addWarning("Unable to save file: #{error.message}") @@ -252,7 +257,7 @@ class Ex @write(args) wq: (args) => - @write(args).then => @quit() + @write(args).then(=> @quit()) wa: => @wall() From 26ac7c50b161ec4d6a7c998f00977de9c6e3a300 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Thu, 27 Jul 2017 16:13:48 +0200 Subject: [PATCH 51/76] Support Ctrl-C to cancel ex-mode --- keymaps/ex-mode.cson | 2 ++ lib/ex-normal-mode-input-element.coffee | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/keymaps/ex-mode.cson b/keymaps/ex-mode.cson index 1c70132..6191513 100644 --- a/keymaps/ex-mode.cson +++ b/keymaps/ex-mode.cson @@ -9,5 +9,7 @@ # https://atom.io/docs/latest/advanced/keymaps 'atom-text-editor.vim-mode-plus:not(.insert-mode)': ':': 'ex-mode:open' +'atom-text-editor.ex-mode-editor': + 'ctrl-c': 'ex-mode:close' 'atom-text-editor.vim-mode:not(.insert-mode)': ':': 'ex-mode:open' diff --git a/lib/ex-normal-mode-input-element.coffee b/lib/ex-normal-mode-input-element.coffee index 73ca3da..915a5be 100644 --- a/lib/ex-normal-mode-input-element.coffee +++ b/lib/ex-normal-mode-input-element.coffee @@ -15,7 +15,8 @@ class ExCommandModeInputElement extends HTMLDivElement @editorContainer.style.height = "0px" @editorElement = document.createElement "atom-text-editor" - @editorElement.classList.add('editor') + @editorElement.classList.add('editor') # Consider this deprecated! + @editorElement.classList.add('ex-mode-editor') @editorElement.getModel().setMini(true) @editorElement.setAttribute('mini', '') @editorContainer.appendChild(@editorElement) @@ -40,6 +41,7 @@ class ExCommandModeInputElement extends HTMLDivElement atom.commands.add(@editorElement, 'core:confirm', @confirm.bind(this)) atom.commands.add(@editorElement, 'core:cancel', @cancel.bind(this)) + atom.commands.add(@editorElement, 'ex-mode:close', @cancel.bind(this)) atom.commands.add(@editorElement, 'blur', @cancel.bind(this)) backspace: -> From 9f1a767fece7b7d64c0708edc6bff9fbfa53f4e3 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Fri, 28 Jul 2017 14:28:03 +0200 Subject: [PATCH 52/76] :memo: update changeling --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d708c94..3dc73c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.17.0 (Unreleased) + +* Added support for canceling ex-mode with Ctrl-C ([#186](https://github.com/lloeki/ex-mode/pull/186)) + ## 0.16.0 * Support for Atom 1.18 and 1.19 ([#184](https://github.com/lloeki/ex-mode/pull/184)) From daddcf8d0fb6baece4be035da601ea3edaedee92 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 29 Jul 2017 17:38:07 +0200 Subject: [PATCH 53/76] add editorconfig --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..33224b4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true + +[*.{coffee,json}] +indent_style = space +indent_size = 2 From 91f748f85f1e4bafc05cf1925df2ad8b1ecc92d7 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 29 Jul 2017 17:40:59 +0200 Subject: [PATCH 54/76] fix indenting --- lib/ex.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 4b13d1a..2923602 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -20,10 +20,10 @@ trySave = (func) -> response = func() if response instanceof Promise - response.then -> - deferred.resolve() - else + response.then -> deferred.resolve() + else + deferred.resolve() catch error if error.message.endsWith('is a directory') atom.notifications.addWarning("Unable to save file: #{error.message}") From 3283b723942a43eac83cff084bfcbd29b29990ef Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 29 Jul 2017 17:41:38 +0200 Subject: [PATCH 55/76] :memo: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dc73c9..43b94cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 0.17.0 (Unreleased) +* Add support for Atom 1.19 ([#185](https://github.com/lloeki/ex-mode/pull/185)) * Added support for canceling ex-mode with Ctrl-C ([#186](https://github.com/lloeki/ex-mode/pull/186)) ## 0.16.0 From 8590f5a67877951f29fc2c1da663efdfddb0aef2 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 29 Jul 2017 17:49:40 +0200 Subject: [PATCH 56/76] :arrow_up: 1.17.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43b94cc..8c0e973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.17.0 (Unreleased) +## 0.17.0 * Add support for Atom 1.19 ([#185](https://github.com/lloeki/ex-mode/pull/185)) * Added support for canceling ex-mode with Ctrl-C ([#186](https://github.com/lloeki/ex-mode/pull/186)) diff --git a/package.json b/package.json index 26d692b..1b23c20 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.16.0", + "version": "0.17.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 117d7439ad5ae59f0192cc0999334998ae0f7728 Mon Sep 17 00:00:00 2001 From: Robby Date: Sun, 6 Aug 2017 21:23:41 -0500 Subject: [PATCH 57/76] Adds save ex-mode command --- lib/ex.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/ex.coffee b/lib/ex.coffee index e026b96..6913b52 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -133,6 +133,7 @@ class Ex qall: => @quitall() + tabedit: (args) => if args.args.trim() isnt '' @edit(args) @@ -437,4 +438,11 @@ class Ex throw new CommandError("No such option: #{option}") optionProcessor() + sort: ({ range }) => + range = [[range[0], 0], [range[1] + 1, 0]] + editor = atom.workspace.getActiveTextEditor() + text = editor.getTextInBufferRange(range) + sortedText = _.sortBy(text.split(/\n/)).join('\n') + editor.buffer.setTextInRange(range, sortedText) + module.exports = Ex From 15296ff369b87400975ff308487ae05809a31ed8 Mon Sep 17 00:00:00 2001 From: Robby Date: Sun, 6 Aug 2017 21:24:22 -0500 Subject: [PATCH 58/76] Removes accidental newline --- lib/ex.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 6913b52..16f74f9 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -133,7 +133,6 @@ class Ex qall: => @quitall() - tabedit: (args) => if args.args.trim() isnt '' @edit(args) From 43127775084196b1bdbd3038e272a4abaffeefab Mon Sep 17 00:00:00 2001 From: Robby Date: Sun, 6 Aug 2017 23:22:13 -0500 Subject: [PATCH 59/76] Modifies sort function and adds a unit test --- lib/ex.coffee | 17 +++++++++++++---- spec/ex-commands-spec.coffee | 10 ++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 16f74f9..46ab42b 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -438,10 +438,19 @@ class Ex optionProcessor() sort: ({ range }) => - range = [[range[0], 0], [range[1] + 1, 0]] editor = atom.workspace.getActiveTextEditor() - text = editor.getTextInBufferRange(range) - sortedText = _.sortBy(text.split(/\n/)).join('\n') - editor.buffer.setTextInRange(range, sortedText) + sortingRange = [[]] + isMultiLine = range[1] - range[0] > 1 + if isMultiLine + sortingRange = [[range[0], 0], [range[1] + 1, 0]] + else + sortingRange = [[0, 0], [editor.getLastBufferRow(), 0]] + + textLines = [] + for lineIndex in [sortingRange[0][0]..sortingRange[1][0] - 1] + textLines.push(editor.lineTextForBufferRow(lineIndex)) + + sortedText = _.sortBy(textLines).join('\n') + '\n' + editor.buffer.setTextInRange(sortingRange, sortedText) module.exports = Ex diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 4e3d839..2d9facc 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -983,3 +983,13 @@ describe "the commands", -> expect(calls.length).toEqual 2 expect(calls[0].args[0].range).toEqual [0, 2] expect(calls[1].args[0].range).toEqual [3, 3] + + desctibe ':sort', -> + beforeEach -> + editor.setText('ghi\nabc\njkl\ndef\n') + editor.setCursorBufferPosition([0, 0]) + + it "sorts entire file if range is not multi-line", -> + openEx() + submitNormalModeInputText('sort') + expect(atom.getText()).toEqual('abc\ndef\nghi\njkl\n') From d76940dabc05ef7967ecdce5d69cd4b351285c0e Mon Sep 17 00:00:00 2001 From: Robby Date: Sun, 6 Aug 2017 23:40:06 -0500 Subject: [PATCH 60/76] Adds another unit test --- spec/ex-commands-spec.coffee | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 2d9facc..2eb252a 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -984,12 +984,17 @@ describe "the commands", -> expect(calls[0].args[0].range).toEqual [0, 2] expect(calls[1].args[0].range).toEqual [3, 3] - desctibe ':sort', -> + describe ':sort', -> beforeEach -> - editor.setText('ghi\nabc\njkl\ndef\n') + editor.setText('ghi\nabc\njkl\ndef\n142\nzzz\n91xfds9\n') editor.setCursorBufferPosition([0, 0]) it "sorts entire file if range is not multi-line", -> openEx() submitNormalModeInputText('sort') - expect(atom.getText()).toEqual('abc\ndef\nghi\njkl\n') + expect(editor.getText()).toEqual('142\n91xfds9\nabc\ndef\nghi\njkl\nzzz\n') + + it "sorts specific range if range is multi-line", -> + openEx() + submitNormalModeInputText('2,4sort') + expect(editor.getText()).toEqual('ghi\nabc\ndef\njkl\n142\nzzz\n91xfds9\n') From 791c62a3bad988d977a177cac7f76a1adedb0ba5 Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Tue, 8 Aug 2017 14:02:29 -0500 Subject: [PATCH 61/76] Adds clarification comments --- lib/ex.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ex.coffee b/lib/ex.coffee index 46ab42b..c84fbbf 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -440,16 +440,20 @@ class Ex sort: ({ range }) => editor = atom.workspace.getActiveTextEditor() sortingRange = [[]] + + # If no range is provided, the entire file should be sorted. isMultiLine = range[1] - range[0] > 1 if isMultiLine sortingRange = [[range[0], 0], [range[1] + 1, 0]] else sortingRange = [[0, 0], [editor.getLastBufferRow(), 0]] + # Store every bufferedRow string in an array. textLines = [] for lineIndex in [sortingRange[0][0]..sortingRange[1][0] - 1] textLines.push(editor.lineTextForBufferRow(lineIndex)) + # Sort the array and join them together with newlines for writing back to the file. sortedText = _.sortBy(textLines).join('\n') + '\n' editor.buffer.setTextInRange(sortingRange, sortedText) From 23be6cc862f269d2a0c0cd1d9cd0b6e7d150bfc2 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Tue, 8 Aug 2017 21:12:55 +0200 Subject: [PATCH 62/76] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c0e973..bc87c40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## (unpublished) + +* Add :sort command ([#190](https://github.com/lloeki/ex-mode/pull/190)) + ## 0.17.0 * Add support for Atom 1.19 ([#185](https://github.com/lloeki/ex-mode/pull/185)) From 2fa4584eb44d4b0c92952863e2eebdeefa91118f Mon Sep 17 00:00:00 2001 From: mkiken Date: Sun, 13 Aug 2017 16:08:28 +0900 Subject: [PATCH 63/76] add gdefault option --- lib/ex-mode.coffee | 5 +++++ lib/vim-option.coffee | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/lib/ex-mode.coffee b/lib/ex-mode.coffee index 5274e0a..c627483 100644 --- a/lib/ex-mode.coffee +++ b/lib/ex-mode.coffee @@ -50,3 +50,8 @@ module.exports = ExMode = description: 'when splitting, split from right' type: 'boolean' default: 'false' + gdefault: + title: 'Gdefault' + description: 'When on, the ":substitute" flag \'g\' is default on' + type: 'boolean' + default: 'false' diff --git a/lib/vim-option.coffee b/lib/vim-option.coffee index ddf4688..223395f 100644 --- a/lib/vim-option.coffee +++ b/lib/vim-option.coffee @@ -56,4 +56,10 @@ class VimOption noscs: => @nosmartcase() + gdefault: => + atom.config.set("ex-mode.gdefault", true) + + nogdefault: => + atom.config.set("ex-mode.gdefault", false) + module.exports = VimOption From 964813a0b0d5c45bbd93f1a4295071082c3eaf0a Mon Sep 17 00:00:00 2001 From: mkiken Date: Sun, 13 Aug 2017 16:37:00 +0900 Subject: [PATCH 64/76] implement gdefault option --- lib/ex.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index a1e5ad3..cbc7857 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -18,7 +18,7 @@ trySave = (func) -> try response = func() - + if response instanceof Promise response.then -> deferred.resolve() @@ -361,6 +361,9 @@ class Ex try flagsObj = {} flags.split('').forEach((flag) -> flagsObj[flag] = true) + # gdefault option + if atom.config.get('ex-mode.gdefault') + flagsObj.g = !flagsObj.g patternRE = getSearchTerm(pattern, flagsObj) catch e if e.message.indexOf('Invalid flags supplied to RegExp constructor') is 0 From 1a515fcb056db8d6bc09d6f1cf45a040440b9bf2 Mon Sep 17 00:00:00 2001 From: mkiken Date: Sun, 13 Aug 2017 16:47:28 +0900 Subject: [PATCH 65/76] gdefault option set test --- spec/ex-commands-spec.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 2eb252a..438bbd7 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -944,6 +944,14 @@ describe "the commands", -> submitNormalModeInputText(':set nosmartcase') expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(false) + it "sets (no)gdefault", -> + openEx() + submitNormalModeInputText(':set gdefault') + expect(atom.config.get('ex-mode.gdefault')).toBe(true) + atom.commands.dispatch(editorElement, 'ex-mode:open') + submitNormalModeInputText(':set nogdefault') + expect(atom.config.get('ex-mode.gdefault')).toBe(false) + describe "aliases", -> it "calls the aliased function without arguments", -> ExClass.registerAlias('W', 'w') From d0059a7bb20c7e5716890cec2e76f2c92815f276 Mon Sep 17 00:00:00 2001 From: mkiken Date: Sun, 13 Aug 2017 16:57:11 +0900 Subject: [PATCH 66/76] gdefault option implementation test --- spec/ex-commands-spec.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 438bbd7..49469d0 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -715,6 +715,12 @@ describe "the commands", -> submitNormalModeInputText(':%substitute/abc/ghi/ig') expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nghiaghi') + it "set gdefault option", -> + openEx() + atom.config.set('ex-mode.gdefault', true) + submitNormalModeInputText(':substitute/a/x/g') + expect(editor.getText()).toEqual('xbcaABC\ndefdDEF\nabcaABC') + describe ":yank", -> beforeEach -> editor.setText('abc\ndef\nghi\njkl') From c75395174fa64232e2bc7973b795c17aaf3166e5 Mon Sep 17 00:00:00 2001 From: mkiken Date: Sun, 13 Aug 2017 17:18:26 +0900 Subject: [PATCH 67/76] add gdefault option implementation test --- spec/ex-commands-spec.coffee | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee index 49469d0..29f211e 100644 --- a/spec/ex-commands-spec.coffee +++ b/spec/ex-commands-spec.coffee @@ -718,6 +718,11 @@ describe "the commands", -> it "set gdefault option", -> openEx() atom.config.set('ex-mode.gdefault', true) + submitNormalModeInputText(':substitute/a/x') + expect(editor.getText()).toEqual('xbcxABC\ndefdDEF\nabcaABC') + + atom.commands.dispatch(editorElement, 'ex-mode:open') + atom.config.set('ex-mode.gdefault', true) submitNormalModeInputText(':substitute/a/x/g') expect(editor.getText()).toEqual('xbcaABC\ndefdDEF\nabcaABC') From 146d832e14ab0b2db75135aa5933df1b47733d4c Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Tue, 15 Aug 2017 21:33:13 +0200 Subject: [PATCH 68/76] Update CHANGELOG.md [ci skip] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc87c40..c6c943c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## (unpublished) +* Add Gdefault support ([#191](https://github.com/lloeki/ex-mode/pull/191)) * Add :sort command ([#190](https://github.com/lloeki/ex-mode/pull/190)) ## 0.17.0 From 93d0af041fa997ed740b525cb0defd863c37986a Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 19 Aug 2017 09:43:43 +0200 Subject: [PATCH 69/76] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6c943c..41dfadf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## (unpublished) +## 0.18.0 + * Add Gdefault support ([#191](https://github.com/lloeki/ex-mode/pull/191)) * Add :sort command ([#190](https://github.com/lloeki/ex-mode/pull/190)) From 653d62ec1500934750dd8dcd4a528e978fbdee10 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Sat, 19 Aug 2017 09:44:09 +0200 Subject: [PATCH 70/76] Prepare 0.18.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b23c20..cda6de9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ex-mode", "main": "./lib/ex-mode", - "version": "0.17.0", + "version": "0.18.0", "description": "Ex for Atom's vim-mode", "activationCommands": { "atom-workspace": "ex-mode:open" From 4f1ebf8a1a8d5e2e32d099c54656867cd42938af Mon Sep 17 00:00:00 2001 From: Bernard Laveaux Date: Tue, 17 Oct 2017 16:31:54 -0400 Subject: [PATCH 71/76] Support Ctrl-[ to close ex-mode This is merely a suggestion to also default the `ctrl-[` keymap to close ex-mode. This behaviour is very similar to vim's default behaviour: ``` CTRL-[ *c_CTRL-[* *c_* *c_Esc* When typed and 'x' not present in 'cpoptions', quit Command-line mode without executing. In macros or when 'x' present in 'cpoptions', start entered command. Note: If your key is hard to hit on your keyboard, train yourself to use CTRL-[. ``` Is very similar to the currently supported `ctrl-c` ``` CTRL-C *c_CTRL-C* quit command-line without executing ``` --- keymaps/ex-mode.cson | 1 + 1 file changed, 1 insertion(+) diff --git a/keymaps/ex-mode.cson b/keymaps/ex-mode.cson index 6191513..a071efd 100644 --- a/keymaps/ex-mode.cson +++ b/keymaps/ex-mode.cson @@ -11,5 +11,6 @@ ':': 'ex-mode:open' 'atom-text-editor.ex-mode-editor': 'ctrl-c': 'ex-mode:close' + 'ctrl-[': 'ex-mode:close' 'atom-text-editor.vim-mode:not(.insert-mode)': ':': 'ex-mode:open' From 15038d7b0cf9cea653d5ed1a04eb2cfe23106dd6 Mon Sep 17 00:00:00 2001 From: Adrian Wilkins Date: Mon, 26 Mar 2018 13:24:05 +0100 Subject: [PATCH 72/76] Only close buffers on quitall --- lib/ex-mode.coffee | 5 +++++ lib/ex.coffee | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/ex-mode.coffee b/lib/ex-mode.coffee index c627483..d8fc766 100644 --- a/lib/ex-mode.coffee +++ b/lib/ex-mode.coffee @@ -55,3 +55,8 @@ module.exports = ExMode = description: 'When on, the ":substitute" flag \'g\' is default on' type: 'boolean' default: 'false' + onlyCloseBuffers: + title: 'Only close buffers' + description: 'When on, quitall only closes all buffers, not entire Atom instance' + type: 'boolean' + default: 'false' diff --git a/lib/ex.coffee b/lib/ex.coffee index cbc7857..a266afb 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -132,7 +132,11 @@ class Ex atom.workspace.getActivePane().destroyActiveItem() quitall: -> - atom.close() + if !atom.config.get('ex-mode.onlyCloseBuffers') + atom.close() + else + atom.workspace.getTextEditors().forEach (editor) -> + editor.destroy() q: => @quit() From a33959f82996617f10afac096120d842d04035f2 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Tue, 29 May 2018 23:09:45 +0200 Subject: [PATCH 73/76] Fix :enew not working Fixes #214 --- lib/ex.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index a266afb..58b0ebb 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -3,6 +3,7 @@ CommandError = require './command-error' fs = require 'fs-plus' VimOption = require './vim-option' _ = require 'underscore-plus' +atom defer = () -> deferred = {} @@ -210,9 +211,7 @@ class Ex e: (args) => @edit(args) enew: -> - buffer = atom.workspace.getActiveTextEditor().buffer - buffer.setPath(undefined) - buffer.load() + atom.workspace.open() write: ({ range, args, editor, saveas }) -> saveas ?= false From 23dde8c7ee9b778d75deaf33ac0fe3449b68f8b7 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Tue, 29 May 2018 23:14:45 +0200 Subject: [PATCH 74/76] :memo: update CHANGELOG [ci skip] --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41dfadf..30a0532 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## (unpublished) +* Fix `:enew` not working ([#215](https://github.com/lloeki/ex-mode/pull/215)) + ## 0.18.0 * Add Gdefault support ([#191](https://github.com/lloeki/ex-mode/pull/191)) From 744ec7351e5a27991d44db38918210d32c50d964 Mon Sep 17 00:00:00 2001 From: Edvin Hultberg Date: Tue, 29 May 2018 23:55:46 +0200 Subject: [PATCH 75/76] Refactor :write command Update the logic to simplify it. Also fix #208 --- lib/ex.coffee | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/lib/ex.coffee b/lib/ex.coffee index 58b0ebb..b262023 100644 --- a/lib/ex.coffee +++ b/lib/ex.coffee @@ -229,29 +229,30 @@ class Ex deferred = defer() editor = atom.workspace.getActiveTextEditor() - saved = false + + # Case 1; path is provided if filePath.length isnt 0 - fullPath = getFullPath(filePath) - if editor.getPath()? and (not fullPath? or editor.getPath() == fullPath) - if saveas - throw new CommandError("Argument required") - else - # Use editor.save when no path is given or the path to the file is given - trySave(-> editor.save()).then(deferred.resolve) - saved = true - else if not fullPath? - fullPath = atom.showSaveDialogSync() + fullPath = getFullPath filePath - if not saved and fullPath? - if not force and fs.existsSync(fullPath) - throw new CommandError("File exists (add ! to override)") - if saveas or editor.getFileName() == null - editor = atom.workspace.getActiveTextEditor() - trySave(-> editor.saveAs(fullPath, editor)).then(deferred.resolve) - else - trySave(-> saveAs(fullPath, editor)).then(deferred.resolve) + # Only write when it does not exist or we have a force flag set. + if force or not fs.existsSync(fullPath) + editor.saveAs(fullPath) + return deferred.promise - deferred.promise + throw new CommandError("File exists (add ! to override)") + + # Case 2; no path provided, call editor save. + editor = atom.workspace.getActiveTextEditor() + + # Does the current buffer exist? + if editor.getPath()? and fs.existsSync(editor.getPath()) + trySave(-> editor.save()).then(deferred.promise) + else + # Cant see what the better API is but Pane.saveActiveItemAs() is the only call + # I could find that states it will ask the user. + trySave(-> atom.workspace.getActivePane().saveActiveItemAs()).then(deferred.promise) + + return deferred.promise wall: -> atom.workspace.saveAll() From 59cafd6b994467c91ed7004a40b3cd743f472474 Mon Sep 17 00:00:00 2001 From: Sarang Joshi Date: Thu, 13 Dec 2018 14:39:51 -0800 Subject: [PATCH 76/76] Add existing command information to README --- README.md | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) mode change 100644 => 100755 README.md diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 3f247de..ea4a068 --- a/README.md +++ b/README.md @@ -30,7 +30,34 @@ atom.packages.onDidActivatePackage (pack) -> Ex.registerAlias 'Wq', 'wq' ``` -See `lib/ex.coffee` for some examples commands. Contributions are very welcome! +## Existing commands + +This is the baseline list of commands supported in `ex-mode`. + +| Command | Operation | +| --------------------------------------- | ---------------------------------- | +| `q/quit/tabc/tabclose` | Close active tab | +| `qall/quitall` | Close all tabs | +| `tabe/tabedit/tabnew` | Open new tab | +| `e/edit/tabe/tabedit/tabnew ` | Edit given file | +| `tabn/tabnext` | Go to next tab | +| `tabp/tabprevious` | Go to previous tab | +| `tabo/tabonly` | Close other tabs | +| `w/write` | Save active tab | +| `w/write/saveas ` | Save as | +| `wall/wa` | Save all tabs | +| `sp/split` | Split window | +| `sp/split ` | Open file in split window | +| `s/substitute` | Substitute regular expression in active line | +| `vsp/vsplit` | Vertical split window | +| `vsp/vsplit ` | Open file in vertical split window | +| `delete` | Cut active line | +| `yank` | Copy active line | +| `set ` | Set options | +| `sort` | Sort all lines in file | +| `sort ` | Sort lines in line range | + +See `lib/ex.coffee` for the implementations of these commands. Contributions are very welcome! ## Status