Prevent assert from being hit #62366
Merged
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
Youssef1313
reviewed
Jul 5, 2022
| var textBox = new TextBox(); | ||
| BindToTextBox(textBox, option, languageName); | ||
|
|
||
| var panel = new StackPanel(); | ||
| panel.Children.Add(label); | ||
| panel.Children.Add(textBox); | ||
|
|
||
| AddSearchHandler(label); |
There was a problem hiding this comment.
A small suggestion (doesn't need to be in this PR):
Is it possible to do a change similar to the following:
// see https://github.com/dotnet/roslyn/blob/8fd033cd948a2eb33e4af650b7a1b3dd18e914d2/src/VisualStudio/Core/Impl/Options/AbstractOptionPage.cs#L24
// renamed the abstract CreateOptionPage to CreateOptionPageCore, this is what needs to be overridden now.
protected abstract AbstractOptionPageControl CreateOptionPageCore(IServiceProvider serviceProvider, OptionStore optionStore);
protected AbstractOptionPageControl CreateOptionPage(IServiceProvider serviceProvider, OptionStore optionStore)
{
var optionPage = CreateOptionPageCore();
// loop over all labels, comboboxes, checkboxes and call AddSearchHandler
return optionPage;
}There was a problem hiding this comment.
If this were winforms, I'd absolutely do that.. but its not, and I don't think WPF has a convenient way of iterating child controls, across the myriad of options for containers and stack layouts and grids etc.
Plus, 99% of the search handler setup is already automatic because most things just call the base Bind... method anyway, so I don't think this would save much.
| @@ -145,21 +145,23 @@ private UIElement CreateControl(IOption option, string languageName = null, stri | |||
| { | |||
| if (option.Type == typeof(bool)) | |||
| { | |||
| var checkBox = new CheckBox() { Content = option.Name + GetLanguage(languageName) + GetAdditionalText(additional) }; | |||
| var checkBox = new CheckBox() { Content = option.Name.Replace('_', ' ') + GetLanguage(languageName) + GetAdditionalText(additional) }; | |||
There was a problem hiding this comment.
I feel like this needs a comment here...
jasonmalinowski
approved these changes
Jul 7, 2022
ghost
added this to the
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Jul 7, 2022
* upstream/main: (62 commits) Prevent assert from being hit (dotnet#62366) Don't offer '??=' for pointer types (dotnet#62476) Integrate generator times into /reportAnalyzer (dotnet#61661) Switch to a callback for cleaning up resources instead of passing in an explicit IDisposable. (dotnet#62373) Filter trees to only those containing global-usings or attributes prior to analyzing them. (dotnet#62444) Update PublishData.json Complete 'file' support for `SyntaxGenerator` (dotnet#62413) Apply changes directly to text buffer (dotnet#62337) Remove LangVer check from extended nameof binding (dotnet#62339) Fixed shared project file error (dotnet#62466) Handle new error codes Use MSBuid generated property for package path Exclude BCL libraries from Roslyn vsix Bump the integration test timeouts a bit Skip the balanced switch dispatch optimization for patterns on floating-point inputs (dotnet#62322) Test helpers shouldn't escape quotes by default (dotnet#62321) Reuse prior TableEntry values in the increment NodeTable builder if possible. (dotnet#62320) Install 3.1 runtime for SBOM tool Generate VS SBOM during official build. Minor refactoring in 'required' handling for override completion (dotnet#62422) ...
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.
Fixes #62365