inputs: allow removal of follows-only inputs

Author: a-kenji

src/walk/inputs.rs

@@ -806,7 +806,9 @@ fn handle_follows_attr(
     let follows = attr.parent().unwrap().next_sibling().unwrap();
     let input = Input::with_url(id.to_string(), follows.to_string(), follows.text_range());
     insert_with_ctx(inputs, id.to_string(), input.clone(), ctx);
-    if ctx.is_some() && should_remove_nested_input(change, ctx, input.id()) {
+    if should_remove_input(change, ctx, input.id())
+        || should_remove_nested_input(change, ctx, input.id())
+    {
         return Some(empty_node());
     }
     None

tests/edit.rs

@@ -142,6 +142,10 @@ fn test_first_nested_node_add_with_list(#[case] is_flake: bool) {
 #[case("leading_comma_outputs", "fenix")]
 #[case("outputs_paren", "flake-parts")]
 #[case("quoted_input_with_dots", "\"hls-1.10\"")]
+#[case("follows_only_toplevel", "sizelint")]
+#[case("follows_only_toplevel", "treefmt-nix")]
+#[case("follows_only_nested", "sizelint")]
+#[case("follows_only_nested", "treefmt-nix")]
 fn test_remove_input(#[case] fixture: &str, #[case] input_id: &str) {
     let content = load_flake(fixture);
     let mut flake_edit = FlakeEdit::from_text(&content).unwrap();

tests/fixtures/follows_only_nested.flake.nix

@@ -0,0 +1,12 @@
+{
+  description = "Test flake with follows-only inputs in nested block";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    harmonia.url = "github:nix-community/harmonia";
+    sizelint.follows = "nixpkgs";
+    treefmt-nix.follows = "harmonia/treefmt-nix";
+  };
+
+  outputs = _: { };
+}

tests/fixtures/follows_only_toplevel.flake.nix

@@ -0,0 +1,10 @@
+{
+  description = "Test flake with follows-only top-level inputs";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.harmonia.url = "github:nix-community/harmonia";
+  inputs.sizelint.follows = "nixpkgs";
+  inputs.treefmt-nix.follows = "harmonia/treefmt-nix";
+
+  outputs = _: { };
+}

tests/snapshots/edit__remove_input@follows_only_nested_sizelint.snap

@@ -0,0 +1,21 @@
+---
+source: tests/edit.rs
+expression: result
+info:
+  flake_nix: ""
+  changes:
+    - Remove:
+        ids:
+          - sizelint
+---
+{
+  description = "Test flake with follows-only inputs in nested block";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    harmonia.url = "github:nix-community/harmonia";
+    treefmt-nix.follows = "harmonia/treefmt-nix";
+  };
+
+  outputs = _: { };
+}

tests/snapshots/edit__remove_input@follows_only_nested_treefmt-nix.snap

@@ -0,0 +1,21 @@
+---
+source: tests/edit.rs
+expression: result
+info:
+  flake_nix: ""
+  changes:
+    - Remove:
+        ids:
+          - treefmt-nix
+---
+{
+  description = "Test flake with follows-only inputs in nested block";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    harmonia.url = "github:nix-community/harmonia";
+    sizelint.follows = "nixpkgs";
+  };
+
+  outputs = _: { };
+}

tests/snapshots/edit__remove_input@follows_only_toplevel_sizelint.snap

@@ -0,0 +1,19 @@
+---
+source: tests/edit.rs
+expression: result
+info:
+  flake_nix: ""
+  changes:
+    - Remove:
+        ids:
+          - sizelint
+---
+{
+  description = "Test flake with follows-only top-level inputs";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.harmonia.url = "github:nix-community/harmonia";
+  inputs.treefmt-nix.follows = "harmonia/treefmt-nix";
+
+  outputs = _: { };
+}

tests/snapshots/edit__remove_input@follows_only_toplevel_treefmt-nix.snap

@@ -0,0 +1,19 @@
+---
+source: tests/edit.rs
+expression: result
+info:
+  flake_nix: ""
+  changes:
+    - Remove:
+        ids:
+          - treefmt-nix
+---
+{
+  description = "Test flake with follows-only top-level inputs";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.harmonia.url = "github:nix-community/harmonia";
+  inputs.sizelint.follows = "nixpkgs";
+
+  outputs = _: { };
+}