ACP champagne (#35609)

cherry pick changes from #35510 onto latest main

Release Notes:

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Lukas Wirth <lukas@zed.dev>
eb4b73b88eBen Brandt committed on 8/6/2025, 9:01:06 AM· committed by GitHubparent69794db
31 files changedLine totals unavailable