Commit Graph
906 Commits
Author SHA1 Message Date
Piotr Osiewicz fa148af2bc Merge branch 'main' into collab-titlebar-2 2023-06-22 13:48:16 +02:00
Mikayla Maki e807257688 Fix deafened -> enabled mistranslation
Fix mislocation of caller query in detach_and_log_error
Fix incorrect wording on livekit integration
Add share_mic action for manually enabling the microphone
Make mic sharing wait until the room has been fully established
2023-06-20 15:17:49 -07:00
Mikayla Maki f99a2d96cf fmt 2023-06-20 12:36:36 -07:00
Mikayla Maki d04c86d5af Add deafen controls 2023-06-20 12:34:32 -07:00
Nathan Sobo b53c0fef84 Rename SumTree::push_tree to ::append (#2626)
This is something I've been meaning to rename in SumTree. Was looking at
the code and figure why not now.
2023-06-20 08:37:55 -06:00
JuliaandAntonio Scandurra 0a596beb52 Avoid assigning NSCursor style when it already is that style
This avoids a high cost which appears to be the system rasterizing the
cursor every time we call this, fixes a slowdown when scrolling rapidly
while mouse motion continually attempted to assign the style

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-06-20 09:31:30 -04:00
Nathan Sobo e526fd506e Rename SumTree::push_tree to ::append 2023-06-19 19:49:33 -06:00
Piotr Osiewicz 6114525f6f settings: accept trailing commas (#2606)
Z-2357

I've found a crate that handles both comments and trailing commas in
JSON. It is a fork of `serde_json`, but it is maintained & up-to-date.
Sadly RawValue seems to not play nicely with it; I've ran into
deserialisation issues around use of RawValue. For this PR I've migrated
to `Value` API.

Obviously this is just a point of discussion, not something I'd merge
straight away. There may be better solutions to this particular problem.

I've also noticed that `serde_json_lenient` does not handle trailing
commas after bindings array. I'm not sure how big of an issue that is.

Release Notes:
- Improved handling of trailing commas in settings files.
[#1322](https://github.com/zed-industries/community/issues/1322)
2023-06-19 18:29:03 +02:00
Antonio Scandurra 12e72cc144 Query rect_for_text_range on focused view instead of root element
This was causing IME input to be drawn in the wrong place when there
were splits or panels in the window.
2023-06-05 12:00:40 +02:00
Joseph Lyons 4b5a7ec94a Fix typos 2023-06-02 22:02:19 -04:00
Max Brunsfeld ec0e6c8095 Fix ambiguous glob export warnings in rust 1.70 2023-06-01 14:07:59 -07:00
JuliaandNathan Sobo 4819e07887 TextStyle::default() ask system for known existing font family
Rather than assuming a specific family exists, try a set of specific
names and if they fail, just grab any old font that the system reports
as existing

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-05-30 14:46:27 -04:00
Max Brunsfeld 208cf495f8 Adjust diagnostic transformation test to not wait for two buffer notifications 2023-05-26 15:47:37 -07:00
Nathan Sobo a30ba2765a Introduce the ability to talk to GPT-4 within buffers on preview and dev (#2524)
This adds basic ability to interact with OpenAI inside a buffer.

Release Notes:

* If`OPENAI_API_KEY` is defined in your environment, you can now run the
`ai: assist` command to pass the text of your current buffer to GPT-4.
If you're editing a file with a `.zmd` extension, you can also invoke
the model with `cmd-enter.` (preview-only)
2023-05-24 12:00:43 -06:00
Nathan Sobo 0d72a3bec6 Merge remote-tracking branch 'origin/main' into zmd 2023-05-24 11:04:07 -06:00
Max Brunsfeld ec20b724e3 Make toggle dock actions appear in the command palette 2023-05-24 09:58:41 -07:00
Nathan Sobo 6fe2c44718 WIP: Stream in completions
Drop dependency on tokio introduced by async-openai and do it ourselves.

The approach I'm taking of replacing instead of appending is causing issues. Need to just append.
2023-05-22 20:28:22 -06:00
Antonio Scandurra 0bf0e226b4 Transfer focus to root view only if previously-focused view was dropped 2023-05-22 18:05:08 +02:00
Antonio Scandurra 8f56c80d68 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Antonio Scandurra b26ccc9017 Show workspace only after initializing it 2023-05-19 19:35:00 +02:00
Kirill Bulatov 136b128d0f When the file is deleted via project panel, close it in editors 2023-05-19 18:52:30 +03:00
Mikayla Maki 9e797ba1ac WIP: Add persistence to new docks 2023-05-17 17:34:20 -07:00
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Antonio Scandurra 3b3c5bb637 Notify old/new ancestors of the focused view when they change 2023-05-17 17:12:12 +02:00
Antonio Scandurra 4995d3c947 Show a panel/pane as zoomed only if it's the active item in workspace 2023-05-17 15:06:58 +02:00
Max Brunsfeld 56f2ff64ed Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Antonio ScandurraandAntonio Scandurra be876f0825 Don't rely on action propagation for zooming in and out
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-05-16 10:34:50 -06:00
Antonio Scandurra fafe7a193b Implement zooming for panes and docks 2023-05-16 11:49:48 +02:00
Kirill BulatovandAntonio 36e4876e07 Remove redundant scopes and actions to fix the focus toggle on ESC
co-authored-by: Antonio <antonio@zed.dev>
2023-05-15 13:10:15 +03:00
Nathan Sobo 4d44ed41ce wip 2023-05-13 14:34:09 -06:00
Mikayla Maki 8e263a30c6 Refactor out git status into FileName component
Integrate file name component into the editor's tab content
2023-05-13 02:26:45 -07:00
Nathan Sobo b646f5d456 Preserve panel size when re-docking between left and right 2023-05-12 15:15:11 -06:00
Nathan Sobo f2984b5cc2 Make panels independently resizable 2023-05-12 09:44:14 -06:00
Kirill Bulatov cab363efba Merge pull request #2463 from zed-industries/kb/reapply-modal-accessibility
Reintroduce more accesible modal keybindings
2023-05-12 06:11:04 +03:00
Mikayla Maki 060caa6d32 Merge pull request #2455 from zed-industries/git-status-viewer
Add Git Status to the project panel
2023-05-11 16:13:34 -07:00
Kirill Bulatov 800b48c1fa Reintroduce more accesible modal keybindings
Brings commit 475fc409232775d83797215870256fd5772e299f back
2023-05-11 20:59:10 +03:00
Joseph Lyons 7f91f95f70 Revert "More keybindings in macOs modals with buttons"
This reverts commit 82ad598309.
2023-05-11 11:37:34 -04:00
Petros Amoiridis b22d0fc4fa Fix yellow to be yellow 2023-05-10 17:37:36 -07:00
Max Brunsfeld 876d8b3e09 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Antonio Scandurra 879447e0a6 Focus the root view if the previously-focused view isn't rendered 2023-05-10 15:40:46 +02:00
Nathan Sobo e9ca666d46 Replace todo with unimplemented to reduce distractions 2023-05-09 16:41:10 -06:00
Mikayla Maki dd9ddcc71a Make dock not eagerly steal focus from sub items 2023-05-09 12:00:09 -07:00
Mikayla Maki 8403c589d5 Add API for accessing git branch 2023-05-08 14:33:58 -07:00
Mikayla MakiandAntonio f6b2e7f596 Fixed clicks falling through the modal terminal
co-authored-by: Antonio <antonio@zed.dev>
2023-05-08 10:54:12 -07:00
Kirill Bulatov 21d1d2ec4c Add a test 2023-05-08 19:36:51 +03:00
Kirill Bulatov 7762f0fdef Add whitespaces rendering 2023-05-08 19:36:51 +03:00
Kirill Bulatov ac1ba279c2 Draw tabs with svg icons in editor code only 2023-05-08 19:36:51 +03:00
Kirill Bulatov 23ef5d3f14 Make invisibles display configurable 2023-05-08 19:36:51 +03:00
Kirill Bulatov f5f2f2ccb6 Draft invisibles' tabs display 2023-05-08 19:36:51 +03:00
Antonio Scandurra 84c00a71a1 Delay focus_in event for window activation till after layout 2023-05-05 10:47:42 +02:00