[Peek] UserSettings load logging fix and refactor #36111
Merged
+50
−46
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
PR Checklist
Detailed Description of the Pull Request / Additional comments
This PR corrects the following issues with Peek's UserSettings class:
CloseAfterLosingFocus
in the constructor. This should be set by instantiating thePeekProperties
class instead, which should be the single source for settings defaults.retryCount
was misnamed, as it represented the current attempt number, not the number of retries. This made the loop exit check difficult to understand. I'm unsure, but I think the intention was to try the load 5 times, but it ended up being 6 because of this.GetSettingsOrDefault
.SettingsUtils.DefaultFileName
string public and used this instead, guaranteeing they'll always be consistent. It’s very unlikely "settings.json" would ever be changed, but you never know...Updates were also made to the following:
PeekProperties
defaults if the settings file could not be read._watcher
declaration. This is required because theFileSystemWatcher
is set up in another class.Validation Steps Performed
The application was tested before and after the change, confirming that: