We require contributors to sign our Contributor License Agreement, and we don't have @lparry on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@cla-bot check

The cla-bot has been summoned, and re-checked this pull request!

I believe I have resolved the conflict & style linting problems now

@lparry I think there are still a bunch of errors when I try to compile it with cargo run. Can you give it a try and fix those errors?

@smitbarmase That's embarrassing, sorry about that! I've sorted out those errors & the warning, renamed interleaved to mixed (matching the vscode order name), and pruned some pointless comments where claude didn't follow Claude.md very well.

Running a copy of the dev zed bundle for 148da0c built via ./script/bundle-mac -li now with no errors

I've found a bug in the behaviour where the children of an expanded directory are not anchored correctly to the expected parent directory. I'll see if I can work out where I've gone wrong

@smitbarmase I've sorted out that bug now and added some more exhaustive tests that will hopefully cover more/most of the edge cases likely to come up.

Would love your opinion on if the default sort should be based on platform (so macos users automatically get the macos-like sort), or if it should remain as it is with the option of changing it to match the current OS? 🙏

Sorry to keep iterating on this after opening, but after screenshotting the various states I' realised that the directories first sort is supposed to be case insensitive, but another bug had tricked me into believing otherwise.

Realising that I think I can drop the case-sensitive mixed sort, and the near duplicate natural_sort_case_insensitive and simplify this a great deal

@lparry Sorry for the delay, I was out for a week and am now catching up on the backlog. After merging #41080, is this PR ready for review? I think we should keep the default sort as-is for now.

I’m curious about the project panel benchmarks for these. You can run them with:

• See and save fresh results: cargo bench --package project_panel --bench sorting -- --save-baseline initial
• Compare against a specific baseline: cargo bench --package project_panel --bench sorting -- --baseline initial
• Clear all baselines: rm -rf target/criterion

You can run the first command on current main to save the initial baseline, then check out your branch and, for each sort mode, run the second command to compare. It’ll show the perf delta as a percentage relative to main. Intresting to see that. You might also have to update the path here to point to your local Zed repo to make it work:

@smitbarmase No worries, thanks for chasing me up on this. I think it's in a much simpler state now with #41080 shipped. I've just rebased it against main and sorted out the conflicts.

Benchmarks came back "within noise threshold" for the equivalent of the existing directories first search, roughly the same again for files first, and every so slightly faster for the mixed approach, but in absolute terms it's 1ms so it's not really a significant gain.

~/src/zed on  lparry/more-file-sort-options took 30s

❯ cargo bench --package project_panel --bench sorting -- --baseline initial
    Finished `bench` profile [optimized + debuginfo] target(s) in 0.53s
     Running benches/sorting.rs (target/release/deps/sorting-00f7e87f638e5a84)
Gnuplot not found, using plotters backend
Sort linux worktree snapshot
                        time:   [11.816 ms 11.945 ms 12.123 ms]
                        change: [+0.7822% +2.1327% +3.6946%] (p = 0.00 < 0.05)
                        Change within noise threshold.
Found 3 outliers among 100 measurements (3.00%)
  1 (1.00%) high mild
  2 (2.00%) high severe

Sort linux worktree snapshot (Mixed)
                        time:   [10.852 ms 10.902 ms 10.952 ms]
                        change: [-1.6201% -0.8413% -0.1035%] (p = 0.03 < 0.05)
                        Change within noise threshold.

Sort linux worktree snapshot (FilesFirst)
                        time:   [11.440 ms 11.495 ms 11.554 ms]
                        change: [-0.9354% -0.2222% +0.4976%] (p = 0.56 > 0.05)
                        No change in performance detected.
Found 2 outliers among 100 measurements (2.00%)
  1 (1.00%) high mild
  1 (1.00%) high severe

Actually, give me a sec to get those tests sorted before you spend time reviewing this 🙏

@smitbarmase tests are green again now, I think this is probably good to go now 🤞

Fresh benchmarks since there was some logic changed to get the tests green again:

❯ cargo bench --package project_panel --bench sorting -- --baseline initial
    Finished `bench` profile [optimized + debuginfo] target(s) in 0.75s
     Running benches/sorting.rs (target/release/deps/sorting-00f7e87f638e5a84)
Gnuplot not found, using plotters backend
Sort linux worktree snapshot
                        time:   [11.431 ms 11.479 ms 11.526 ms]
                        change: [-2.5705% -1.8497% -1.1229%] (p = 0.00 < 0.05)
                        Performance has improved.

Sort linux worktree snapshot (Mixed)
                        time:   [8.9500 ms 8.9825 ms 9.0185 ms]
                        change: [-18.869% -18.301% -17.726%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 3 outliers among 100 measurements (3.00%)
  2 (2.00%) high mild
  1 (1.00%) high severe

Sort linux worktree snapshot (FilesFirst)
                        time:   [8.5998 ms 8.6351 ms 8.6707 ms]
                        change: [-25.565% -25.044% -24.519%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 1 outliers among 100 measurements (1.00%)
  1 (1.00%) high mild

Benchmark looks good. Thank you so much for working on this!