Parse UTF-16 surrogates pairs for calculating pattern's position #11915
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
Area-Rendering
comzyh
changed the title
|
@msftbot make sure @PankajBhojwani signs off on this one |
ghost
added
the
AutoMerge
|
Hello @zadjii-msft! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
miniksa
approved these changes
Dec 9, 2021
| @@ -2585,16 +2586,17 @@ PointTree TextBuffer::GetPatterns(const size_t firstRow, const size_t lastRow) c | |||
| // match and the previous match, so we use the size of the prefix | |||
| // along with the size of the match to determine the locations | |||
| size_t prefixSize = 0; | |||
|
|
|||
| for (const auto ch : i->prefix().str()) | |||
| for (const std::vector<wchar_t> parsedGlyph : Utf16Parser::Parse(i->prefix().str())) | |||
There was a problem hiding this comment.
I would have left auto for the left side here and below... but I'm not going to block over it.
PankajBhojwani
approved these changes
Dec 9, 2021
|
@msftbot merge this in 1 minute |
|
Hello @zadjii-msft! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
ghost
merged commit
DHowett
pushed a commit
that referenced
this pull request
Dec 13, 2021
) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Properly handle UTF-16 surrogates when calculating the position of matched pattern. Fix #8709 <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References https://github.com/microsoft/terminal/blob/b88ffb21b0725331877ba76bac5a79a4c21eaa03/src/buffer/out/search.cpp#L335-L339 <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [ ] Closes #8709 * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments use `Utf16Parser::Parse` to handle code points from U+010000 to U+10FFFF in UTF-16. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed  also the case by @mas90 #8709 (comment):  (cherry picked from commit a2d96d6)
DHowett
pushed a commit
that referenced
this pull request
Dec 13, 2021
) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Properly handle UTF-16 surrogates when calculating the position of matched pattern. Fix #8709 <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References https://github.com/microsoft/terminal/blob/b88ffb21b0725331877ba76bac5a79a4c21eaa03/src/buffer/out/search.cpp#L335-L339 <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [ ] Closes #8709 * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments use `Utf16Parser::Parse` to handle code points from U+010000 to U+10FFFF in UTF-16. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed  also the case by @mas90 #8709 (comment):  (cherry picked from commit a2d96d6)
|
🎉 Handy links: |
ghost
mentioned this pull request
|
🎉 Handy links: |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of the Pull Request
Properly handle UTF-16 surrogates when calculating the position of matched pattern.
Fix #8709
References
terminal/src/buffer/out/search.cpp
Lines 335 to 339 in b88ffb2
PR Checklist
Detailed Description of the Pull Request / Additional comments
use
Utf16Parser::Parseto handle code points from U+010000 to U+10FFFF in UTF-16.Validation Steps Performed
also the case by @mas90 #8709 (comment):