Merge pull request #125 from a-kenji/merge-nested

Improve merging of already constructed inputs
a-kenji · Aug 11, 2024 · de9f4d0 · de9f4d0
2 parents 62c2656 + 0603151
commit de9f4d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/walk.rs b/src/walk.rs
@@ -80,7 +80,12 @@ impl<'a> Walker {
         } else {
             // Update the input, in case there was already a stub present.
             if let Some(node) = self.inputs.get_mut(&id) {
-                node.url = input.url;
+                if !input.url.to_string().is_empty() {
+                    node.url = input.url;
+                }
+                if !input.flake {
+                    node.flake = input.flake;
+                }
             } else {
                 self.inputs.insert(id, input);
             }

diff --git a/tests/snapshots/edit__one_level_nesting_flat_no_flake_nested_list.snap b/tests/snapshots/edit__one_level_nesting_flat_no_flake_nested_list.snap
@@ -41,8 +41,8 @@ nixpkgs:
     end: 123
 not-a-flake:
   id: not-a-flake
-  flake: true
-  url: ""
+  flake: false
+  url: "\"github:a-kenji/not-a-flake\""
   follows: []
   range:
     start: 566