Commit Graph
12760 Commits
Author SHA1 Message Date
Antonio Scandurra 23f11fcd5e Merge branch 'main' into gpui2 2023-10-12 10:55:17 +02:00
Nathan Sobo 3dad0d9811 Add group_active 2023-10-11 21:48:21 -06:00
Nathan Sobo d920f7edc1 Add group hovers 2023-10-11 21:34:08 -06:00
Nathan Sobo f37b83a0ea WIP 2023-10-11 17:18:39 -06:00
Conrad Irwin be1800884e Make collaboration warning more useful (#3119)
Release Notes:

- Fixed the titlebar upgrade UI to restart zed when an update is
available
2023-10-11 15:35:41 -06:00
Nathan Sobo 93c233b1cf Checkpoint 2023-10-11 13:22:40 -06:00
Nathan Sobo 47b64a5074 Checkpoint 2023-10-11 12:51:56 -06:00
Joseph T. Lyons d6fa06b3be collab 0.24.0 2023-10-11 13:51:01 -04:00
Nathan Sobo e2da2b232e Checkpoint 2023-10-11 11:40:42 -06:00
Joseph T. Lyons bdf1731db3 v0.109.x dev 2023-10-11 12:40:57 -04:00
Antonio Scandurra 006f840570 Checkpoint 2023-10-11 17:53:29 +02:00
Conrad Irwin 2d6725a41a Make collaboration warning more useful 2023-10-11 09:50:22 -06:00
Antonio Scandurra 457df8d3f3 Start and stop display link on the main thread 2023-10-11 16:38:54 +02:00
Antonio Scandurra b6e4208ea8 Checkpoint 2023-10-11 15:08:28 +02:00
Antonio Scandurra 56fba5541a Checkpoint 2023-10-11 14:19:04 +02:00
Antonio Scandurra a69dbafe3c Checkpoint 2023-10-11 12:47:19 +02:00
Antonio Scandurra a9c69bf774 Checkpoint 2023-10-11 12:45:09 +02:00
Antonio Scandurra b6a3d9ce59 Checkpoint 2023-10-11 11:03:08 +02:00
Antonio Scandurra eebbc807e5 Checkpoint 2023-10-11 10:45:57 +02:00
Antonio Scandurra 0fb7364235 Checkpoint 2023-10-11 09:17:25 +02:00
Joseph T. Lyons 76191fe47d Fix Discord text truncation 2023-10-11 01:54:32 -04:00
Nathan Sobo f1cc62c21f WIP 2023-10-10 22:49:47 -06:00
Nathan Sobo f53b63eaf6 Checkpoint 2023-10-10 22:14:47 -06:00
Conrad Irwin 821997d372 Revert accidental build change 2023-10-10 19:59:57 -06:00
Conrad Irwin 85b76b1143 Don't wrap on paragraphs (#3094)
Release Notes:

- vim: `{` and `}` will no longer wrap around end of file
([#2116](https://github.com/zed-industries/community/issues/2116)).
2023-10-10 19:25:40 -06:00
Conrad Irwin 9004254fbf vim: Add shift-y (#3117)
Release Notes:

- vim: Add `Y` to copy line-wise (this copies vim's behaviour, which
differs from nvim's)
2023-10-10 19:25:32 -06:00
Conrad Irwin 1de9add304 vim: Add shift-y 2023-10-10 18:46:49 -06:00
Max Brunsfeld 7a39455af9 Fix inclusion of spurious views from other projects in FollowResponse (#3116)
A logic error in https://github.com/zed-industries/zed/pull/2993 caused
follow responses to sometimes contain extra views for other unshared
projects 😱 . These views would generally fail to deserialize on the
other end. This would create a broken intermediate state, where the
following relationship was registered on the server (and on the leader's
client), but the follower didn't have the state necessary for following
into certain views.

Release Notes:

- Fixed a bug where following would sometimes fail if the leader had
another unshared project open.
2023-10-10 15:53:11 -07:00
Max Brunsfeld 96d60eff23 Fix inclusion of spurious views from other projects in FollowResponse 2023-10-10 15:40:40 -07:00
Mikayla Maki 19f774a4a4 Update channel rooms to be ephemeral (#3115)
This fixes a bug that was introduced by
https://github.com/zed-industries/zed/pull/3093, which assumed that
rooms for channels where ephemeral, by making rooms for channels
ephemeral.

Release Notes:

- N/A
2023-10-10 13:28:42 -07:00
Mikayla d7d027bcf1 Rename release channel to enviroment 2023-10-10 13:23:03 -07:00
Joseph T. Lyons e6228ca682 Slim down pull request template 2023-10-10 16:04:31 -04:00
40430cf01b Update channel rooms to be ephemeral
Remove redundant live kit initialization code
Fix bug in recent channel links changes where channel rooms would have the incorrect release set

co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
co-authored-by: Max <max@zed.dev>
2023-10-10 12:39:16 -07:00
Nathan Sobo 61b8ad38bd Remove state erasure for now 2023-10-10 12:44:40 -06:00
Nathan Sobo e714653478 Checkpoint 2023-10-10 12:42:44 -06:00
Nathan Sobo d70b4f04f6 Checkpoint 2023-10-10 12:41:28 -06:00
Antonio Scandurra 9eff99de49 --amend 2023-10-10 20:02:34 +02:00
Antonio Scandurra 4855b8f3de WIP 2023-10-10 20:02:23 +02:00
Antonio Scandurra 84ad2cb827 Checkpoint 2023-10-10 19:48:32 +02:00
Antonio Scandurra 0e537cced4 Revert outline summarization (#3114)
This pull request essentially reverts #3067: we noticed that only using
the function signatures produces far worse results in codegen, and so
that feels like a regression compared to before. We should re-enable
this once we have a smarter approach to fetching context during codegen,
possibly when #3097 lands.

As a drive-by, we also fixed a longstanding bug that caused codegen to
include the final line of a selection even if the selection ended at the
start of the line.

Ideally, I'd like to hot fix this to preview so that it goes to stable
during the weekly release.

/cc: @KCaverly @nathansobo 

Release Notes:

- N/A
2023-10-10 19:20:54 +02:00
Antonio Scandurra b366592878 Don't include start of a line when selection ends at start of line 2023-10-10 19:11:13 +02:00
Antonio ScandurraandNathan Sobo 5cf92980f0 Revert summarizing file content until we can be more intelligent about what we send
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-10 17:51:17 +02:00
Antonio Scandurra 97edec6e72 WIP 2023-10-10 17:31:42 +02:00
Conrad Irwin 66af1707a1 Add channel links (#3093)
Release notes:

- `mute_on_join` setting now defaults to false.
- Right click on a channel to "Copy Channel Link", these links work to
open Zed and auto-join the channel

Blocked on: https://github.com/zed-industries/zed.dev/pull/388
2023-10-10 08:53:50 -06:00
Antonio Scandurra 96fbf9fd06 Checkpoint 2023-10-10 16:47:09 +02:00
Antonio Scandurra 48a12be538 WIP 2023-10-10 15:03:47 +02:00
Antonio Scandurra 012a7743ad Checkpoint 2023-10-10 14:43:55 +02:00
Antonio Scandurra 678235023f Checkpoint 2023-10-10 13:07:53 +02:00
Antonio Scandurra a4afb72535 Checkpoint: beziers 2023-10-10 13:01:35 +02:00
Kirill Bulatov 1db24e5f2a Omit history files with path that does not exist on disk anymore (#3113) 2023-10-10 11:55:06 +02:00