mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
11910 commits 769 branches 798 tags 274 MiB
Commit graph

56 commits

Author SHA1 Message Date
Max Brunsfeld
24141c2f16 Ensure collaborators cursor colors are the same in channel buffers as in projects 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 11:31:41 -07:00
Max Brunsfeld
a127b0d3e6 Fix warnings surfaced in Rust 1.71 2023-08-02 09:19:23 -07:00
Antonio Scandurra
2e0d051a78 Maintain cursor stack's position correctly when ascending the tree 
This fixes a bug that could cause the cursor to incorrectly report its
start when using `slice` or `seek_forward`, and then calling `prev`. We
didn't notice this because we were not testing those three methods
together.

I suppose this could explain some of the panics we've observed because
we do use `slice`/`seek_forward` followed by `prev` calls in production.
 2023-07-27 12:34:03 +02:00
Antonio Scandurra
f77b680db9 Account for inlay biases when clipping a point 2023-06-29 22:25:50 +03:00
Antonio Scandurra
976edfedf7 Add Cursor::next_item 2023-06-29 22:25:50 +03:00
Kirill Bulatov
63074c5cd8 Better bias selection for hints that prefix the type 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-06-29 22:25:49 +03:00
Nathan Sobo
8c298a9da5 Rename SumTree::push_tree to ::append 2023-06-19 19:49:33 -06:00
Mikayla Maki
34e134fafb
Fix several randomized test failures with the new git status implementation 2023-06-07 14:10:17 -07:00
Mikayla Maki
6ef0f70528
Made the map seek target a publicly implementable interface 
Integrated remove_range with the existing git code

co-authored-by: Nathan <nathan@zed.dev>
 2023-05-12 08:37:32 -07:00
Nathan Sobo
ee3637216e
Add TreeMap::remove_between that can take abstract start and end points 
This commit introduces a new adaptor trait for SeekTarget that works around
frustrating issues with lifetimes. It wraps the arguments in a newtype wrapper
that lives on the stack to avoid the lifetime getting extended to the caller
of the method.

This allows us to introduce a PathSuccessor object that can be passed as the
end argument of remove_between to remove a whole subtree.
 2023-05-12 08:21:01 -07:00
Mikayla Maki
d526fa6f1f
fmt 2023-05-11 16:06:56 -07:00
Mikayla Maki
d538994c7f
Use more efficient sum tree traversals for removal and improve ergonomics with iter_from 
co-authored-by: Nathan <nathan@zed.dev>
 2023-05-11 16:06:25 -07:00
Mikayla Maki
1bb34e08bb
Fix test 2023-05-11 12:03:39 -07:00
Mikayla Maki
dfb6a2f7fc
fmt 2023-05-11 12:02:25 -07:00
Mikayla Maki
5b2ee63f80
Added status trickle up 2023-05-11 12:01:42 -07:00
Mikayla Maki
e20eaca595
Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki
00b345fdfe
Use sum tree traversal to remove paths 2023-05-10 17:37:36 -07:00
Mikayla Maki
67491632cb
WIP: Track live entry status in repository 
co-authored-by: petros <petros@zed.dev>
 2023-05-10 17:37:36 -07:00
Mikayla Maki
023d665fb3
Fix TreeMap retain 2023-05-08 14:33:58 -07:00
Mikayla Maki
563f13925f
WIP: Convert old git repository vec to new treemap based approach. 
co-authored-by: Nathan <nathan@zed.dev>
 2023-05-08 14:33:58 -07:00
Mikayla Maki
a58d3d8128
Add a data driven representation of the current git repository state to the worktree snapshots 
WIP: Switch git repositories to use SumTrees

Co-authored-by: Nathan <nathan@zed.dev>
 2023-05-08 14:33:58 -07:00
Max Brunsfeld
ebbe52e6b0 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Antonio Scandurra
137d9384b5 Initialize the active editor when vim mode is enabled 
Instead of waiting for a focus event. This makes more tests pass.
 2023-04-20 14:02:40 -06:00
Max Brunsfeld
2d97387f49 Restructure background scanner to handle refresh requests even while scanning 2023-04-12 16:29:51 -07:00
Mikayla Maki
d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Joseph Lyons
233b28a1b9 Appease clippy 2023-01-01 23:50:45 -05:00
Julia
00b7c78e33 Initial hacky displaying of git gutter in multi-buffers 2022-12-13 12:35:58 -05:00
Julia
61ff24edc8 Move cloneable diff state into new snapshot type 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-29 13:16:02 -04:00
Max Brunsfeld
f6a817a0f3 Start work on a SyntaxMap data structure 2022-08-21 11:37:10 -07:00
ForLoveOfCats
8ba2f77148 One big cleanup pass of clippy lints 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2022-08-10 16:51:01 -07:00
Antonio Scandurra
df33556693 Introduce a new TreeSet struct in sum_tree 
This is just a special case of `TreeMap<K, V>` where `V = ()`.
 2022-07-18 13:40:30 +02:00
Max Brunsfeld
724affc442 Upgrade deps to avoid multiple versions of transitive deps 
* env_logger
* prost-build
* bindgen
 2022-06-02 17:38:33 -07:00
Max Brunsfeld
a2c22a5e43 Prevent eager snapshot mutations from being clobbered by background updates 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-04 15:10:39 -07:00
Max Brunsfeld
438e4e7a19 Allow guests to rename stuff 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-04 10:28:44 -07:00
Nathan Sobo
7e5a3f9f6b Introduce structured logging 
We're enabling the log crate feature everywhere, but only using it on the server for now.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-08 10:06:51 -06:00
Antonio Scandurra
a6d0caf557 Don't seek FilterCursor upon creation 
This lets us use `next` or `prev` to decide whether to park the cursor
at the first or last filtered item.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:13:23 +01:00
Antonio Scandurra
f10fd6c419 Randomize test FilterCursor::prev 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:13:23 +01:00
Antonio Scandurra
45ce503afd Start on implementing filtering support for Cursor::prev 2022-03-15 15:13:23 +01:00
Nathan Sobo
e6b1fea117 WIP 2022-03-10 11:32:14 -07:00
Max Brunsfeld
05df1dfae9 Disable doctests for all libraries 
We don't use them, and they add a lot of noise to the test output
when running all tests in the workspace.
 2022-03-03 16:15:56 -08:00
Antonio Scandurra
f649074d36 Refine project find's UX 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-25 15:27:34 +01:00
Max Brunsfeld
34bba303dc In random collaboration test, add failing assertion for worktree convergence 2022-02-15 14:55:38 -08:00
Max Brunsfeld
0e55f0ccaa Use Rust 2021 edition in all crates 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-26 12:50:31 -08:00
Nathan Sobo
2dbee1d914 Send diagnostic summaries to guests when they join the project 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-01-06 12:12:09 -07:00
Antonio Scandurra
eb65a5d29a Fix TreeMap::get always returning None 2022-01-05 15:41:30 +01:00
Antonio Scandurra
2adf11e204 Write a simple unit test for TreeMap and fix bug in remove 2021-12-13 11:20:10 +01:00
Nathan Sobo
4dd0752e80 More messy progress towards selections in editors 2021-12-11 00:29:34 -07:00
Nathan Sobo
0639c8331c Relax TreeMap value bounds, fix warnings, simplify cmp 2021-12-10 23:35:24 -07:00
Nathan Sobo
49d1c9d1ba Introduce sum_tree::TreeMap<K, V> 
I think this will be useful to avoid cloning HashMaps in certain cases such as snapshots.
 2021-12-10 23:33:15 -07:00
Antonio Scandurra
65711b2256 Remove anchor collections 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:28:27 +01:00