zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
22,185 Commits 658 Branches 714 Tags 222 MiB
main
Commit Graph

468 Commits

Author SHA1 Message Date
Piotr Osiewicz
21e6b09361
Remove license-file from Cargo.toml as it is apparently redundant (#4218) 
Release Notes:

- N/A
 2024-01-23 17:40:30 +01:00
Piotr Osiewicz
678bdddd7d
chore: Add crate licenses. (#4158) 
- GPUI and all dependencies: Apache 2
- Everything else: AGPL

Here's a script that I've generated for it:
https://gist.github.com/osiewicz/6afdd6626e517da24a2092807e6f0b6e

Release Notes:
- N/A

---------

Co-authored-by: David <david@zed.dev>
 2024-01-23 16:56:22 +01:00
Conrad Irwin
34efb23bf6 Fix a circular reference between Client and UserStore 
Before this change once the UserStore had been created, the Client would
never be dropped.
 2024-01-22 23:05:58 -07:00
Piotr Osiewicz
6c82380232 chore: Fix clippy::needless_borrow up to an editor 2024-01-21 15:03:24 +01:00
Joseph T. Lyons
c93d744be4 Add some initial testing to telemetry 2024-01-20 23:23:52 -05:00
Conrad Irwin
d76bd100f5
Show cursors for remote participants (#4082) 
This PR enables cursors for remote participants.

They are shown for 2 seconds when you focus a buffer, and then on hover.

Release Notes:

- Added usernames next to remote cursors
 2024-01-18 20:58:09 -07:00
Conrad Irwin
e513020fbb Fine tune 2024-01-18 15:59:13 -07:00
Conrad Irwin
827a8dade5
Send crash reports to Slack automatically (#4111) 
This uploads apples crash reports to our servers when telemetry is
enabled.

Rather than jumping via the website, it uploads to collab directly. (I'd
like
to update the panic handler to do this too to make it possible to work
on that end-to-end without zed.dev running).

Release Notes:

- Added reporting of crashes when telemetry is enabled
 2024-01-18 15:30:39 -07:00
Conrad Irwin
bfee008bb2 Merge branch 'main' into cursors 2024-01-18 14:03:27 -07:00
Joseph T. Lyons
b807e6fe80 Use try_global() 2024-01-18 01:33:30 -05:00
Conrad Irwin
4d9ff5c4ff Simplify service discovery in development 2024-01-17 23:06:03 -07:00
Conrad Irwin
ef6f39d090 Upload panics via zed.dev instead 2024-01-17 22:55:15 -07:00
Conrad Irwin
680929081d Send crash reports to Slack automatically 2024-01-17 19:51:33 -07:00
Conrad Irwin
0ca9f286c6 Show cursors for remote participants 2024-01-16 21:54:49 -07:00
Joseph T. Lyons
54dcb1d33c Rename variable 2024-01-16 18:35:50 -05:00
Joseph T. Lyons
0c59f510d2 Remove dbg!()s 2024-01-16 18:33:43 -05:00
Joseph T. Lyons
00682b8903 Do not reset timer for each reported event 2024-01-16 18:31:00 -05:00
Joseph T. Lyons
268d156fad Add command palette action events 2024-01-15 20:22:47 -05:00
Joseph T. Lyons
355d1fca82 Remove button event function 2024-01-15 16:28:28 -05:00
Joseph T. Lyons
148c294c02 Removed button event 2024-01-15 16:26:56 -05:00
Joseph T. Lyons
ba9a9f4f17 Add more open events 
project search
diagnostics
welcome page
 2024-01-15 16:26:04 -05:00
Mikayla
4d6dfa319d
Don't open files unescessary in dev builds 2024-01-12 22:47:07 -08:00
Mikayla
1d7dc96135
Restore temp file initialization in telemetry code 2024-01-12 21:37:09 -08:00
Max Brunsfeld
08a4307d71 Fix failure to write to keychain because of dropping a future 2024-01-11 16:22:34 -08:00
Joseph T. Lyons
a9fce19048 Return a single Option from EventCoalescer 2024-01-11 12:27:59 -05:00
Joseph T. Lyons
06ce1af530 Only return environment when period ends 2024-01-11 11:30:22 -05:00
Joseph T. Lyons
f4c698ba27 Fix bug with improperly reported environment 
When logging the edit environment, we were logging the newest environment being sent into the EventCoalescer on the latest activity log, when we should've been logging the environment that was associated with the ended period within the EventCoalescer.
 2024-01-11 11:24:55 -05:00
Joseph T. Lyons
0df4bfacc2 Increase debug mode queue size 2024-01-11 01:12:49 -05:00
Joseph T. Lyons
8a61d5059b Never send an an empty set of events 2024-01-11 01:12:30 -05:00
Joseph T. Lyons
bddf827bc1 Add reminder for the future 2024-01-10 21:02:34 -05:00
Joseph T. Lyons
b4444bdfc0 Rename field in telemetry struct 2024-01-10 17:41:02 -05:00
Joseph T. Lyons
9df29fb347 WIP 2024-01-10 17:04:26 -05:00
Joseph T. Lyons
b26a468820 Merge branch 'main' into instrument-keyboard-events 2024-01-10 16:03:01 -05:00
Joseph T. Lyons
d3d6b53a74 WIP 2024-01-10 02:05:42 -05:00
Marshall Bowers
f0ef63bfa0
gpui: Add SharedUrl type (#3975) 
This PR adds a `SharedUrl` type to GPUI.

It's just like a `SharedString`, but for denoting that the contained
value is a URL.

Mainlined from @nathansobo's GPUI blog post:
https://github.com/zed-industries/zed/pull/3968/files#diff-7ee75937e2daf7dd53f71b17698d8bd6d46993d06928d411781b9bd739b5f231R9-R12

Release Notes:

- N/A
 2024-01-09 10:55:49 -05:00
Piotr Osiewicz
e4b1c76895
Display setting documentation in settings.json (#3936) 
Let this screenshot of settings.json speak for itself: 

![image](https://github.com/zed-industries/zed/assets/24362066/fca60383-1788-43f9-803b-00f083394c8a)

Release Notes:
- Added code completion & on-hover documentation to Zed's settings.json
file.

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
 2024-01-08 19:30:18 +01:00
Piotr Osiewicz
d475f1373a
gpui: Further docs refinement & moved some reexports into 'private' module (#3935) 
This commit mostly fixes invalid URLs in docstrings. It also
encapsulates crates we reexport (serde stuff + linkme) into a public
module named "private" in order to reduce the API surfaced through docs.
Moreover, I fixed up a bunch of crates that were pulling serde_json in
through gpui explicitly instead of using Cargo manifest.

Release Notes:
- N/A
 2024-01-07 14:14:21 +01:00
Joseph T. Lyons
f4c78d3f40 Remove "clickhouse" from telemetry code 
The client sends events to our end point, and the endpoint is what determines what analytics database is used to store the data. The client should be generic and not mention the name of the service being proxied to through our server.
 2024-01-06 23:27:23 -05:00
Joseph T. Lyons
5344296c9a Remove immediate flush mode 
Allow flush method to be called publicly. This is a better, simpler solution, that allows for better control over flushing.
 2024-01-06 20:27:30 -05:00
Joseph T. Lyons
520c433af5 Fix tests 2024-01-06 16:10:40 -05:00
Joseph T. Lyons
800c9958a3 Clean up code 2024-01-06 15:31:16 -05:00
Joseph T. Lyons
cdd5cb16ed WIP 2024-01-06 14:41:35 -05:00
Joseph T. Lyons
2972ee8ced Move telemetry settings check into telemetry module 2024-01-04 01:13:21 -05:00
Max Brunsfeld
f5ba22659b Remove 2 suffix from gpui 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:59:39 -08:00
Max Brunsfeld
4305c5fdbe Remove 2 suffix for ui, storybook, text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:33:51 -08:00
Max Brunsfeld
0cf65223ce Remove 2 suffix for collab, rope, settings, menu 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:29:16 -08:00
Max Brunsfeld
5ddd298b4d Remove 2 suffix for fs, db, semantic_index, prettier 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:09:42 -08:00
Max Brunsfeld
53bdf6beb3 Remove 2 suffix for client, call, channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:02:14 -08:00
Joseph T. Lyons
3dd5641d2b Add settings events 2024-01-02 17:02:53 -05:00
Joseph T. Lyons
b1870af386 Add project open event 
Give the caller of report_app_event() the choice of whether to immediately flush the queue or not.
 2023-12-22 20:23:55 -05:00
Joseph T. Lyons
1989094e6d Increase queue flush debounce time 2023-12-22 19:57:13 -05:00
Joseph T. Lyons
0746a10d9b Increase telemetry queue size 2023-12-22 19:56:06 -05:00
Joseph T. Lyons
41ff37d56e Slow down sampling metric collection rate 2023-12-22 04:52:36 -05:00
Julia
dfe4fc4d0a Disable instance handshake in dev builds 2023-12-04 09:16:04 -05:00
Julia
d551b41aae zed2: Mostly port breadcrumbs & improve StyledText api 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-11-27 16:09:31 -05:00
Joseph T. Lyons
0926db9111 Add app events 2023-11-20 15:51:36 -05:00
Joseph T. Lyons
8e612e4287 Restore commented-out code 2023-11-19 22:00:01 -05:00
Joseph T. Lyons
e0f8615d52 Remoe dbg!()s 2023-11-19 21:55:19 -05:00
Joseph T. Lyons
3abd376d6a Add timestamp delta to telemetry events 2023-11-19 21:52:28 -05:00
Kirill Bulatov
6680e1e9fe Create new Zed release channel: nightly 2023-11-17 12:13:32 +02:00
Max Brunsfeld
4a0358a513 Mark contact acceptance notifications as read automatically 2023-10-22 12:22:47 +02:00
Max Brunsfeld
522b76e452 Merge branch 'main' into notifications 2023-10-16 12:37:52 -07:00
Joseph T. Lyons
75fbf2ca78 Fix telemetry-related crash on start up 2023-10-16 13:07:07 -04:00
Max Brunsfeld
034e9935d4 Remove old contact request notification mechanism, use notification instead 2023-10-12 17:42:32 -07:00
Max Brunsfeld
bdcbf9b92e Add a Reconnect action, for simulating connection blips 2023-10-09 14:46:33 -07:00
Joseph T. Lyons
2c7e37e9ff Add session id to panic events 2023-10-06 12:32:20 -04:00
Joseph T. Lyons
84ea34f918 Add session id 2023-10-05 14:50:48 -04:00
Max Brunsfeld
95342c8c33 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max Brunsfeld
61e0289014 Acknowledge channel notes and chat changes when views are active 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-03 17:40:10 -07:00
Max Brunsfeld
af09861f5c Specify uuid crate in the root Cargo.toml 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-10-03 17:39:24 -07:00
Joseph T. Lyons
b10255a6dd Update cpu and memory event code 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-10-03 13:29:08 -04:00
Conrad Irwin
d9813a5bec
show host in titlebar (#3072) 
Release Notes:

- show host in the titlebar of shared projects
- clicking on faces in the titlebar will now always follow the person
(it used to toggle)
- clicking on someone in the channel panel will follow that person
- highlight the currently open project in the channel panel

- fixes a bug where sometimes following between workspaces would not
work
 2023-10-02 21:02:02 -06:00
Joseph T. Lyons
892350fa2d Add memory and cpu events 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-10-02 19:35:31 -04:00
Conrad Irwin
7f44083a96 Remove unused function 2023-10-02 11:03:55 -06:00
Conrad Irwin
1cfc2f0c07 Show host in titlebar 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-09-29 16:37:00 -06:00
Max Brunsfeld
555c9847d4 Add ZED_ALWAYS_ACTIVE env var, use it in local collaboration script 
This makes zed always behave as if the app is active, even if no window is focused.
It prevents the 'viewing a window outside of zed' state during collaboration.
 2023-09-29 13:43:43 -07:00
Max Brunsfeld
e34ebbc665 Remove unused dependencies on theme 2023-09-28 17:13:10 -07:00
Max Brunsfeld
0f39b63801 Rename color_index to participant_index 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-09-28 11:37:22 -07:00
Max Brunsfeld
545b5e0161 Assign unique color indices to room participants, use those instead of replica_ids 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
 2023-09-28 11:06:09 -07:00
Joseph T. Lyons
5df9a57a8b
Add assistant events (#2978) 
Add assistant events

Release Notes:

- N/A
 2023-09-15 15:25:35 -04:00
Max Brunsfeld
ddda5a559b Restore chat functionality with a very rough UI 2023-09-08 09:59:35 -07:00
Joseph T. Lyons
39e13b6675 Allow call events to be logged without a room id 2023-09-06 22:53:05 -04:00
Nathan Sobo
2d411303bb Use preview server when not on stable 2023-08-29 10:07:22 -06:00
Mikayla
74565ed0b8
Add feature flags handling to the client, rewrite staff mode to a trait extension style 2023-08-25 17:00:53 -07:00
Mikayla
6fdf101745
Update database and RPC to provide configured feature flags 2023-08-25 14:34:32 -07:00
Mikayla
a7a4e2e369
Add buffer integration test 
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Mikayla
707ca34f19
Merge branch 'main' into disclosable-component 2023-08-23 16:30:27 -07:00
Joseph T. Lyons
f66e6863fa Add channel id to call events 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-21 13:50:04 -04:00
Mikayla
bd3ab82dac
Add disclosable components into channels 
Rename components to more closely match their purpose
 2023-08-19 05:18:53 -07:00
Mikayla
75679291a9
Add fix for lost channel update bug 2023-08-17 00:56:21 -07:00
Max Brunsfeld
cbf497bc12 Fix race condition when UpdateChannel message is received while fetching participants for previous update 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 17:36:35 -07:00
Max Brunsfeld
d7f21a9155 Ensure channels are sorted alphabetically 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 16:27:35 -07:00
Max Brunsfeld
b3447ada27 Dial in the channel creating/renaming UI 
* Ensure channel list is in a consistent state with no flicker while the
  channel creation / rename request is outstanding.
* Maintain selection properly when renaming and creating channels.
* Style the channel name editor more consistently with the non-editable
  channel names.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 17:11:57 -07:00
Max Brunsfeld
ac1b2b18aa Send user ids of channels of which they are admins on connecting 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 14:40:47 -07:00
Max Brunsfeld
60e25d780a Send channel permissions to clients when they fetch their channels 2023-08-09 13:56:03 -07:00
Mikayla
a3623ec2b8
Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Max Brunsfeld
498d043a0a Avoid leak of channel store 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 10:23:52 -07:00
Max Brunsfeld
2605ae1ef5 Use Arc::make_mut in ChannelStore 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-08 17:49:29 -07:00
Mikayla
b708824d37
Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 12:46:13 -07:00
Mikayla
d00f6a490c
Fix a bug where channel invitations would show up in the channels section 
Block non-members from reading channel information
WIP: Make sure Arc::make_mut() works
 2023-08-08 11:47:13 -07:00
Mikayla
17c9b4ca96
Fix tests 2023-08-08 10:04:29 -07:00
Mikayla
fa71de8842
Tune UX for context menus 
Co-authored-by: max <max@zed.dev>
 2023-08-07 17:14:14 -07:00
Mikayla
9913067e51
Remove admin and member button 
Fix bug with invites in the member list
Fix bug when there are network errors in the member related RPC calls

co-authored-by: Max <max@zed.dev>
 2023-08-07 14:32:13 -07:00
Max Brunsfeld
2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max Brunsfeld
87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld
a2486de045 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld
7a04ee3b71 Start work on exposing which channels the user has admin rights to 2023-08-03 18:31:00 -07:00
Max Brunsfeld
95b1ab9574 Implement channel member removal, permission check for member retrieval 2023-08-03 18:03:40 -07:00
Max Brunsfeld
a7e883d956 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Max Brunsfeld
9a1dd0c6bc Fetch channel members before constructing channel mgmt modal 2023-08-03 12:10:53 -07:00
Mikayla Maki
6c4964f071
WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Mikayla Maki
d450c4be9a
WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Mikayla Maki
30e1bfc872
Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -07:00
Max Brunsfeld
0ae1f29be8 wip 2023-08-02 15:52:56 -07:00
Max Brunsfeld
fca8cdcb8e Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Max Brunsfeld
a9de73739a WIP 2023-08-02 12:15:06 -07:00
Mikayla Maki
74437b3988
Add remove channel method 
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
 2023-08-01 16:06:27 -07:00
Mikayla Maki
7434d66fdd
WIP: Add channel creation to panel UI 2023-08-01 13:22:06 -07:00
Max Brunsfeld
7954b02819 Start work on displaying channels and invites in collab panel 2023-07-31 18:00:14 -07:00
Mikayla Maki
92fa879b0c
Add ability to join a room from a channel ID 
co-authored-by: max <max@zed.dev>
 2023-07-31 16:53:57 -07:00
Max Brunsfeld
4b94bfa045 Set up basic RPC for managing channels 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-07-28 17:05:56 -07:00
Joseph T. Lyons
018eb06091 Add is_staff to events 2023-07-18 12:32:53 -04:00
Joseph T. Lyons
98a0113ac3 Add call events 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-07-11 13:58:55 -04:00
Joseph T. Lyons
7d065fa14e Add installation_id to panic events 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-06-23 21:02:01 -04:00
Joseph Lyons
0b3b732310 Do not rely on user's system time for telemetry events 2023-06-09 18:02:20 -04:00
Joseph Lyons
311074e397 Remove code sending zed events to mixpanel 2023-06-05 15:33:17 -04:00
Joseph Lyons
049b72e3ac Add architecture to clickhouse event request body 2023-05-22 21:45:58 -04:00
Max Brunsfeld
e32233c826 Fix spurious setting error logs on non-existent setting keys 2023-05-19 17:15:05 -07:00
Max Brunsfeld
258723566f Rename settings::register_setting -> settings::register 2023-05-17 15:06:11 -07:00
Max Brunsfeld
2d5f03e148 Remove optional path argument when getting settings 2023-05-17 15:05:20 -07:00
Max Brunsfeld
89204e85c0 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Max Brunsfeld
65e3713d4d Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld
39618ae32d Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Joseph Lyons
ffd503951b Don't make events for every rejected suggestion 2023-05-16 17:19:05 -04:00
Joseph Lyons
a6a2f93607 Update telemetry client to accept copilot events 2023-05-16 00:34:58 -04:00
Max Brunsfeld
cee7edabf9 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Max Brunsfeld
aa6ea920e2 Define telemetry settings in the client crate 2023-05-10 12:59:24 -07:00
Joseph Lyons
8313414e1e Do not use post_json() to auto update 2023-05-04 12:12:36 -04:00
Joseph Lyons
69a4fffae2 Update post_json to take in a bool for allowing for redirects 2023-05-02 23:22:55 -04:00
Joseph T. Lyons
f62ba2eec7
use installation_id over device_id 2023-05-01 16:29:51 -04:00
Joseph Lyons
6b0faa2d9c Rework telemetry code to support sending events to Clickhouse 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-04-28 16:06:55 -04:00
Antonio Scandurra
689e878bd8 Use a WeakViewHandle in Client for view message handlers 2023-04-26 12:21:02 +02:00
Max Brunsfeld
ebbe52e6b0 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Max Brunsfeld
abdccf7393 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Max Brunsfeld
727afae4ff Fix unit tests after fixing gpui model drop semantics 
co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-04-11 10:58:01 -07:00
Antonio Scandurra
42b10044fc Fix running client crate tests 2023-04-11 17:43:05 +02:00
Antonio Scandurra
016343e65d Merge branch 'main' into randomized-tests-operation-script 2023-04-10 08:45:22 +02:00
Nathan Sobo
2615a11f7c Don't export platform::* from gpui 
I'd like to avoid cluttering the top-level namespace with all the platform-
specific types.
 2023-04-07 11:45:53 -06:00
Nathan Sobo
de9bf6dfbd Merge MutableAppContext into AppContext 
There may have been a good reason for the difference at some point, or I was
still learning Rust. But now it's just &mut AppContext vs &AppContext.
 2023-04-06 15:49:03 -06:00
Antonio Scandurra
f995d07542 Return error if subscribing to an entity that was already subscribed to 2023-04-06 14:42:19 +02:00