Fix previous broken refactor key into helix-view #345
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
pickfire
commented
Jun 22, 2021
Comment on lines
+340
to
348
| /// Merge default config keys with user overwritten keys for custom | ||
| /// user config. | ||
| pub fn merge_keys(mut config: Config) -> Config { | ||
| let mut delta = std::mem::take(&mut config.keys); | ||
| for (mode, keys) in &mut *config.keys { | ||
| keys.extend(delta.remove(mode).unwrap_or_default()); | ||
| } | ||
| config | ||
| } |
There was a problem hiding this comment.
The main change compared to last pull request, I am surprised it is just a few lines away.
pickfire
commented
Jun 22, 2021
| .or_else(|| Some(Config::default())) | ||
| .unwrap(); | ||
| let config = match std::fs::read_to_string(conf_dir.join("config.toml")) { | ||
| Ok(config) => merge_keys(toml::from_str(&config)?), |
There was a problem hiding this comment.
And this minor change, it will only merge the keys if we successfully read from a config file. The merging shouldn't be part of the deserialization process.
Closed
archseer
reviewed
Jun 23, 2021
archseer
approved these changes
Jun 24, 2021
Need to be used for autoinfo Revert "Revert "Refactor key into helix-view"" This reverts commit 10f9f72.
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.
Need to be used for autoinfo
Revert "Revert "Refactor key into helix-view""
This reverts commit 10f9f72.
cc @wojciechkepka