-
Notifications
You must be signed in to change notification settings - Fork 8.1k
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
Fuzzy Search #16586
base: main
Are you sure you want to change the base?
Fuzzy Search #16586
Conversation
Added action for fuzzy search Cleaned up styles some
This comment has been minimized.
This comment has been minimized.
Holy s***! |
Thanks! Totally understand, no rush on my end. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
@check-spelling-bot Report🔴 Please reviewSee the 📂 files view, the 📜action log, or 📝 job summary for details. Unrecognized words (55)
Previously acknowledged words that are now absentDESTINATIONNAME 🫥To accept these unrecognized words as correct and remove the previously acknowledged and now absent words, you could run the following commands... in a clone of the git@github.com:e82eric/terminal.git repository curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.22/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/8152048091/attempts/1' Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionaryThis includes both expected items (2256) from .github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt
Consider adding them (in with:
extra_dictionaries:
cspell:k8s/dict/k8s.txt
cspell:swift/src/swift.txt
cspell:gaming-terms/dict/gaming-terms.txt
cspell:monkeyc/src/monkeyc_keywords.txt
cspell:cryptocurrencies/cryptocurrencies.txt To stop checking additional dictionaries, add (in check_extra_dictionaries: '' Errors (2)See the 📂 files view, the 📜action log, or 📝 job summary for details.
See ❌ Event descriptions for more information. ✏️ Contributor please read thisBy default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later. If the listed items are:
See the 🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉 If the flagged items are 🤯 false positivesIf items relate to a ...
|
@@ -2806,6 +2810,86 @@ Global | |||
{328729E9-6723-416E-9C98-951F1473BBE1}.Release|ARM64.ActiveCfg = Release|ARM64 | |||
{328729E9-6723-416E-9C98-951F1473BBE1}.Release|x64.ActiveCfg = Release|x64 | |||
{328729E9-6723-416E-9C98-951F1473BBE1}.Release|x86.ActiveCfg = Release|Win32 | |||
{A52785FE-216E-4B64-9634-84172E083DB0}.AuditMode|Any CPU.ActiveCfg = Debug|x64 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure how to keep visual studio from doing this.
okay so what if we did this as a type of pane content, instead of as a part of the control itself? It could be like, the "Find All" pane or something (which is usually different in VsCode / sublime compared to the usual Find UI) this has been shower thoughts with mike |
Trying to get my head around this, by pane do you mean something like the docked areas in visual studio? |
Sorta, yea. In the chain of PRs that terminated in #16914, we added support for the Terminal to have panes that included things that weren't just TermControl's - they could be anything. So like, we could totally make a (i cannot stress enough, this was a half baked shower thought) |
got it, it should work, that is similar to how I had it implemented at first, it was a xaml row below the swap panel control, and I was scrolling the swap panel to see the selected match (the scrolling wasn't necessary it was just nice to see the context rows around the selected match while in the list box). the main downside was that when I was done with the fuzzy search I wanted the screen space back so I was hiding the row after the search, which mostly worked but cdb and a few other TUI applications would do weird things with the cursor with all the reflows (The reflows wouldn't be an issue if the pane doesn't auto hide). having it in another pane would would make the code a lot simpler (mostly not having the extra renderer/swap panel for the previewer). |
@zadjii-msft not sure if it helps, this is what it looked like when I had the search control below the swap panel. I think visually that would be similar to a pane (without the auto show/hide stuff) |
Honestly yea that looks almost exactly like what I was thinking. It's probably a lot of plumbing to get it up and into a separate |
Makes sense, I think the main thing is that the pane would need a reference to the Terminal instance (or some proxy/interface) to read the contents of the buffer, set the selected char and optionally perform scrolling to show the current item from the list box in the swap panel. I think selecting the char had a dependency on the Renderer also. |
I don't think I'd be opposed to some winrt API's on struct SelectionRange {
Windows.Foundation.Point Start;
Windows.Foundation.Point End;
}
runtimeclass TermControl {
// ...
Vector<SelectionRange> GetPatternMatches(String pattern);
void SelectRange(SelectionRange range); // basically just a projection of ControlCore::_selectSpan
} |
I can give it a try and see how it goes. Its probably a long shot that it would be something you would want to merge but it feels like the exercise would be worth while to test the Pane abstraction.
Will this work for TermControl? //HighlightedTextSegment is from the file below. I am not sure if I would have access to it, if not I could create a similar set of clasess.
//I need the text spans to show the parts of the row that make up the fuzzy match
//https://github.com/microsoft/terminal/blob/32fbb16d43ddfcdd039a61c5af051a16b972faeb/src/cascadia/TerminalApp/HighlightedText.h#L11
struct FuzzySearchMetch {
HighlightedTextSegment Text;
//I think the start is the only part of match that is useful for selection since it is n number of spans across the row. Selecting the first char in the match seems to get me where I want to go. (This looked like how fzf and Telescope work)
Windows.Foundation.Point Start;
}
runtimeclass TermControl {
Vector<FuzzySearchMatch> GetPatternMatches(String pattern);
void SelectPoint(SelectionPoint point);
} For
|
@zadjii-msft I was able to get a really basic version of the fuzzy search working in the pane. I forgot to ask, was the idea that the fuzzy search would search across all TermControls? This is what the diff looked like. |
Let's save that for a v2? Cause this is already awesome |
@zadjii-msft Any chance you guys are thinking about adding the ability to float a pane? I was trying it out this weekend and it seemed pretty nice, for the fuzzy search it got out of the way after the search without having to reflow, for the TermControl it was nice to be able to do something temporary and have it get out the way (I actually think I found this more useful than the fuzzy search). |
Ha you've figured out my plan! I was absolutely planning that (in a bit longer term). We've got this QueryPalette element we're using currently for Terminal Chat: and part of my eventual goal is to unify that floating "pane" with the rest of our Pane code, s.t. arbitrary panes could "float" like that too, or start as a floating pane, then get pinned as one in the tree, or.... who knows what yet. We still need to better sort out how some of those UI flows would work, but it's definitely something I've been thinking about. |
Awesome! I was surprised how nice it was having the termcontrol in a float windows.
I was going to attempt adding a preview window using a TermControl just to see if it is possible or not, do I have it right that I would use the same instance of the ControlCore from main TermControl to create the preview TermControl? |
Yes, ish. Having multiple different TermControl's attached to the same ControlCore at the same time is not something the codebase is super well suited for right now. I actually experimented with something like this just a couple months ago. I left my very haphazard notes over in #16495 (comment). I'd warn that those notes are very rough and likely stale. But I think the basic idea - having a bunch of (it's also probably way past overkill for a v0 of this PR, but something you could play with) I'll probably have more thoughts to share on this PR in like two weeks (after Build is done next week). Sorry for the delays! |
Thanks! That gets me pointed in the right direction. No rush on reviewing the PR. |
Summary of the Pull Request
This pull request probably doesn't make sense to merge, but I found an open ticket for it and I had built a version for my personal build, so it felt like it was at least worth posting. If you do decide to implement something like this I would love to help work on it.
#5314
The fuzzy search implementation is from fzf-native. https://github.com/nvim-telescope/telescope-fzf-native.nvim
Searching Terminal Repository
Searching .net memory dump
References and Relevant Issues
#5314
Detailed Description of the Pull Request / Additional comments
Validation Steps Performed
PR Checklist