actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-22 00:51:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1082 from epage/locale

Browse source 
fix(config): Don't overwrite locale and tokenizer config
This commit is contained in:
Ed Page 2024-08-22 10:26:30 -05:00 committed by GitHub
commit c87c2dae38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/typos-cli/src/policy.rs
View file

@ -227,13 +227,16 @@ impl<'s> ConfigEngine<'s> {
let check_filename = engine.check_filename(); let check_filename = engine.check_filename();
let check_file = engine.check_file(); let check_file = engine.check_file();
let crate::config::EngineConfig { let crate::config::EngineConfig {
tokenizer: mut tokenizer_config, tokenizer: tokenizer_user_config,
dict: mut dict_config, dict: dict_user_config,
extend_ignore_re, extend_ignore_re,
.. ..
} = engine; } = engine;
tokenizer_config.update(&crate::config::TokenizerConfig::from_defaults());
dict_config.update(&crate::config::DictConfig::from_defaults()); let mut tokenizer_config = crate::config::TokenizerConfig::from_defaults();
tokenizer_config.update(&tokenizer_user_config);
let mut dict_config = crate::config::DictConfig::from_defaults();
dict_config.update(&dict_user_config);
if !tokenizer_config.ignore_hex() { if !tokenizer_config.ignore_hex() {
log::warn!("`ignore-hex` is deprecated"); log::warn!("`ignore-hex` is deprecated");