Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

[replace-across-files] Replace in Files #7809

Merged
merged 56 commits into from
Jun 13, 2014
Merged

[replace-across-files] Replace in Files #7809

merged 56 commits into from
Jun 13, 2014

Commits on Mar 3, 2014

  1. Refactors the search results to be able to use paging in Replace All

    @TomMalbran
    TomMalbran committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    2ca021e View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2014

  1. Make regexp searches multiline in FindInFiles to match single-file be… 

    …havior
    @njx
    njx committed Apr 30, 2014
    Configuration menu
    Copy the full SHA
    b60ba25 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2014

  1. Merge with Master

    @TomMalbran
    TomMalbran committed May 2, 2014
    Configuration menu
    Copy the full SHA
    eaa4d38 View commit details
    Browse the repository at this point in the history

  2. Several fixes and stuff

    @TomMalbran
    TomMalbran committed May 2, 2014
    Configuration menu
    Copy the full SHA
    32ea44f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Implement basic textual find/replace in files 

    Also fixed a bug and dealt with some nonobvious asynchrony in one of the existing tests.
    @njx
    njx committed May 5, 2014
    Configuration menu
    Copy the full SHA
    5971e7e View commit details
    Browse the repository at this point in the history

Commits on May 6, 2014

  1. Don't replace on disk if the file has changed since we searched it

    @njx
    njx committed May 6, 2014
    Configuration menu
    Copy the full SHA
    d70b40f View commit details
    Browse the repository at this point in the history

  2. Add test for gracefully handling write failure

    @njx
    njx committed May 6, 2014
    Configuration menu
    Copy the full SHA
    b5aa82d View commit details
    Browse the repository at this point in the history

  3. Do replacements in memory for files that are already open

    @njx
    njx committed May 6, 2014
    Configuration menu
    Copy the full SHA
    ad367bf View commit details
    Browse the repository at this point in the history

  4. Add way to force replacements to be done in memory instead of on disk

    @njx
    njx committed May 6, 2014
    Configuration menu
    Copy the full SHA
    094a75d View commit details
    Browse the repository at this point in the history

Commits on May 7, 2014

  1. Handle regexp replacement

    @njx
    njx committed May 7, 2014
    Configuration menu
    Copy the full SHA
    0dd3eca View commit details
    Browse the repository at this point in the history

  2. Start hooking up Replace in Files UI

    @njx
    njx committed May 7, 2014
    Configuration menu
    Copy the full SHA
    b170527 View commit details
    Browse the repository at this point in the history

  3. Tweak Find Bar to only show Replace All... and relayout in replace-ac… 

    …ross-files case
    @njx
    njx committed May 7, 2014
    Configuration menu
    Copy the full SHA
    3e113db View commit details
    Browse the repository at this point in the history

Commits on May 8, 2014

  1. Add logic to force in-memory replacements for 10 or fewer files, and … 

    …add confirmation dialog. Clean up some unnecessary runs() in tests.
    @njx
    njx committed May 8, 2014
    Configuration menu
    Copy the full SHA
    51dda43 View commit details
    Browse the repository at this point in the history

  2. Add simple unit test for Replace All checkboxes

    @njx
    njx committed May 8, 2014
    Configuration menu
    Copy the full SHA
    8ad4acd View commit details
    Browse the repository at this point in the history

  3. Add unit tests for paging Find in Files results

    @njx
    njx committed May 8, 2014
    Configuration menu
    Copy the full SHA
    ba02433 View commit details
    Browse the repository at this point in the history

  4. Merge from tom/search-results

    @njx
    njx committed May 8, 2014
    Configuration menu
    Copy the full SHA
    cda467a View commit details
    Browse the repository at this point in the history

  5. Use batchOperation() instead of edit op merging for replace all 

    Logically, this is a single operation, not a set of merged adjacent
operations, and we wouldn't want a second replaceAll done immediately
afterward to merge with it (though it would be difficult to get into that
case).
    @njx
    njx committed May 8, 2014
    Configuration menu
    Copy the full SHA
    660fddb View commit details
    Browse the repository at this point in the history

Commits on May 9, 2014

  1. Integrate results panel with Replace in Files

    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    f804242 View commit details
    Browse the repository at this point in the history

  2. Remove search panel templates that are no longer used

    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    c2826a1 View commit details
    Browse the repository at this point in the history

  3. Improve Enter key behavior in Replace in Files 

    * hitting Enter in Find field sets focus to Replace field
* hitting Enter in Replace field starts the search
    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    79a873a View commit details
    Browse the repository at this point in the history

  4. Tweak labels for batch replace buttons in both single and multi-file … 

    …find/replace
    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    39a9bed View commit details
    Browse the repository at this point in the history

  5. Tweak layout of Find bar for find/replace across files

    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    8e0e518 View commit details
    Browse the repository at this point in the history

  6. Disable Replace button when query is blank or invalid

    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    bb6ab8a View commit details
    Browse the repository at this point in the history

  7. Automatically open a changed file if current editor hasn't been chang… 

    …ed by a Replace in Files operation
    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    f820a12 View commit details
    Browse the repository at this point in the history

  8. Use original line endings when comparing in-memory doc to known goods… 

    … in Replace in Files unit tests
    @njx
    njx committed May 9, 2014
    Configuration menu
    Copy the full SHA
    d571a6f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2014

  1. Bump up in-memory replace limit to 20. Tweak dialog to show the limit.

    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    c33add6 View commit details
    Browse the repository at this point in the history

  2. Ignore unchecked matches when computing number of files to replace in… 

    …. Clone results so they don't get updated during the replace.
    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    aeca946 View commit details
    Browse the repository at this point in the history

  3. Beginning of refactoring to unify view code: 

    * Broke out query/results state into a model object that behaves similarly
  between Replace All and Find/Replace in Files
* Got rid of separate ReplaceAllResults, unifying code into
  SearchResultsView
    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    6141347 View commit details
    Browse the repository at this point in the history

  4. Rename resultsModel to searchModel since it has other stuff besides r… 

    …esults
    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    ab95c67 View commit details
    Browse the repository at this point in the history

  5. Clean up some global state in FindInFiles that can just use the searc… 

    …h model
    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    59e39ab View commit details
    Browse the repository at this point in the history

  6. Just reverse the matches instead of sorting them in reverse since the… 

    …y're already in document order
    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    7a9af00 View commit details
    Browse the repository at this point in the history

  7. Fix summary display

    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    28207e2 View commit details
    Browse the repository at this point in the history

  8. Remove unused var

    @njx
    njx committed May 10, 2014
    Configuration menu
    Copy the full SHA
    5b5d760 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2014

  1. Make single-file Replace All just use Find in Files. Plus fixes: 

    * make regexp replacements work from Find in Files bar
* change EDIT_FIND/EDIT_REPLACE to CMD_* to avoid deprecation warnings
    @njx
    njx committed May 12, 2014
    Configuration menu
    Copy the full SHA
    72b7121 View commit details
    Browse the repository at this point in the history

  2. Move the rest of the query-related globals into SearchModel

    @njx
    njx committed May 12, 2014
    Configuration menu
    Copy the full SHA
    4a4c9ca View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. Refactor all UI code out of FindInFiles - this is now a pure engine c… 

    …lass.
    @njx
    njx committed May 13, 2014
    Configuration menu
    Copy the full SHA
    abfd249 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nj/unify-find-ui' into nj/replace-on-disk

    @njx
    njx committed May 13, 2014
    Configuration menu
    Copy the full SHA
    8c0c59b View commit details
    Browse the repository at this point in the history

  3. Re-add error log statement that got dropped

    @njx
    njx committed May 13, 2014
    Configuration menu
    Copy the full SHA
    ced86cf View commit details
    Browse the repository at this point in the history

Commits on May 14, 2014

  1. Cleanup and bugfixes for Replace in Files: 

    * Properly initialize paging/selection state and initial file for sorting
* Uncheck "check all" checkbox when any item is unchecked
* Add some unit tests for checkboxes
    @njx
    njx committed May 14, 2014
    Configuration menu
    Copy the full SHA
    5e6a35d View commit details
    Browse the repository at this point in the history

  2. Make limit on found results much larger, and apply it to total number… 

    … of matches as well as number of matches in a file
    @njx
    njx committed May 14, 2014
    Configuration menu
    Copy the full SHA
    ea51cc3 View commit details
    Browse the repository at this point in the history

  3. Move FindInFiles tests into a separate file

    @njx
    njx committed May 14, 2014
    Configuration menu
    Copy the full SHA
    ffc5ffb View commit details
    Browse the repository at this point in the history

  4. Remove unused parameter

    @njx
    njx committed May 14, 2014
    Configuration menu
    Copy the full SHA
    37ac1b0 View commit details
    Browse the repository at this point in the history

  5. Add error dialog if problems occur during replace. Add a few more uni… 

    …t tests and behavior for edge cases.
    @njx
    njx committed May 14, 2014
    Configuration menu
    Copy the full SHA
    c9e4b56 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Added tests for panel closure. Need to fix a bug that causes one of t… 

    …he tests to fail.
    @njx
    njx committed May 15, 2014
    Configuration menu
    Copy the full SHA
    770a389 View commit details
    Browse the repository at this point in the history

  2. Fixed bug in panel title. Simplified construction of summary area.

    @njx
    njx committed May 15, 2014
    Configuration menu
    Copy the full SHA
    268cfd8 View commit details
    Browse the repository at this point in the history

  3. Tweak flaky unit test - seems to pass consistently now

    @njx
    njx committed May 15, 2014
    Configuration menu
    Copy the full SHA
    47fbda5 View commit details
    Browse the repository at this point in the history

  4. Add unit test for find/replace in dirty document. 

    Plus another attempt to fix flaky unit test.
    @njx
    njx committed May 15, 2014
    Configuration menu
    Copy the full SHA
    2778827 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. More Replace in Files unit test work: 

    * Add more checkbox tests
* Another try at fixing the flaky focus test
* Add comments to some test utility functions
* Move non-UI tests into a separate describe()
    @njx
    njx committed May 16, 2014
    Configuration menu
    Copy the full SHA
    2e62bcd View commit details
    Browse the repository at this point in the history

  2. Ensure that Find in Files panel closes when document is reverted on c… 

    …lose
    @njx
    njx committed May 16, 2014
    Configuration menu
    Copy the full SHA
    ac10ba2 View commit details
    Browse the repository at this point in the history

  3. Directly include FindInFilesUI instead of FindInFiles, since the form… 

    …er now registers the commands
    @njx
    njx committed May 16, 2014
    Configuration menu
    Copy the full SHA
    6e9f6ec View commit details
    Browse the repository at this point in the history

  4. Make sure we propagate error from then()

    @njx
    njx committed May 16, 2014
    Configuration menu
    Copy the full SHA
    1917878 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. add Replace in... to context menu

    @redmunds
    redmunds committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    6490a03 View commit details
    Browse the repository at this point in the history

  2. unit tests for replace in...

    @redmunds
    redmunds committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    b20b2ee View commit details
    Browse the repository at this point in the history

  3. update comments

    @redmunds
    redmunds committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    20876e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2014

  1. Replace in Selected File/Folder in Find menu

    @redmunds
    redmunds committed Jun 4, 2014
    Configuration menu
    Copy the full SHA
    737b27a View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2014

  1. Merge pull request #8029 from adobe/randy/replace-in 

    Add Replace in... to context menus
    @njx
    njx committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    f6d3efc View commit details
    Browse the repository at this point in the history