initial attempt

Author: flying-sheep

Cargo.lock

@@ -300,10 +300,10 @@ pub fn collapse_sub_tables(tables: &mut Tables, name: &str, exclude: &[Vec<Strin
 
     // remove `name` from `exclude`s (and skip if `name` is not a prefix)
     let prefix = parse_ident(name).expect("could not parse prefix");
-    let exclude: BTreeSet<_> = exclude.into_iter().filter_map(|id| {
-        let (prefix_2, rest) = id.split_at(prefix.len()+1);
-        (prefix == prefix_2).then_some(rest)
-    }).collect();
+    let exclude: BTreeSet<_> = exclude.into_iter().filter_map(|id|
+        id.strip_prefix(prefix.as_slice())
+    ).collect();
+    dbg!(&exclude);
 
     let mut main = tables.table_set[*main_positions.first().unwrap()].borrow_mut();
     for key in sub_table_keys {
@@ -313,6 +313,10 @@ pub fn collapse_sub_tables(tables: &mut Tables, name: &str, exclude: &[Vec<Strin
         }
         let mut sub = tables.table_set[*sub_positions.first().unwrap()].borrow_mut();
         let sub_name = key.strip_prefix(sub_name_prefix.as_str()).unwrap();
+        let sub_path = parse_ident(sub_name).unwrap();
+        if exclude.contains(sub_path.as_slice()) {
+            continue;
+        }
         let mut header = false;
         for child in sub.iter() {
             let kind = child.kind();
@@ -362,8 +366,6 @@ pub fn parse_ident(ident: &str) -> Result<Vec<String>, String> {
         return Err(format!("semantic error: {e}"));
     }
 
-    dbg!(&root.errors());
-
     // We cannot use `.into_syntax()` since only the DOM transformation
     // allows accessing ident `.value()`s without quotes.
     let mut node = root;
@@ -381,3 +383,7 @@ pub fn parse_ident(ident: &str) -> Result<Vec<String>, String> {
     }
     Ok(parts)
 }
+
+fn prefixes<T>(slice: &[T]) -> impl Iterator<Item = &[T]> + DoubleEndedIterator {
+    (0..=slice.len()).map(|len| &slice[..len])
+}

common/src/table.rs

@@ -25,3 +25,4 @@ default = ["extension-module"]
 [dev-dependencies]
 rstest = "0.26.1" # parametrized tests
 indoc = { version = "2.0.6" }   # dedented test cases for literal strings
+pretty_assertions = { version = "1.4.1", features = ["alloc"] }

pyproject-fmt/Cargo.toml

@@ -3,6 +3,7 @@ use common::taplo::parser::parse;
 use common::taplo::syntax::SyntaxElement;
 use indoc::indoc;
 use rstest::rstest;
+use pretty_assertions::assert_eq;
 
 use crate::project::fix;
 use common::table::Tables;
@@ -539,6 +540,47 @@ fn evaluate(
         true,
         &[],
 )]
+
+#[case::project_entry_points_no_collapse(
+        indoc ! {r#"
+    [project]
+    entry-points.tox = {"tox-uv" = "tox_uv.plugin", "tox" = "tox.plugin"}
+    [project.scripts]
+    virtualenv = "virtualenv.__main__:run_with_catch"
+    [project.gui-scripts]
+    hello-world = "timmins:hello_world"
+    [project.entry-points."virtualenv.activate"]
+    bash = "virtualenv.activation.bash:BashActivator"
+    [project.entry-points]
+    B = {base = "vehicle_crash_prevention.main:VehicleBase"}
+    [project.entry-points."no_crashes.vehicle"]
+    base = "vehicle_crash_prevention.main:VehicleBase"
+    [project.entry-points.plugin-namespace]
+    plugin-name1 = "pkg.subpkg1"
+    plugin-name2 = "pkg.subpkg2:func"
+    "#},
+        indoc ! {r#"
+    [project]
+    classifiers = [
+      "Programming Language :: Python :: 3 :: Only",
+      "Programming Language :: Python :: 3.9",
+    ]
+    scripts.virtualenv = "virtualenv.__main__:run_with_catch"
+    gui-scripts.hello-world = "timmins:hello_world"
+    [project.entry-points]
+    B.base = "vehicle_crash_prevention.main:VehicleBase"
+    "no_crashes.vehicle".base = "vehicle_crash_prevention.main:VehicleBase"
+    plugin-namespace.plugin-name1 = "pkg.subpkg1"
+    plugin-namespace.plugin-name2 = "pkg.subpkg2:func"
+    tox.tox = "tox.plugin"
+    tox.tox-uv = "tox_uv.plugin"
+    "virtualenv.activate".bash = "virtualenv.activation.bash:BashActivator"
+    "#},
+        true,
+        (3, 9),
+        true,
+        &[vec!["project".to_string(), "entry-points".to_string()]],
+)]
 #[case::project_preserve_implementation_classifiers(
         indoc ! {r#"
     [project]