Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This fixes #78170 #78327

Merged
merged 6 commits into from Aug 6, 2019

Conversation

@ATheCoder
Copy link
Contributor

commented Aug 1, 2019

ATheCoder and others added 2 commits Aug 1, 2019
Merge pull request #1 from microsoft/master
merge vscode from microsoft
Arash Arbabi Arash Arbabi
@diguifi
diguifi approved these changes Aug 2, 2019

@Tyriar Tyriar added this to the August 2019 milestone Aug 2, 2019

@Tyriar
Copy link
Member

left a comment

This doesn't quite align with the editor find as it should only trigger a new search if the current selection is no longer valid. For example, search "foo" and get a match that's wrapped in spaces, if you toggle match whole word then in the editor it won't change anything but with this PR in the terminal it will move the selection

@ATheCoder

This comment has been minimized.

Copy link
Contributor Author

commented Aug 3, 2019

In the editor find, it will always move to the first match. If you select the second match and toggle any of the buttons, it will move to the first one.

Arash Arbabi added 2 commits Aug 4, 2019
@msftclas

This comment has been minimized.

Copy link

commented Aug 4, 2019

CLA assistant check
All CLA requirements met.

@ATheCoder

This comment has been minimized.

Copy link
Contributor Author

commented Aug 4, 2019

@Tyriar I believe right now it should work the same way as the editor find works.

@Tyriar
Tyriar approved these changes Aug 6, 2019
Copy link
Member

left a comment

Thanks!

const instance = this._terminalService.getActiveInstance();
if (instance) {
if (instance.hasSelection()) {
instance.clearSelection();

This comment has been minimized.

Copy link
@Tyriar

Tyriar Aug 6, 2019

Member

Huh, I thought the editor's find was more clever about this and wouldn't re-search from the beginning but apparently that's exactly how it works 👍

@Tyriar Tyriar merged commit 3a8275a into microsoft:master Aug 6, 2019

1 of 2 checks passed

VS Code queued
Details
license/cla All CLA requirements met.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.