Commit Graph
39175 Commits
Author SHA1 Message Date
Antonio Scandurra 5fd0511fc6 Make writing/reading FoldMap explicit so that we can retrieve edits 2021-07-16 13:49:38 +02:00
Antonio Scandurra e11299b5db Pull snapshot history out of fold map 2021-07-16 13:49:02 +02:00
Max Brunsfeld d6e5ff9a01 Add FoldMapSnapshot::edits_since_creation 2021-07-15 18:27:59 -07:00
Nathan SoboandMax Brunsfeld db60b40f7c Try to return edits from FoldMap::apply_edits
The goal is to describe how the fold map changed. Hopefully this is correct.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-15 15:08:18 -06:00
Nathan SoboandMax Brunsfeld cd797a5a0d Give the FoldMap its own edit type that does not have deleted_lines
We want to use this struct to communicate about edits performed to the fold map itself, and it will be simpler if we don't have to communicate this data.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-15 14:19:58 -06:00
Max Brunsfeld c3e5ab60f6 Move DisplayMap's reading methods to DisplayMapSnapshot 2021-07-15 11:48:57 -07:00
Nathan SoboandMax Brunsfeld a1963af703 Move all FoldMap query methods to FoldMapSnapshot
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-15 11:36:24 -06:00
Nathan Sobo d8a7c925a0 Introduce buffer::Content<'a> struct to share logic with buffer::Snapshot
We want to move a bunch of methods on FoldMap to fold_map::Snapshot. This captures a buffer snapshot, and we'll need a bunch of methods that currently are on Buffer to also be implemented on buffer::Snapshot. This Content reference struct will be a good zero-cost place to store that logic.
2021-07-15 09:50:50 -06:00
Antonio Scandurra ce7621d82e Calculate an old_lines range in Edits iterator 2021-07-15 10:11:24 +02:00
Antonio Scandurra 1668ab92f8 WIP 2021-07-14 19:09:46 +02:00
Antonio Scandurra 25cb9be4cd WIP: Start on WrapMap 2021-07-14 18:43:48 +02:00
Antonio Scandurra e15f41ecf6 Merge pull request #110 from zed-industries/fs-refactor
Decouple our fs module from details of the Worktree
2021-07-14 09:36:40 +02:00
Antonio Scandurra 20de9c23ba 💄 2021-07-14 09:25:12 +02:00
Max Brunsfeld 87ba09aeb5 🎨 Use fs::Metadata in fs::FakeFsEntry 2021-07-13 16:03:54 -07:00
Max Brunsfeld fb0c70e9fe Move the fs module out of worktree 2021-07-13 15:40:11 -07:00
Max Brunsfeld e67eeacc4f Decouple Fs trait from Worktree
Make it a more direct shim for the standard FS APIs
2021-07-13 15:40:11 -07:00
Nathan Sobo 3aaa00bfd0 Merge pull request #109 from zed-industries/server
Include contents of the zed-server repo
2021-07-13 15:52:00 -06:00
Max Brunsfeld b3ada94b50 Fix flaky FileFinder test by avoiding redundant worktree snapshot polls when idle 2021-07-13 13:53:51 -07:00
Max Brunsfeld a4408f3bf8 Fix error message when connection's IO loop exits before message loop 2021-07-13 13:00:10 -07:00
Max Brunsfeld 4fe5baeb12 Use FakeFs in all integration tests 2021-07-13 12:48:00 -07:00
Nathan SoboandMax Brunsfeld a67845e0fb Fix race condition in integration test
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-13 13:24:48 -06:00
Nathan SoboandMax Brunsfeld d8ac0584ab Move Fs trait into its own module
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-13 12:52:42 -06:00
4634097115 Use an unbounded channel for waking executor::Deterministic
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2021-07-13 18:46:48 +02:00
78dbafb1d0 Rename zed-rpc to zrpc
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2021-07-13 18:22:00 +02:00
bf172f29f2 Use the same background executor for spawning CPU intensive tasks
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2021-07-13 18:13:25 +02:00
Antonio ScandurraandNathan Sobo ce0783dee2 Remove stray logging statements
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-07-13 17:47:54 +02:00
Antonio ScandurraandNathan Sobo a514efd48e Fix tests that were not aware of Worktree::open_local being async
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-07-13 17:27:40 +02:00
Antonio Scandurra 064c4e152b WIP 2021-07-13 16:36:35 +02:00
Antonio Scandurra 5e6952fa71 Use an executor::Background in AppContext::thread_pool 2021-07-13 14:06:38 +02:00
Antonio Scandurra 75f3ae5293 Don't create a real background executor when Fs is fake 2021-07-13 12:32:10 +02:00
Antonio Scandurra 350e3f03fb Allow printing a trace of a run of the executor 2021-07-13 12:31:36 +02:00
Antonio Scandurra 3680d67a85 Use an unfair lock to ensure tests are deterministic
Also avoid using `smol::block_on` as it interacts with their `Reactor`.
2021-07-13 09:45:59 +02:00
Max BrunsfeldandNathan Sobo 4951777c64 Store an Fs on Workspace, pass it to each Worktree
Push test-only worktree behavior down into the Fs,
via a `watch` method which provides fs events.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-07-12 17:26:14 -07:00
Nathan SoboandMax Brunsfeld da702e6ae1 Fix CSS purge path
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-12 14:50:51 -06:00
Nathan SoboandMax Brunsfeld 6759ab708f Pass arguments to cargo run in script/server
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-12 14:50:39 -06:00
Nathan SoboandMax Brunsfeld 63a3574bc1 Include contents of the zed-server repo
We're going full monorepo.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-07-12 14:14:39 -06:00
Antonio Scandurra 8594db6bda 🔥 Remove stray logging statements 2021-07-12 17:52:16 +02:00
Antonio ScandurraandNathan Sobo 5595e2f36f Allow worktrees to be joined with no open window
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-07-12 17:44:53 +02:00
Antonio ScandurraandNathan Sobo 0f5a507da1 Ensure root view is always rendered when opening a window
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-07-12 17:44:10 +02:00
Antonio Scandurra 9f1bc491d5 Pass AppState to workspace:join_worktree 2021-07-12 17:02:22 +02:00
Antonio Scandurra ec87ed1d0a Ignore whitespaces surrounding a shared worktree's URL 2021-07-12 14:16:36 +02:00
Antonio Scandurra 5d55ea57f2 Don't lose operations for buffers that are being opened 2021-07-12 11:59:56 +02:00
Antonio Scandurra 2a03d86543 Allow resetting executor::Deterministic's RNG 2021-07-11 11:26:06 +02:00
Antonio Scandurra 724ffab311 Avoid unnecessary Result in returned message handler future 2021-07-10 12:33:54 +02:00
Antonio Scandurra 494273b466 Emit event when performing a rename in InMemoryFs 2021-07-10 08:48:49 +02:00
Nathan Sobo b9d939d28c Remove authentication at the RPC layer
This means we can remove IOHandler and return a simple future that is Send
2021-07-09 21:57:10 -06:00
Nathan Sobo 0eb3d815da Send an Authorization HTTP header when connecting web sockets 2021-07-09 21:27:33 -06:00
Nathan Sobo 8289b011f2 Pass AppState as action arg to workspace:share_worktree 2021-07-09 21:26:54 -06:00
Max Brunsfeld 42665e77ff Restructure Peer to handle connections' messages in order 2021-07-09 16:27:34 -07:00
b4370c19d6 Send buffer operations in the order they occur
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2021-07-09 19:07:04 +02:00