-
Notifications
You must be signed in to change notification settings - Fork 8.5k
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
Replace New Tab Menu Match Profiles functionality with regex support #18654
Draft
carlos-zamora
wants to merge
1
commit into
main
Choose a base branch
from
dev/cazamor/ntm/matchProfile-regex
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,19 +55,39 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation | |
// value of the function we consider the null value to be "false". | ||
auto isMatching = std::optional<bool>{}; | ||
|
||
auto isMatch = [](std::wstring_view regex, std::wstring_view text) { | ||
if (text.empty()) | ||
{ | ||
return false; | ||
} | ||
|
||
std::wregex re; | ||
try | ||
{ | ||
re = { regex.cbegin(), regex.cend() }; | ||
} | ||
catch (std::regex_error) | ||
{ | ||
// invalid regex | ||
return false; | ||
} | ||
|
||
return std::regex_match(text.cbegin(), text.cend(), re); | ||
}; | ||
|
||
if (!_Name.empty()) | ||
{ | ||
isMatching = { isMatching.value_or(true) && _Name == profile.Name() }; | ||
isMatching = { isMatching.value_or(true) && isMatch(_Name, profile.Name()) }; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This optional-bool code seems like a roundabout way to say "return early if true". 😅 if (!field.empty() && isMatch(field, ...)) {
return true;
}
if (!field.empty() && isMatch(field, ...)) {
return true;
}
if (!field.empty() && isMatch(field, ...)) {
return true;
}
return false; |
||
} | ||
|
||
if (!_Source.empty()) | ||
{ | ||
isMatching = { isMatching.value_or(true) && _Source == profile.Source() }; | ||
isMatching = { isMatching.value_or(true) && isMatch(_Source, profile.Source()) }; | ||
} | ||
|
||
if (!_Commandline.empty()) | ||
{ | ||
isMatching = { isMatching.value_or(true) && _Commandline == profile.Commandline() }; | ||
isMatching = { isMatching.value_or(true) && isMatch(_Commandline, profile.Commandline()) }; | ||
} | ||
|
||
return isMatching.value_or(false); | ||
|
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
Oops, something went wrong.
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.
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.
AGH! STD REGEX MY MORTAL ENEMY! 😄
That said, regex construction can be fairly costly in general, and we should not treat this as some kind of cheap validation. It involves constructing DFAs, etc., after all. I'm not entirely sure anymore where
MatchProfilesEntry
fits into the callstack, but seeing that it's also part ofTerminalSettingsModel
, I'm sure that we can make it cache every regex instance after load and store any warnings into a list. We can then splice its list into the overallSettingsLoadWarnings
list (or store it directly there, or something like that). Basically, a way to only construct these once.FWIW if you want to give
icu.h
a try: