From 1f2f399c8663d31043b591a03ce561215d233052 Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Thu, 13 Oct 2016 05:44:12 +0000 Subject: [PATCH 01/10] Replace uppercase with with shift-lowercase --- keymaps/find-and-replace.cson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/find-and-replace.cson b/keymaps/find-and-replace.cson index 8242e5b7..d54b3da3 100644 --- a/keymaps/find-and-replace.cson +++ b/keymaps/find-and-replace.cson @@ -1,5 +1,5 @@ '.platform-darwin': - 'cmd-F': 'project-find:show' + 'cmd-shift-f': 'project-find:show' 'cmd-f': 'find-and-replace:show' 'cmd-alt-f': 'find-and-replace:show-replace' @@ -7,13 +7,13 @@ 'alt-a': 'project-find:show-in-current-directory' '.platform-win32, .platform-linux': - 'ctrl-F': 'project-find:show' + 'ctrl-shift-f': 'project-find:show' 'ctrl-f': 'find-and-replace:show' 'ctrl-alt-f': 'find-and-replace:show-replace' '.platform-darwin atom-text-editor': 'cmd-g': 'find-and-replace:find-next' - 'cmd-G': 'find-and-replace:find-previous' + 'cmd-shift-g': 'find-and-replace:find-previous' 'cmd-f3': 'find-and-replace:find-next-selected' 'cmd-shift-f3': 'find-and-replace:find-previous-selected' 'cmd-ctrl-g': 'find-and-replace:select-all' From 064710b09e2bc7172fe3d38bd257ef1965d11078 Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Thu, 13 Oct 2016 06:53:21 +0000 Subject: [PATCH 02/10] Add commands and keybindings --- README.md | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 644fd21d..55489ebb 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,47 @@ # Find and Replace package -[![OS X Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/6w4baiiq5mw4nxky/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/find-and-replace/branch/master) [![Dependency Status](https://david-dm.org/atom/find-and-replace.svg)](https://david-dm.org/atom/find-and-replace) +[![macOS Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/6w4baiiq5mw4nxky/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/find-and-replace/branch/master) [![Dependency Status](https://david-dm.org/atom/find-and-replace.svg)](https://david-dm.org/atom/find-and-replace) Find and replace in the current buffer or across the entire project in Atom. ## Find in buffer -Using the shortcut cmd-f (Mac) or ctrl-f (Windows and Linux). +Using the shortcut cmd-f (macOS) or ctrl-f (Windows and Linux). ![screen shot 2013-11-26 at 12 25 22 pm](https://f.cloud.github.com/assets/69169/1625938/a859fa70-56d9-11e3-8b2a-ac37c5033159.png) ## Find in project -Using the shortcut cmd-shift-f (Mac) or ctrl-shift-f (Windows and Linux). +Using the shortcut cmd-shift-f (macOS) or ctrl-shift-f (Windows and Linux). ![screen shot 2013-11-26 at 12 26 02 pm](https://f.cloud.github.com/assets/69169/1625945/b216d7b8-56d9-11e3-8b14-6afc33467be9.png) +## Commands and Keybindings +|Command|Description|Keybinding (Linux)|Keybinding (macOS)|Keybinding (Windows)| +|-------|-----------|------------------|-----------------|--------------------| +|`project-find:show`|Show the project find and replace dialog|ctrl-shift-f|cmd-shift-f|ctrl-shift-f| +|`project-find:confirm`|Find the next occurence of the phrase||cmd-enter|ctrl-enter| +|`project-find:toggle-regex-option`|Toggle the "regex" option||cmd-alt-/|ctrl-alt-/| +|`project-find:toggle-case-option`|Toggle the "match case" option||cmd-alt-c|ctrl-alt-c| +|`project-find:toggle-whole-word-option`|Toggle the "whold word" option||cmd-alt-w|ctrl-alt-w| +|`project-find:replace-all`|Replace all occurences of the phrase|ctrl-enter|cmd-enter|ctrl-enter| +|`find-and-replace:show`|Show the buffer find and replace dialog|ctrl-f|cmd-f|ctrl-f| +|`find-and-replace:show-replace`|Toggle the buffer find and replace dialog and focuses the replace text box|ctrl-alt-f|cmd-alt-f|ctrl-alt-f| +|`find-and-replace:confirm`|Find the next occurence of the phrase||cmd-enter|ctrl-enter| +|`find-and-replace:toggle-regex-option`|Toggle the "regex" option||cmd-alt-/|ctrl-alt-/| +|`find-and-replace:toggle-case-option`|Toggle the "match case" option||cmd-alt-c|ctrl-alt-c| +|`find-and-replace:toggle-selection-option`|Toggle the "obly in selection" option||cmd-alt-s|ctrl-alt-s| +|`find-and-replace:toggle-whole-word-option`|Toggle the "whold word" option||cmd-alt-w|ctrl-alt-s| +|`find-and-replace:find-all`|Find all occurences of the pharase|ctrl-enter|cmd-enter|ctrl-enter| +|`find-and-replace:find-next`|Find the next occurence of the phrase|f3|cmd-g|f3| +|`find-and-replace:find-previous`|Find the previous occurence of the phrase|shift-f3|cmd-shift-g|shift-f3| +|`find-and-replace:find-next-selected`|Find the next occurence of the phrase selected|ctrl-f3|cmd-f3|ctrl-f3| +|`find-and-replace:find-previous-selected`|Find the previous occurence of the phrase selected|ctrl-shift-f3|cmd-shift-f3|ctrl-shift-f3| +|`find-and-replace:select-all`|Select all occurences of the phrase|alt-f3|cmd-ctrl-g|alt-f3| +|`find-and-replace:select-next`|Select the next occurence of the phrase|ctrl-d|cmd-d|ctrl-d| +|`find-and-replace:select-undo`|Undo the last selection|ctrl-u|cmd-u|ctrl-u| +|`find-and-replace:select-skip`|Skip the current selection|ctrl-k ctrl-d|cmd-k cmd-u|ctrl-k ctrl-u| +|`find-and-replace:focus-next`|Focus the next text box in the find and replace dialog|tab|tab|tab| +|`find-and-replace:focus-previous`|Focus the previous text box in the find and replace dialog|shift-tab|shift-tab|shift-tab| +|`find-and-replace:replace-all`|Replace all occurences of the phrase|ctrl-enter|cmd-enter|ctrl-enter| + ## Provided Service If you need access the marker layer containing result markers for a given editor, use the `find-and-replace@0.0.1` service. The service exposes one method, `resultsMarkerLayerForTextEditor`, which takes a `TextEditor` and returns a `TextEditorMarkerLayer` that you can interact with. Keep in mind that any work you do in synchronous event handlers on this layer will impact the performance of find and replace. From 20f40308f954e719242490201d1068858eb3ccc9 Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Sun, 16 Oct 2016 14:05:03 +0000 Subject: [PATCH 03/10] Update information [ci skip] --- README.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 55489ebb..f55c6b0d 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,22 @@ Find and replace in the current buffer or across the entire project in Atom. -## Find in buffer +![Find in buffer](https://f.cloud.github.com/assets/69169/1625938/a859fa70-56d9-11e3-8b2a-ac37c5033159.png) -Using the shortcut cmd-f (macOS) or ctrl-f (Windows and Linux). -![screen shot 2013-11-26 at 12 25 22 pm](https://f.cloud.github.com/assets/69169/1625938/a859fa70-56d9-11e3-8b2a-ac37c5033159.png) +![Find in project](https://f.cloud.github.com/assets/69169/1625945/b216d7b8-56d9-11e3-8b14-6afc33467be9.png) -## Find in project +## Usage +You can open find and replace for each individual buffer by navigating to _Find > Find in Buffer_ or find and replace for an entire project by navigating to _Find > Find in Project_. To close, press _Find in Buffer_ or _Find in Project_ again, respectively. -Using the shortcut cmd-shift-f (macOS) or ctrl-shift-f (Windows and Linux). -![screen shot 2013-11-26 at 12 26 02 pm](https://f.cloud.github.com/assets/69169/1625945/b216d7b8-56d9-11e3-8b14-6afc33467be9.png) +Once opened, the first text box is used to find phrases that can also be replaced by content in the second text box. `Replace All` will replace all instances of the first text box's text. If using find in project, there is also an additional text box that allows you to specify which directories/files are to be searched. + +There are also multiple options available while using find and replace: +* `.*` - Use Regex +* `Aa` - Match case +* `"` - Only in selection (not available for find in project) +* `\b` - Whole word (not available for find in project) + +Want to learn more? Check out the [Using Atom: Find and Replace](http://flight-manual.atom.io/using-atom/sections/find-and-replace) section in the Atom flight manual. ## Commands and Keybindings |Command|Description|Keybinding (Linux)|Keybinding (macOS)|Keybinding (Windows)| @@ -42,6 +49,8 @@ Using the shortcut cmd-shift-f (macOS) or ctrl-shift-f (Wi |`find-and-replace:focus-previous`|Focus the previous text box in the find and replace dialog|shift-tab|shift-tab|shift-tab| |`find-and-replace:replace-all`|Replace all occurences of the phrase|ctrl-enter|cmd-enter|ctrl-enter| -## Provided Service +## Contributing +Always feel free to help out! Whether it's [filing bugs and feature requests](https://github.com/atom/find-and-replace/issues/new) or working on some of the [open issues](https://github.com/atom/find-and-replace/issues), Atom's [contributing guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md) will help get you started while the [guide for contributing to packages](https://github.com/atom/atom/blob/master/docs/contributing-to-packages.md) has some extra information. -If you need access the marker layer containing result markers for a given editor, use the `find-and-replace@0.0.1` service. The service exposes one method, `resultsMarkerLayerForTextEditor`, which takes a `TextEditor` and returns a `TextEditorMarkerLayer` that you can interact with. Keep in mind that any work you do in synchronous event handlers on this layer will impact the performance of find and replace. +## License +MIT License. See [the license](LICENSE.md) for more details. From 6081ead2e15090f234a12b293b16e77b42eae34e Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Tue, 8 Nov 2016 21:26:29 +0700 Subject: [PATCH 04/10] More keybindings --- keymaps/find-and-replace.cson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/find-and-replace.cson b/keymaps/find-and-replace.cson index d54b3da3..67fe4838 100644 --- a/keymaps/find-and-replace.cson +++ b/keymaps/find-and-replace.cson @@ -1,5 +1,5 @@ '.platform-darwin': - 'cmd-shift-f': 'project-find:show' + 'cmd-shift-f cmd-F': 'project-find:show' 'cmd-f': 'find-and-replace:show' 'cmd-alt-f': 'find-and-replace:show-replace' @@ -7,13 +7,13 @@ 'alt-a': 'project-find:show-in-current-directory' '.platform-win32, .platform-linux': - 'ctrl-shift-f': 'project-find:show' + 'ctrl-shift-f ctrl-F': 'project-find:show' 'ctrl-f': 'find-and-replace:show' 'ctrl-alt-f': 'find-and-replace:show-replace' '.platform-darwin atom-text-editor': 'cmd-g': 'find-and-replace:find-next' - 'cmd-shift-g': 'find-and-replace:find-previous' + 'cmd-shift-g cmd-G': 'find-and-replace:find-previous' 'cmd-f3': 'find-and-replace:find-next-selected' 'cmd-shift-f3': 'find-and-replace:find-previous-selected' 'cmd-ctrl-g': 'find-and-replace:select-all' From f4c4760e8620153f46bd2a4b1d668f91353ba32b Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 9 Nov 2016 00:44:56 +0700 Subject: [PATCH 05/10] Revert keybindings --- keymaps/find-and-replace.cson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/find-and-replace.cson b/keymaps/find-and-replace.cson index 67fe4838..d54b3da3 100644 --- a/keymaps/find-and-replace.cson +++ b/keymaps/find-and-replace.cson @@ -1,5 +1,5 @@ '.platform-darwin': - 'cmd-shift-f cmd-F': 'project-find:show' + 'cmd-shift-f': 'project-find:show' 'cmd-f': 'find-and-replace:show' 'cmd-alt-f': 'find-and-replace:show-replace' @@ -7,13 +7,13 @@ 'alt-a': 'project-find:show-in-current-directory' '.platform-win32, .platform-linux': - 'ctrl-shift-f ctrl-F': 'project-find:show' + 'ctrl-shift-f': 'project-find:show' 'ctrl-f': 'find-and-replace:show' 'ctrl-alt-f': 'find-and-replace:show-replace' '.platform-darwin atom-text-editor': 'cmd-g': 'find-and-replace:find-next' - 'cmd-shift-g cmd-G': 'find-and-replace:find-previous' + 'cmd-shift-g': 'find-and-replace:find-previous' 'cmd-f3': 'find-and-replace:find-next-selected' 'cmd-shift-f3': 'find-and-replace:find-previous-selected' 'cmd-ctrl-g': 'find-and-replace:select-all' From f4b2e0c69d109da8532d15dac7e27035abfd66fc Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 9 Nov 2016 21:12:52 +0700 Subject: [PATCH 06/10] Update keybindings --- keymaps/find-and-replace.cson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/find-and-replace.cson b/keymaps/find-and-replace.cson index d54b3da3..dbff6ac0 100644 --- a/keymaps/find-and-replace.cson +++ b/keymaps/find-and-replace.cson @@ -1,5 +1,5 @@ '.platform-darwin': - 'cmd-shift-f': 'project-find:show' + 'cmd-shift-F': 'project-find:show' 'cmd-f': 'find-and-replace:show' 'cmd-alt-f': 'find-and-replace:show-replace' @@ -7,13 +7,13 @@ 'alt-a': 'project-find:show-in-current-directory' '.platform-win32, .platform-linux': - 'ctrl-shift-f': 'project-find:show' + 'ctrl-shift-F': 'project-find:show' 'ctrl-f': 'find-and-replace:show' 'ctrl-alt-f': 'find-and-replace:show-replace' '.platform-darwin atom-text-editor': 'cmd-g': 'find-and-replace:find-next' - 'cmd-shift-g': 'find-and-replace:find-previous' + 'cmd-shift-G': 'find-and-replace:find-previous' 'cmd-f3': 'find-and-replace:find-next-selected' 'cmd-shift-f3': 'find-and-replace:find-previous-selected' 'cmd-ctrl-g': 'find-and-replace:select-all' From 544f0074e60a35986af009d775b9b191ddd30cfa Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 9 Nov 2016 21:18:15 +0700 Subject: [PATCH 07/10] :memo: Update keybindings [ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f55c6b0d..129cb5bb 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Want to learn more? Check out the [Using Atom: Find and Replace](http://flight- ## Commands and Keybindings |Command|Description|Keybinding (Linux)|Keybinding (macOS)|Keybinding (Windows)| |-------|-----------|------------------|-----------------|--------------------| -|`project-find:show`|Show the project find and replace dialog|ctrl-shift-f|cmd-shift-f|ctrl-shift-f| +|`project-find:show`|Show the project find and replace dialog|ctrl-shift-F|cmd-shift-F|ctrl-shift-F| |`project-find:confirm`|Find the next occurence of the phrase||cmd-enter|ctrl-enter| |`project-find:toggle-regex-option`|Toggle the "regex" option||cmd-alt-/|ctrl-alt-/| |`project-find:toggle-case-option`|Toggle the "match case" option||cmd-alt-c|ctrl-alt-c| @@ -38,7 +38,7 @@ Want to learn more? Check out the [Using Atom: Find and Replace](http://flight- |`find-and-replace:toggle-whole-word-option`|Toggle the "whold word" option||cmd-alt-w|ctrl-alt-s| |`find-and-replace:find-all`|Find all occurences of the pharase|ctrl-enter|cmd-enter|ctrl-enter| |`find-and-replace:find-next`|Find the next occurence of the phrase|f3|cmd-g|f3| -|`find-and-replace:find-previous`|Find the previous occurence of the phrase|shift-f3|cmd-shift-g|shift-f3| +|`find-and-replace:find-previous`|Find the previous occurence of the phrase|shift-f3|cmd-shift-G|shift-f3| |`find-and-replace:find-next-selected`|Find the next occurence of the phrase selected|ctrl-f3|cmd-f3|ctrl-f3| |`find-and-replace:find-previous-selected`|Find the previous occurence of the phrase selected|ctrl-shift-f3|cmd-shift-f3|ctrl-shift-f3| |`find-and-replace:select-all`|Select all occurences of the phrase|alt-f3|cmd-ctrl-g|alt-f3| From 468718fc4f60b8c75412cdafd51180484c2e08fe Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 15 Feb 2017 18:29:06 +0700 Subject: [PATCH 08/10] Using shift-lowerCase https://github.com/atom/atom/pull/13007 --- keymaps/find-and-replace.cson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keymaps/find-and-replace.cson b/keymaps/find-and-replace.cson index dbff6ac0..d54b3da3 100644 --- a/keymaps/find-and-replace.cson +++ b/keymaps/find-and-replace.cson @@ -1,5 +1,5 @@ '.platform-darwin': - 'cmd-shift-F': 'project-find:show' + 'cmd-shift-f': 'project-find:show' 'cmd-f': 'find-and-replace:show' 'cmd-alt-f': 'find-and-replace:show-replace' @@ -7,13 +7,13 @@ 'alt-a': 'project-find:show-in-current-directory' '.platform-win32, .platform-linux': - 'ctrl-shift-F': 'project-find:show' + 'ctrl-shift-f': 'project-find:show' 'ctrl-f': 'find-and-replace:show' 'ctrl-alt-f': 'find-and-replace:show-replace' '.platform-darwin atom-text-editor': 'cmd-g': 'find-and-replace:find-next' - 'cmd-shift-G': 'find-and-replace:find-previous' + 'cmd-shift-g': 'find-and-replace:find-previous' 'cmd-f3': 'find-and-replace:find-next-selected' 'cmd-shift-f3': 'find-and-replace:find-previous-selected' 'cmd-ctrl-g': 'find-and-replace:select-all' From bdb72aebabb34d2f9226c4addb26337f91d6aa32 Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 15 Feb 2017 18:31:36 +0700 Subject: [PATCH 09/10] Update keybindings [ci skip] --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 129cb5bb..13e57fdc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Find and Replace package -[![macOS Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/6w4baiiq5mw4nxky/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/find-and-replace/branch/master) [![Dependency Status](https://david-dm.org/atom/find-and-replace.svg)](https://david-dm.org/atom/find-and-replace) +[![macOS Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace) +[![Windows Build Status](https://ci.appveyor.com/api/projects/status/6w4baiiq5mw4nxky/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/find-and-replace/branch/master) +[![Dependency Status](https://david-dm.org/atom/find-and-replace.svg)](https://david-dm.org/atom/find-and-replace) Find and replace in the current buffer or across the entire project in Atom. @@ -23,7 +25,7 @@ Want to learn more? Check out the [Using Atom: Find and Replace](http://flight- ## Commands and Keybindings |Command|Description|Keybinding (Linux)|Keybinding (macOS)|Keybinding (Windows)| |-------|-----------|------------------|-----------------|--------------------| -|`project-find:show`|Show the project find and replace dialog|ctrl-shift-F|cmd-shift-F|ctrl-shift-F| +|`project-find:show`|Show the project find and replace dialog|ctrl-shift-f|cmd-shift-f|ctrl-shift-f| |`project-find:confirm`|Find the next occurence of the phrase||cmd-enter|ctrl-enter| |`project-find:toggle-regex-option`|Toggle the "regex" option||cmd-alt-/|ctrl-alt-/| |`project-find:toggle-case-option`|Toggle the "match case" option||cmd-alt-c|ctrl-alt-c| @@ -38,7 +40,7 @@ Want to learn more? Check out the [Using Atom: Find and Replace](http://flight- |`find-and-replace:toggle-whole-word-option`|Toggle the "whold word" option||cmd-alt-w|ctrl-alt-s| |`find-and-replace:find-all`|Find all occurences of the pharase|ctrl-enter|cmd-enter|ctrl-enter| |`find-and-replace:find-next`|Find the next occurence of the phrase|f3|cmd-g|f3| -|`find-and-replace:find-previous`|Find the previous occurence of the phrase|shift-f3|cmd-shift-G|shift-f3| +|`find-and-replace:find-previous`|Find the previous occurence of the phrase|shift-f3|cmd-shift-g|shift-f3| |`find-and-replace:find-next-selected`|Find the next occurence of the phrase selected|ctrl-f3|cmd-f3|ctrl-f3| |`find-and-replace:find-previous-selected`|Find the previous occurence of the phrase selected|ctrl-shift-f3|cmd-shift-f3|ctrl-shift-f3| |`find-and-replace:select-all`|Select all occurences of the phrase|alt-f3|cmd-ctrl-g|alt-f3| From 5a7303a9b391dc23be630eb8c2327f9570bf0418 Mon Sep 17 00:00:00 2001 From: Long Nhat Nguyen Date: Wed, 15 Feb 2017 18:33:27 +0700 Subject: [PATCH 10/10] Using nodejs 6, test x86 and x64 --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2b0fde43..6856fdcd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ -version: "{build}" - -platform: x64 +platform: + - x64 + - x86 branches: only: @@ -18,7 +18,7 @@ environment: - ATOM_CHANNEL: beta install: - - ps: Install-Product node 4 + - ps: Install-Product node 6 build_script: - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))