From 13a93ee8d1a297dddf666fc1dcf0fa4820d2d3cf Mon Sep 17 00:00:00 2001
From: Ed Page <epage@duosecurity.com>
Date: Mon, 4 Jan 2021 16:34:18 -0600
Subject: [PATCH] fix(config): Provide all field defaults

---
 src/config.rs | 36 ++++++++++++++++++++++++++++++++++++
 src/main.rs   |  4 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/config.rs b/src/config.rs
index 5f4e613..a9b8cbc 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -118,6 +118,13 @@ impl Config {
         Ok(content)
     }
 
+    pub fn from_defaults() -> Self {
+        Self {
+            files: Walk::from_defaults(),
+            default: FileConfig::from_defaults(),
+        }
+    }
+
     pub fn derive(cwd: &std::path::Path) -> Result<Self, anyhow::Error> {
         if let Some(path) = find_project_file(cwd, &["typos.toml", "_typos.toml", ".typos.toml"]) {
             Self::from_file(&path)
@@ -160,6 +167,19 @@ pub struct Walk {
 }
 
 impl Walk {
+    pub fn from_defaults() -> Self {
+        let empty = Self::default();
+        Self {
+            binary: Some(empty.binary()),
+            ignore_hidden: Some(empty.ignore_hidden()),
+            ignore_files: Some(true),
+            ignore_dot: Some(empty.ignore_dot()),
+            ignore_vcs: Some(empty.ignore_vcs()),
+            ignore_global: Some(empty.ignore_global()),
+            ignore_parent: Some(empty.ignore_parent()),
+        }
+    }
+
     pub fn update(&mut self, source: &dyn WalkSource) {
         if let Some(source) = source.binary() {
             self.binary = Some(source);
@@ -264,6 +284,22 @@ pub struct FileConfig {
 }
 
 impl FileConfig {
+    pub fn from_defaults() -> Self {
+        let empty = Self::default();
+        FileConfig {
+            check_filename: Some(empty.check_filename()),
+            check_file: Some(empty.check_file()),
+            ignore_hex: Some(empty.ignore_hex()),
+            identifier_leading_digits: Some(empty.identifier_leading_digits()),
+            identifier_leading_chars: Some(empty.identifier_leading_chars().to_owned()),
+            identifier_include_digits: Some(empty.identifier_include_digits()),
+            identifier_include_chars: Some(empty.identifier_include_chars().to_owned()),
+            locale: Some(empty.locale()),
+            extend_identifiers: Default::default(),
+            extend_words: Default::default(),
+        }
+    }
+
     pub fn update(&mut self, source: &dyn FileSource) {
         if let Some(source) = source.check_filename() {
             self.check_filename = Some(source);
diff --git a/src/main.rs b/src/main.rs
index ad506a3..1a38514 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -60,7 +60,9 @@ fn run_dump_config(args: &args::Args, output_path: &std::path::Path) -> proc_exi
     };
 
     let config = load_config(cwd, &args).with_code(proc_exit::Code::CONFIG_ERR)?;
-    let output = toml::to_string_pretty(&config).with_code(proc_exit::Code::FAILURE)?;
+    let mut defaulted_config = config::Config::from_defaults();
+    defaulted_config.update(&config);
+    let output = toml::to_string_pretty(&defaulted_config).with_code(proc_exit::Code::FAILURE)?;
     std::fs::write(output_path, &output)?;
 
     Ok(())