Merge pull request #487 from a-kenji/ke-fix-pin-unpin

inputs/pin: skip inputs without URL

Author: a-kenji

src/update.rs

@@ -176,6 +176,11 @@ impl Updater {
     pub fn new(text: Rope, map: InputMap) -> Self {
         let mut inputs = vec![];
         for (_id, input) in map {
+            // Skip inputs without a URL (e.g. expanded type/owner/repo/ref format
+            // or follows-only stubs) — there is no quoted URL value to modify.
+            if input.url.is_empty() || input.range.start == 0 && input.range.end == 0 {
+                continue;
+            }
             inputs.push(UpdateInput { input });
         }
         Self {

src/walk/inputs.rs

@@ -54,6 +54,7 @@ pub fn insert_with_ctx(
         if let Some(node) = inputs.get_mut(&id) {
             if !input.url.to_string().is_empty() {
                 node.url = input.url;
+                node.range = input.range;
             }
             if !input.flake {
                 node.flake = input.flake;
@@ -380,7 +381,7 @@ fn handle_nested_input(
         for binding in attr.children() {
             if binding.to_string() == "url" {
                 let url = binding.next_sibling().unwrap();
-                let input = Input::with_url(id_str.clone(), url.to_string(), input_id.text_range());
+                let input = Input::with_url(id_str.clone(), url.to_string(), url.text_range());
                 insert_with_ctx(inputs, id_str.clone(), input, ctx);
             }
             if should_remove_input(change, ctx, &id_str) {

tests/snapshots/edit__flake_edit_list@completely_flat_toplevel_alt.snap

@@ -20,8 +20,8 @@ crane:
         - rust-overlay
         - "\"rust-overlay\""
   range:
-    start: 0
-    end: 0
+    start: 466
+    end: 488
 flake-utelinos:
   id: flake-utelinos
   flake: true
@@ -50,5 +50,5 @@ rust-overlay:
         - nixpkgs
         - "\"nixpkgs\""
   range:
-    start: 0
-    end: 0
+    start: 256
+    end: 285

tests/snapshots/edit__flake_edit_list@completely_flat_toplevel_not_a_flake_nested.snap

@@ -44,8 +44,8 @@ not-a-flake:
   url: "\"github:a-kenji/not-a-flake\""
   follows: []
   range:
-    start: 585
-    end: 596
+    start: 611
+    end: 639
 rust-overlay:
   id: rust-overlay
   flake: true

tests/snapshots/edit__flake_edit_list@one_level_nesting_flat_not_a_flake.snap

@@ -11,8 +11,8 @@ also-not-a-flake:
   url: "\"github:a-kenji/also-not-a-flake\""
   follows: []
   range:
-    start: 72
-    end: 88
+    start: 131
+    end: 164
 crane:
   id: crane
   flake: true

tests/snapshots/edit__flake_edit_list@toplevel_nesting.snap

@@ -20,8 +20,8 @@ crane:
         - rust-overlay
         - "\"rust-overlay\""
   range:
-    start: 272
-    end: 277
+    start: 292
+    end: 314
 nixpkgs:
   id: nixpkgs
   flake: true
@@ -42,5 +42,5 @@ rust-overlay:
         - nixpkgs
         - "\"nixpkgs\""
   range:
-    start: 111
-    end: 123
+    start: 138
+    end: 167

tests/snapshots/update__pin_follows_before_url.snap

@@ -0,0 +1,14 @@
+---
+source: tests/update.rs
+expression: updater.get_changes()
+---
+{
+  inputs = {
+    myInput = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:foo/bar/abc123";
+    };
+  };
+
+  outputs = { self, myInput }: { };
+}

tests/snapshots/update__unpin_expanded_format_no_crash.snap

@@ -0,0 +1,17 @@
+---
+source: tests/update.rs
+expression: updater.get_changes()
+---
+{
+  inputs = {
+    myInput = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "nixos-25.11";
+    };
+    pinned.url = "github:foo/bar";
+  };
+
+  outputs = { self, myInput, pinned }: { };
+}

tests/snapshots/update__unpin_follows_before_url.snap

@@ -0,0 +1,14 @@
+---
+source: tests/update.rs
+expression: updater.get_changes()
+---
+{
+  inputs = {
+    myInput = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:foo/bar";
+    };
+  };
+
+  outputs = { self, myInput }: { };
+}

tests/snapshots/walker__walker_list_inputs@completely_flat_toplevel_alt.snap

@@ -20,8 +20,8 @@ crane:
         - rust-overlay
         - "\"rust-overlay\""
   range:
-    start: 0
-    end: 0
+    start: 466
+    end: 488
 flake-utelinos:
   id: flake-utelinos
   flake: true
@@ -50,5 +50,5 @@ rust-overlay:
         - nixpkgs
         - "\"nixpkgs\""
   range:
-    start: 0
-    end: 0
+    start: 256
+    end: 285