Commit Graph
12679 Commits
Author SHA1 Message Date
Antonio Scandurra a92c184bad Checkpoint 2023-10-11 11:03:08 +02:00
Antonio Scandurra 3338febd91 Checkpoint 2023-10-11 10:45:57 +02:00
Antonio Scandurra 9531c7d23f Checkpoint 2023-10-11 09:17:25 +02:00
Nathan Sobo b580a6afca WIP 2023-10-10 22:49:47 -06:00
Nathan Sobo 8542bd56d1 Checkpoint 2023-10-10 22:14:47 -06:00
Nathan Sobo 67ac6eedbf Remove state erasure for now 2023-10-10 12:44:40 -06:00
Nathan Sobo 41bd58d577 Checkpoint 2023-10-10 12:42:44 -06:00
Nathan Sobo 05f3dffc90 Checkpoint 2023-10-10 12:41:28 -06:00
Antonio Scandurra fa92a4f9b0 --amend 2023-10-10 20:02:34 +02:00
Antonio Scandurra f01c5ee6ad WIP 2023-10-10 20:02:23 +02:00
Antonio Scandurra 8619a85d39 Checkpoint 2023-10-10 19:48:32 +02:00
Antonio Scandurra 434e7544a0 WIP 2023-10-10 17:31:42 +02:00
Antonio Scandurra 5d2b80e634 Checkpoint 2023-10-10 16:47:09 +02:00
Antonio Scandurra 0f2f022ce5 WIP 2023-10-10 15:03:47 +02:00
Antonio Scandurra a877e48228 Checkpoint 2023-10-10 14:43:55 +02:00
Antonio Scandurra 5ed228d10e Checkpoint 2023-10-10 13:07:53 +02:00
Antonio Scandurra 328dc1b16f Checkpoint: beziers 2023-10-10 13:01:35 +02:00
Nathan Sobo 354fd62f89 Checkpoint 2023-10-09 21:46:49 -06:00
Nathan Sobo d574ba4852 Checkpoint 2023-10-09 21:30:14 -06:00
Nathan Sobo b4a96a79a3 Move events module up 2023-10-09 21:19:56 -06:00
Nathan Sobo c86d324113 Add basic mouse event handling 2023-10-09 21:17:56 -06:00
Nathan Sobo 3bb94b99a2 Checkpoint 2023-10-09 19:54:29 -06:00
Antonio Scandurra 0a1bf65acd WIP 2023-10-09 19:50:48 +02:00
Antonio Scandurra c50cc9d7af Checkpoint 2023-10-09 19:13:57 +02:00
Antonio Scandurra 2a849123a0 WIP 2023-10-09 16:02:55 +02:00
Marshall Bowers 5ea841e384 Merge branch 'main' into gpui2 2023-10-07 12:15:23 -04:00
Marshall Bowers dc4b183fa0 Fix icon paths 2023-10-07 10:51:19 -04:00
Marshall Bowers e536d37774 Revert changes to gpui2 crate 2023-10-07 10:50:50 -04:00
Marshall Bowers f403508188 Merge branch 'main' into gpui2 2023-10-07 10:50:05 -04:00
Max Brunsfeld 4999dc0a92 collab 0.23.3 2023-10-06 11:25:46 -07:00
Max Brunsfeld 75214f7a5a Fix error in query for last N channel messages (#3100) 2023-10-06 11:24:34 -07:00
Joseph T. Lyons f012ad0594 Use display name for release channel in panic events (#3101)
This was a mistake from long ago - something I've been meaning to fix
for a long time. All other events use `display_name()`, but panic
events, which leads to mistakes when filtering out `Zed Dev`, which
isn't the format that `dev_name()` returns. I'm adding a fix to zed.dev
as well:

- https://github.com/zed-industries/zed.dev/pull/393

so that the values are adjusted for all clients, not just ones with this
fix. I will correct the data in clickhouse, and adjust the queries in
metabase.

Release Notes:

- N/A
2023-10-06 14:20:06 -04:00
Joseph T. Lyons d20a0af4fe Use display name for release channel in panic events 2023-10-06 14:04:38 -04:00
Max Brunsfeld 698a7eb32c Fix error in query for last N channel messages 2023-10-06 10:58:34 -07:00
Joseph T. Lyons fc032f6bb4 Add session id to panic events (#3098)
Release Notes:

- N/A
2023-10-06 13:32:45 -04:00
fcd44e93d3 Mainline GPUI2 UI work (#3099)
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Included in this is a performance improvement to make use of the
`TextLayoutCache` when calling `layout` for `Text` elements.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
2023-10-06 13:18:56 -04:00
Joseph T. Lyons 03558e430f Add session id to panic events 2023-10-06 12:32:20 -04:00
Antonio Scandurra 4ffd67fd8f Checkpoint: underlines 2023-10-06 15:34:37 +02:00
Piotr Osiewicz d2ff0ea117 chore: Upgrade to Rust 1.73 (#3096)
Release Notes:
- N/A
2023-10-06 14:50:29 +02:00
Piotr Osiewicz 7958d8d4c7 rust: Highlight async functions in completions (#3095)
Before (code in screenshot is from this branch,
`crates/zed/languages/rust.rs:179`):

![image](https://github.com/zed-industries/zed/assets/24362066/6b709f8c-1b80-4aaa-8ddc-8db9dbca5a5e)
Notice how the last 2 entries (that are async functions) are not
highlighted properly.
After:

![image](https://github.com/zed-industries/zed/assets/24362066/88337f43-b97f-4257-9c31-54c9023e8dbb)

This is slightly suboptimal, as it's hard to tell that this is an async
function - I guess adding an `async` prefix is not really an option, as
then we should have a prefix for non-async functions too. Still, at
least you can tell that something is a function in the first place. :)

Release Notes:
- Fixed Rust async functions not being highlighted in completions.
2023-10-06 14:43:03 +02:00
Nathan Sobo 263fcbc21d Checkpoint 2023-10-05 21:02:26 -06:00
Nathan Sobo 5934c85519 Synchronize access when starting and stopping display links
Hoping this prevents panics we were observing when starting.
2023-10-05 20:46:26 -06:00
Max Brunsfeld 6d08b2cabd Fix panic when immediately closing a window while opening paths (#3092)
Fixes this panic that I've been seeing in Slack:


[example](https://zed-industries.slack.com/archives/C04S6T1T7TQ/p1696530575535779)


```
thread 'main' panicked at 'assertion failed: opened_items.len() == project_paths_to_open.len()'
crates/workspace/src/workspace.rs:3628
<backtrace::capture::Backtrace>::create
<backtrace::capture::Backtrace>::new
Zed::init_panic_hook::{closure#0}
std::panicking::rust_panic_with_hook
std::panicking::begin_panic_handler::{{closure}}
std::sys_common::backtrace::__rust_end_short_backtrace
_rust_begin_unwind
core::panicking::panic_fmt
core::panicking::panic
<workspace::Workspace>::new_local::{closure#0}::{closure#0}
```

I believe it was caused by a window being closed immediately, while it
was still loading some paths. There was a mismatch in expectation
between the `workspace::open_items` function (which contains this
assertion), and the `Workspace::load_workspace` method. That later
method can return an empty vector if the workspace handle is dropped
while it is executing.

Release Notes:

- Fixed a crash when closing a Zed window immediately after opening it
2023-10-05 16:28:23 -07:00
Max Brunsfeld 2c0034830d Fix panic when immediately closing a window while opening paths 2023-10-05 16:21:14 -07:00
Max Brunsfeld 4cdf8a6fd7 collab 0.23.2 2023-10-05 16:06:28 -07:00
Max Brunsfeld 9adbdbed57 Fix bugs in handling mutual following (#3091)
This fixes some bugs in our following logic, due to our attempts to
prevent infinite loops when two people follow each other.

* Propagate all of leader's views to a new follower, even if those views
were originally created by that follower.
* Propagate active view changes to followers, even if the active view is
following that follower.
* Avoid redundant active view updates on the client.

Release Notes:

- Fixed bugs where it was impossible to follow someone into a view that
they previously following you into.
2023-10-05 15:16:58 -07:00
Mikayla Maki 0bb0e601bd Add markdown parsing to channel chat (#3088)
TODO:
- [x] Add markdown rendering to channel chat
- [x] Unify (?) rendering logic between hover popover and chat
- [x] ~~Determine how to deal with document-oriented markdown like `#`~~
Unimportant until we want to do something special with `#channel`
- [x] Tidy up spacing and styles in chat panel

Release Notes:

- Added markdown rendering to channel chat
- Improved channel chat message style
- Fixed a bug where long chat messages would not soft wrap
2023-10-05 14:30:12 -07:00
Mikayla aa11e374c3 re-unify markdown parsing between hover_popover and chat 2023-10-05 14:22:41 -07:00
Nathan Sobo aed0e8aa68 Checkpoint 2023-10-05 14:42:29 -06:00
Max Brunsfeld d480074555 Fix bugs in handling mutual following
* Propagate all of leader's views to a new follower, even if those views
  were originally created by that follower.
* Propagate active view changes to followers, even if the active view is
  following that follower.
* Avoid redundant active view updates on the client.
2023-10-05 13:28:46 -07:00