fix(add): Stop auto-formatting content

epage · epage · commit 99e4847d7874 · 2023-10-17T12:48:08.000-05:00
Huh, overlooked the cargo side when I fixed this in killercup/cargo-edit#725 Fixes #10850
diff --git a/src/cargo/util/toml_mut/dependency.rs b/src/cargo/util/toml_mut/dependency.rs
@@ -464,17 +464,17 @@ impl Dependency {
         } else if let Some(table) = item.as_table_like_mut() {
             match &self.source {
                 Some(Source::Registry(src)) => {
-                    table.insert("version", toml_edit::value(src.version.as_str()));
+                    overwrite_value(table, "version", src.version.as_str());
 
                     for key in ["path", "git", "branch", "tag", "rev", "workspace"] {
                         table.remove(key);
                     }
                 }
                 Some(Source::Path(src)) => {
                     let relpath = path_field(crate_root, &src.path);
-                    table.insert("path", toml_edit::value(relpath));
+                    overwrite_value(table, "path", relpath);
                     if let Some(r) = src.version.as_deref() {
-                        table.insert("version", toml_edit::value(r));
+                        overwrite_value(table, "version", r);
                     } else {
                         table.remove("version");
                     }
@@ -484,24 +484,24 @@ impl Dependency {
                     }
                 }
                 Some(Source::Git(src)) => {
-                    table.insert("git", toml_edit::value(src.git.as_str()));
+                    overwrite_value(table, "git", src.git.as_str());
                     if let Some(branch) = src.branch.as_deref() {
-                        table.insert("branch", toml_edit::value(branch));
+                        overwrite_value(table, "branch", branch);
                     } else {
                         table.remove("branch");
                     }
                     if let Some(tag) = src.tag.as_deref() {
-                        table.insert("tag", toml_edit::value(tag));
+                        overwrite_value(table, "tag", tag);
                     } else {
                         table.remove("tag");
                     }
                     if let Some(rev) = src.rev.as_deref() {
-                        table.insert("rev", toml_edit::value(rev));
+                        overwrite_value(table, "rev", rev);
                     } else {
                         table.remove("rev");
                     }
                     if let Some(r) = src.version.as_deref() {
-                        table.insert("version", toml_edit::value(r));
+                        overwrite_value(table, "version", r);
                     } else {
                         table.remove("version");
                     }
@@ -511,7 +511,7 @@ impl Dependency {
                     }
                 }
                 Some(Source::Workspace(_)) => {
-                    table.insert("workspace", toml_edit::value(true));
+                    overwrite_value(table, "workspace", true);
                     table.set_dotted(true);
                     key.fmt();
                     for key in [
@@ -533,7 +533,7 @@ impl Dependency {
             }
             if table.contains_key("version") {
                 if let Some(r) = self.registry.as_deref() {
-                    table.insert("registry", toml_edit::value(r));
+                    overwrite_value(table, "registry", r);
                 } else {
                     table.remove("registry");
                 }
@@ -542,11 +542,11 @@ impl Dependency {
             }
 
             if self.rename.is_some() {
-                table.insert("package", toml_edit::value(self.name.as_str()));
+                overwrite_value(table, "package", self.name.as_str());
             }
             match self.default_features {
                 Some(v) => {
-                    table.insert("default-features", toml_edit::value(v));
+                    overwrite_value(table, "default-features", v);
                 }
                 None => {
                     table.remove("default-features");
@@ -564,29 +564,40 @@ impl Dependency {
                     })
                     .unwrap_or_default();
                 features.extend(new_features.iter().map(|s| s.as_str()));
-                let features = toml_edit::value(features.into_iter().collect::<toml_edit::Value>());
+                let features = features.into_iter().collect::<toml_edit::Value>();
                 table.set_dotted(false);
-                table.insert("features", features);
+                overwrite_value(table, "features", features);
             } else {
                 table.remove("features");
             }
             match self.optional {
                 Some(v) => {
                     table.set_dotted(false);
-                    table.insert("optional", toml_edit::value(v));
+                    overwrite_value(table, "optional", v);
                 }
                 None => {
                     table.remove("optional");
                 }
             }
-
-            table.fmt();
         } else {
             unreachable!("Invalid dependency type: {}", item.type_name());
         }
     }
 }
 
+fn overwrite_value(
+    table: &mut dyn toml_edit::TableLike,
+    key: &str,
+    value: impl Into<toml_edit::Value>,
+) {
+    let mut value = value.into();
+    let existing = table.entry(key).or_insert_with(|| Default::default());
+    if let Some(existing_value) = existing.as_value() {
+        *value.decor_mut() = existing_value.decor().clone();
+    }
+    *existing = toml_edit::Item::Value(value);
+}
+
 fn invalid_type(dep: &str, key: &str, actual: &str, expected: &str) -> anyhow::Error {
     anyhow::format_err!("Found {actual} for {key} when {expected} was expected for {dep}")
 }
diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_git_with_path/out/primary/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-cargo-list-test-fixture-dependency = { optional = true, path = "../dependency", version = "0.0.0" }
+cargo-list-test-fixture-dependency = { optional = true , path = "../dependency", version = "0.0.0" }
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/out/Cargo.toml
@@ -5,5 +5,5 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-my-package1 = { version = "99999.0.0" }
-my-package2 = { version = "0.4.1" }
+my-package1 = { version = "99999.0.0"}
+my-package2 = { version = "0.4.1"}
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml
@@ -9,5 +9,5 @@ default = []
 other = ["your-face/nose"]
 
 [dependencies]
-your-face = { version = "99999.0.0" }
-my-package2 = { version = "0.4.1" }
+your-face = { version = "99999.0.0"}
+my-package2 = { version = "0.4.1"}
diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-your-face={ version = "99999.0.0", features = ["eyes", "nose"] }  # Hello world
+your-face={version="99999.0.0",features=["eyes", "nose"]}  # Hello world
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_version_with_git/out/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-versioned-package = { version = "0.3.0", optional = true, git = "[ROOTURL]/versioned-package" }
+versioned-package = { version = "0.3.0", optional = true , git = "[ROOTURL]/versioned-package" }
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_version_with_path/out/primary/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true, path = "../dependency" }
+cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true , path = "../dependency" }
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
@@ -3,4 +3,4 @@ name = "bar"
 version = "0.0.0"
 
 [dependencies]
-foo = { features = ["test"], path = "../dependency", version = "0.0.0" }
+foo = { features = ["test"] , path = "../dependency", version = "0.0.0" }
diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/out/Cargo.toml b/tests/testsuite/cargo_add/preserve_dep_std_table/out/Cargo.toml
@@ -6,5 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies.your-face]
-version = "99999.0.0"
-features = []
+# Leading version
+version = "99999.0.0"  # Trailing version
+# Leading features
+features = []  # Trailing features
diff --git a/tests/testsuite/cargo_add/preserve_features_table/out/Cargo.toml b/tests/testsuite/cargo_add/preserve_features_table/out/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-your-face = { version = "99999.0.0" }
+your-face = { version = "99999.0.0"}
 
 [features]
 default = [
diff --git a/tests/testsuite/cargo_add/require_weak/out/Cargo.toml b/tests/testsuite/cargo_add/require_weak/out/Cargo.toml
@@ -8,4 +8,4 @@ version = "0.0.0"
 eyes = ["your-face/eyes"]
 
 [dependencies]
-your-face = { version = "99999.0.0" }
+your-face = { version = "99999.0.0"}

Original file line number	Diff line number	Diff line change
`@@ -464,17 +464,17 @@ impl Dependency {`
`464`	`464`	`} else if let Some(table) = item.as_table_like_mut() {`
`465`	`465`	`match &self.source {`
`466`	`466`	`Some(Source::Registry(src)) => {`
`467`		`- table.insert("version", toml_edit::value(src.version.as_str()));`
	`467`	`+ overwrite_value(table, "version", src.version.as_str());`
`468`	`468`
`469`	`469`	`for key in ["path", "git", "branch", "tag", "rev", "workspace"] {`
`470`	`470`	`table.remove(key);`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`	`Some(Source::Path(src)) => {`
`474`	`474`	`let relpath = path_field(crate_root, &src.path);`
`475`		`- table.insert("path", toml_edit::value(relpath));`
	`475`	`+ overwrite_value(table, "path", relpath);`
`476`	`476`	`if let Some(r) = src.version.as_deref() {`
`477`		`- table.insert("version", toml_edit::value(r));`
	`477`	`+ overwrite_value(table, "version", r);`
`478`	`478`	`} else {`
`479`	`479`	`table.remove("version");`
`480`	`480`	`}`
`@@ -484,24 +484,24 @@ impl Dependency {`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`	`Some(Source::Git(src)) => {`
`487`		`- table.insert("git", toml_edit::value(src.git.as_str()));`
	`487`	`+ overwrite_value(table, "git", src.git.as_str());`
`488`	`488`	`if let Some(branch) = src.branch.as_deref() {`
`489`		`- table.insert("branch", toml_edit::value(branch));`
	`489`	`+ overwrite_value(table, "branch", branch);`
`490`	`490`	`} else {`
`491`	`491`	`table.remove("branch");`
`492`	`492`	`}`
`493`	`493`	`if let Some(tag) = src.tag.as_deref() {`
`494`		`- table.insert("tag", toml_edit::value(tag));`
	`494`	`+ overwrite_value(table, "tag", tag);`
`495`	`495`	`} else {`
`496`	`496`	`table.remove("tag");`
`497`	`497`	`}`
`498`	`498`	`if let Some(rev) = src.rev.as_deref() {`
`499`		`- table.insert("rev", toml_edit::value(rev));`
	`499`	`+ overwrite_value(table, "rev", rev);`
`500`	`500`	`} else {`
`501`	`501`	`table.remove("rev");`
`502`	`502`	`}`
`503`	`503`	`if let Some(r) = src.version.as_deref() {`
`504`		`- table.insert("version", toml_edit::value(r));`
	`504`	`+ overwrite_value(table, "version", r);`
`505`	`505`	`} else {`
`506`	`506`	`table.remove("version");`
`507`	`507`	`}`
`@@ -511,7 +511,7 @@ impl Dependency {`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`	`Some(Source::Workspace(_)) => {`
`514`		`- table.insert("workspace", toml_edit::value(true));`
	`514`	`+ overwrite_value(table, "workspace", true);`
`515`	`515`	`table.set_dotted(true);`
`516`	`516`	`key.fmt();`
`517`	`517`	`for key in [`
`@@ -533,7 +533,7 @@ impl Dependency {`
`533`	`533`	`}`
`534`	`534`	`if table.contains_key("version") {`
`535`	`535`	`if let Some(r) = self.registry.as_deref() {`
`536`		`- table.insert("registry", toml_edit::value(r));`
	`536`	`+ overwrite_value(table, "registry", r);`
`537`	`537`	`} else {`
`538`	`538`	`table.remove("registry");`
`539`	`539`	`}`
`@@ -542,11 +542,11 @@ impl Dependency {`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`if self.rename.is_some() {`
`545`		`- table.insert("package", toml_edit::value(self.name.as_str()));`
	`545`	`+ overwrite_value(table, "package", self.name.as_str());`
`546`	`546`	`}`
`547`	`547`	`match self.default_features {`
`548`	`548`	`Some(v) => {`
`549`		`- table.insert("default-features", toml_edit::value(v));`
	`549`	`+ overwrite_value(table, "default-features", v);`
`550`	`550`	`}`
`551`	`551`	`None => {`
`552`	`552`	`table.remove("default-features");`
`@@ -564,29 +564,40 @@ impl Dependency {`
`564`	`564`	`})`
`565`	`565`	`.unwrap_or_default();`
`566`	`566`	`features.extend(new_features.iter().map(\|s\| s.as_str()));`
`567`		`- let features = toml_edit::value(features.into_iter().collect::<toml_edit::Value>());`
	`567`	`+ let features = features.into_iter().collect::<toml_edit::Value>();`
`568`	`568`	`table.set_dotted(false);`
`569`		`- table.insert("features", features);`
	`569`	`+ overwrite_value(table, "features", features);`
`570`	`570`	`} else {`
`571`	`571`	`table.remove("features");`
`572`	`572`	`}`
`573`	`573`	`match self.optional {`
`574`	`574`	`Some(v) => {`
`575`	`575`	`table.set_dotted(false);`
`576`		`- table.insert("optional", toml_edit::value(v));`
	`576`	`+ overwrite_value(table, "optional", v);`
`577`	`577`	`}`
`578`	`578`	`None => {`
`579`	`579`	`table.remove("optional");`
`580`	`580`	`}`
`581`	`581`	`}`
`582`		`-`
`583`		`- table.fmt();`
`584`	`582`	`} else {`
`585`	`583`	`unreachable!("Invalid dependency type: {}", item.type_name());`
`586`	`584`	`}`
`587`	`585`	`}`
`588`	`586`	`}`
`589`	`587`
	`588`	`+fn overwrite_value(`
	`589`	`+ table: &mut dyn toml_edit::TableLike,`
	`590`	`+ key: &str,`
	`591`	`+ value: impl Into<toml_edit::Value>,`
	`592`	`+) {`
	`593`	`+ let mut value = value.into();`
	`594`	`+ let existing = table.entry(key).or_insert_with(\|\| Default::default());`
	`595`	`+ if let Some(existing_value) = existing.as_value() {`
	`596`	`+ *value.decor_mut() = existing_value.decor().clone();`
	`597`	`+ }`
	`598`	`+ *existing = toml_edit::Item::Value(value);`
	`599`	`+}`
	`600`	`+`
`590`	`601`	`fn invalid_type(dep: &str, key: &str, actual: &str, expected: &str) -> anyhow::Error {`
`591`	`602`	`anyhow::format_err!("Found {actual} for {key} when {expected} was expected for {dep}")`
`592`	`603`	`}`