oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,815 Commits 1 Branch 0 Tags
0307cb8a88ea461f06d5c0a4482e952a35e733b1
Commit Graph
8436 Commits
Author SHA1 Message Date
Nathan SoboandNate Butler 0307cb8a88 Start sketching a collab panel in storybook 
Co-Authored-By: Nate Butler <nate@zed.dev>
 2023-09-05 10:02:36 -06:00
Nathan Sobo 2fa9c037c8 Merge remote-tracking branch 'origin' into storybook 2023-09-01 10:08:48 -06:00
Nathan Sobo 6275c560e7 Fix warnings for a clean build 2023-09-01 10:08:41 -06:00
Antonio Scandurra d868ec920f Avoid duplicate entries in inline assistant's prompt history 2023-09-01 09:15:29 +02:00
Max Brunsfeld 1e60454643 Renumber protobuf fields, bump protocol version 2023-08-31 16:31:26 -07:00
Max Brunsfeld 03f0365d4d Remove local timestamps from CRDT operations 
Use lamport timestamps for everything.
 2023-08-31 16:23:06 -07:00
Max Brunsfeld eecd4e39cc Propagate Cancel action if there is no pending inline assist 2023-08-31 11:09:36 -07:00
Kirill Bulatov ddc6214216 Tailwind autocomplete (#2920) 
Release Notes:
- Added basic Tailwind CSS autocomplete support
([#746](https://github.com/zed-industries/community/issues/746)).
 2023-08-31 16:55:46 +03:00
Kirill Bulatov 5731ef51cd Fix plugin LSP adapter intefrace 2023-08-31 15:32:24 +03:00
Kirill Bulatov e682db7101 Route completion requests through remote protocol, if needed 2023-08-31 15:22:13 +03:00
Kirill Bulatov 5bc5831032 Fix wrong assertion in the test 2023-08-31 14:31:43 +03:00
Kirill Bulatov 292af55ebc Ensure all client LSP queries are forwarded via collab 2023-08-31 14:29:37 +03:00
Kirill Bulatov fff385a585 Fix project tests 2023-08-31 13:01:53 +03:00
Kirill Bulatov 9e12df43d0 Post-rebase fixes 2023-08-31 11:53:46 +03:00
Kirill Bulatov 18efc0d5e5 Fix the tests, by not requiring stderr for fake servers 2023-08-31 11:07:37 +03:00
Julia ff3865a4ad Merge branch 'main' into multi-server-completions-tailwind 2023-08-30 22:58:37 -04:00
JuliaandKirill Bulatov 529adb95a1 Scope Tailwind in JS/TS to within string 
In some situations outside JSX elements Tailwind will never
respond to a completion request, holding up the tsserver completions.

Only submit the request to Tailwind when we wouldn't get tsserver
completions anyway and don't submit to Tailwind when we know we won't
get Tailwind completions

Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
 2023-08-30 21:14:39 -04:00
Kirill Bulatov 0f619e0b67 Do not write TRACE logs into file for Lua 2023-08-31 01:14:37 +03:00
Kirill Bulatov 54e7e2f59d Capture language servers' stderr into server logs 2023-08-31 01:14:37 +03:00
Nathan Sobo 3b5ee59273 Split playground into gpui2 and storybook 2023-08-30 16:12:14 -06:00
Max Brunsfeld 4b5948e004 Disable save as prompt for channel notes 2023-08-30 15:05:47 -07:00
Kirill Bulatov d9a72aa1e0 Rewrite inlay hint collab tests to remove races (#2916) 
Release Notes:

- N/A
 2023-08-31 00:49:50 +03:00
Kirill Bulatov ab49f8c592 Rewrite inlay hint collab tests to remove races 2023-08-31 00:37:00 +03:00
Max BrunsfeldandMikayla f9dffc1734 Remove unnecessary ConstrainedBoxes in collab panel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 14:35:02 -07:00
Max BrunsfeldandMikayla 123bc85a8e collab panel: Make screen share row line up with shared projects 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 14:23:12 -07:00
Max BrunsfeldandMikayla e0bdd857f1 Fix cursor colors of non-followed collaborators 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 14:14:18 -07:00
Nathan Sobo ee11be98e5 Add gpui2 crate 2023-08-30 15:00:11 -06:00
Nathan Sobo 746f77bf7c Checkpoint 2023-08-30 14:40:57 -06:00
Max BrunsfeldJosephMikayla
 		46429426ef Avoid accidental gpui transitive dependency in collab 
* Make Fs depend on Text, not vise versa

Co-authored-by: Joseph <joseph@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 13:16:01 -07:00
Joseph T. Lyons feb7a8a0f4 collab 0.19.0 2023-08-30 14:37:55 -04:00
Joseph T. Lyons 7204c245ea v0.103.x dev 2023-08-30 13:41:09 -04:00
Nathan Sobo 1d491fcd78 Get playground rendering with backward compatible theming 2023-08-30 11:09:34 -06:00
Nathan Sobo d763946b18 Checkpoint: Working toward compatibility with themes 2023-08-30 10:11:00 -06:00
Kirill BulatovandJulia Risley 7e5735c8f1 Reap overly long LSP requests with a 2m timeout 
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-08-30 18:41:41 +03:00
Nate Butler e808386765 WIP UI Tweaks (#2911) 
- Tighten up toolbar
- Reduce intensity of active tools
- Remove divider between project + branch
- Add a styletree for toolbar + move breadcrumb into it
- Some ts theme tidying

[[PR Description]]

Release Notes:

- Improved density and contrast of a number of UI elements.
 2023-08-30 11:19:05 -04:00
Nate Butler 256949bee0 fmt 2023-08-30 10:56:08 -04:00
Antonio Scandurra ea17d1638e Introduce code generation (#2901) 
![CleanShot 2023-08-28 at 12 24
36@2x](https://github.com/zed-industries/zed/assets/482957/f97cb399-1ac2-4fa9-94a7-137d1eec711c)


Release Notes:

- Added a new "Inline Assist" feature that lets you transform a
selection or generate new code at the cursor location by hitting
`ctrl-enter`.
 2023-08-30 14:58:22 +02:00
Antonio Scandurra bf67d3710a Remove trailing backticks when assistant ends with a trailing newline 2023-08-30 12:08:14 +02:00
Antonio Scandurra 5f6562c214 Detect indentation from GPT output 2023-08-30 12:07:58 +02:00
Antonio Scandurra c6f4390511 Retain search history for inline assistants 
This only works in-memory for now.
 2023-08-30 11:30:51 +02:00
Antonio Scandurra 5c498c8610 Show inline assistant errors 2023-08-30 11:04:48 +02:00
Kirill Bulatov 7a1b300b25 Do not blink the cursor if Zed app is focused away (#2907) 
Deals with https://github.com/zed-industries/community/issues/1116
Part of https://github.com/zed-industries/community/issues/1098

Use Mac platform callbacks to send a global event and enable/disable
caret blinking in editors when the app is not focused.

Release Notes:

- Stop blinking caret if Zed app is not focused
 2023-08-30 10:53:09 +03:00
Nathan Sobo 48d3e2d9b9 Move views_to_notify_if_ancestors_change to Window 2023-08-29 21:58:44 -06:00
Nathan Sobo 2e7356a53e Store new_parents on Window instead of layout context 2023-08-29 21:43:48 -06:00
Nathan Sobo 42cd257287 Remove text style stack from LayoutContext 2023-08-29 21:33:08 -06:00
Nathan Sobo 81957c49d5 Merge remote-tracking branch 'origin' into divs 2023-08-29 21:14:14 -06:00
Julia e3a0252b04 Make multi-server completion requests not serial 2023-08-29 20:42:13 -04:00
Nathan Sobo a0b6e500cf WIP 2023-08-29 18:40:24 -06:00
Nathan Sobo a56fab8c11 Remove unused proc macro 2023-08-29 18:30:57 -06:00
Nate Butler 6e964acd92 Fix extra theme entry 2023-08-29 20:04:15 -04:00