oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,512 Commits 1 Branch 0 Tags
64c8c19e1b36e2b9be9a87cc06bc8b5202093608
Commit Graph
4098 Commits
Author SHA1 Message Date
Kirill Bulatov 1c4be24fb7 Move gpui derives tests into gpui crate to avoid dependency cycles 
`cargo run` on Zed project leads to rust-analyzer evantually emitting

`[ERROR project_model::workspace] cyclic deps:
gpui_macros(Idx::<CrateData>(269)) -> gpui(Idx::<CrateData>(264)),
alternative path: gpui(Idx::<CrateData>(264)) ->
gpui_macros(Idx::<CrateData>(269))`

error after loading the project.

The PR fixes this by moving away the test to the "root" project.
 2023-08-16 10:19:20 +03:00
Nathan SoboandMikayla Maki 740b105330 Merge branch 'main' into taffy 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-08-14 13:50:21 -06:00
Nathan Sobo 473ac5a842 WIP 2023-08-13 02:27:36 -06:00
Nathan Sobo 1ef486b227 WIP 2023-08-13 01:40:05 -06:00
Mikayla a90c0e0326 Merge branch 'main' into collab-panel 2023-08-12 12:44:22 -07:00
Nathan Sobo 0d31d6dac5 WIP 2023-08-12 10:00:08 -06:00
Nathan Sobo 5e36040533 Put a Taffy layout engine on window 2023-08-12 00:58:11 -06:00
Mikayla 7970406694 Add a compile test for the element derive 2023-08-11 18:00:12 -07:00
Nathan Sobo 983641da2b WIP 2023-08-11 07:39:30 -06:00
Nathan Sobo d6eaa3c6b8 Ditch the hot reloading approach 2023-08-11 00:26:58 -06:00
Nathan Sobo 3b1e5e966a What if we base themes on Rose Pine 2023-08-09 20:54:30 -06:00
Mikayla 99daa73325 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Joseph T. Lyons 230b894871 v0.100.x dev 2023-08-09 12:30:39 -04:00
Nathan Sobo c95aecdd53 Merge branch 'main' into cells 2023-08-08 21:23:57 -06:00
Nathan Sobo d687c3d81f Merge remote-tracking branch 'origin/main' into window-handles 2023-08-07 22:07:20 -06:00
Mikaylaandmax bedf60b6b2 Improve local collaboration script to accept a zed impersonate 
Gate channels UI behind a flag

co-authored-by: max <max@zed.dev>
 2023-08-07 16:45:13 -07:00
Max Brunsfeld c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo adc50469ff WIP 2023-08-06 12:45:31 -06:00
Joseph T. Lyons 12e8f417e4 Add more convert to case commands 
ConvertToTitleCase
ConvertToSnakeCase
ConvertToKebabCase
ConvertToUpperCamelCase
ConvertToLowerCamelCase
 2023-08-04 22:45:26 -04:00
Nathan Sobo 379652f074 Merge branch 'main' into cells 2023-08-03 19:33:04 -06:00
Joseph T. Lyons b0ec05a732 v0.99.x dev 2023-08-02 13:50:30 -04:00
Max Brunsfeld a555fa1ada Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Nathan Sobo 1dfde8eab5 WIP 2023-08-01 20:53:15 -06:00
KCaverly 300c693d55 catchup with main 2023-08-01 10:40:38 -04:00
KCaverly 599f674827 add php support for semantic search 2023-07-31 16:36:09 -04:00
KCaverly ca4e21881e add ruby support for semantic search 2023-07-31 10:54:30 -04:00
KCaverly a5dd8dd0a9 add lua embedding query for semantic search 2023-07-31 10:02:28 -04:00
Mikayla Maki 7f9df6dd24 Move channels panel into collab and rename to collab panel 
remove contacts popover and add to collab panel
 2023-07-28 13:24:42 -07:00
Mikayla Makiandnate ac35dae66e Add channels panel with stubbed out information 
co-authored-by: nate <nate@zed.dev>
 2023-07-28 13:21:39 -07:00
Mikayla Maki 1545128ec5 Add Nix language support (#2781) 
This adds rudimentary language support for the Nix expression language,
through tree-sitter-nix.

I spent a little bit of time trying to add support for one of the Nix
language servers too, but wasn't able to get any of them running
reliably without crashing, and so I've opted to stick to just the
tree-sitter grammar for now.


![image](https://github.com/zed-industries/zed/assets/285821/c770f3d8-6fa0-4083-9bf3-239cc78ca307)
 2023-07-27 18:35:52 -07:00
Mikayla Maki 45e5d81664 update to dependency without symbol conflict 2023-07-27 17:41:13 -07:00
Mikayla MakiandAlex 0dffb728db Update elixir depedency 
co-authored-by: Alex <alexviscreanu@gmail.com>
 2023-07-27 17:36:09 -07:00
Nathan Sobo 480401d65d WIP 2023-07-27 18:23:23 -06:00
Julia 6a0e1d5345 Update Alacritty (#2798) 
This will potentially fix a number of Alacritty related panics, however
it is tricky to figure out which ones in particular will be impacted for
sure. We've said we were going to do this for a while but with the
constant trickle of panics it seemed reasonable to just go and do it

Release Notes:

- Fixed a few potential terminal related crashes.
 2023-07-27 15:03:53 -04:00
Mikayla Maki d835274306 Downgrade our dependency on treesitter-cpp 2023-07-27 11:11:24 -07:00
Julia 8c9c8362ec Update Alacritty 2023-07-27 12:19:07 -04:00
Mikayla Maki d5c30709b3 Downgrade tree sitter elm to 5.6.4 2023-07-26 15:44:06 -07:00
Nathan Sobo 0374bc66ce WIP 2023-07-26 12:54:23 -06:00
Joseph T. Lyons 6cd10f3d5e v0.98.x dev 2023-07-26 13:27:55 -04:00
KCaverly 0ac919f6e0 catchup with main 2023-07-26 09:50:38 -04:00
Conrad Irwin 39f02c2b72 Add a mode indicator for vim (#2763) 
Release Notes:

- vim: add a mode indicator
([#409](https://github.com/zed-industries/community/issues/409))

Now updated screenshots with @iamnbutler 
<img width="1043" alt="Screenshot 2023-07-25 at 11 11 57"
src="https://github.com/zed-industries/zed/assets/94272/8301479a-8b58-42d8-81a1-bc40e1e0a4df">
<img width="1043" alt="Screenshot 2023-07-25 at 11 12 00"
src="https://github.com/zed-industries/zed/assets/94272/89c3b8bd-9cbc-4fd7-ad10-dac5538ed3a3">
<img width="1043" alt="Screenshot 2023-07-25 at 11 12 12"
src="https://github.com/zed-industries/zed/assets/94272/adc87fe3-a720-4779-853b-df9443407046">
 2023-07-25 20:18:23 -06:00
Nathan Sobo c48d8af204 Merge branch 'paint-context' into cells 2023-07-25 17:36:05 -06:00
Mikayla Maki b5630eb901 Merge branch 'main' into quinn/nix 2023-07-25 11:34:57 -07:00
Conrad IrwinandNate Butler 1f65effe57 Update status bar theming 
Co-Authored-By: Nate Butler <iamnbutler@gmail.com>
 2023-07-25 11:06:41 -06:00
Nathan Sobo 54a7419fa2 WIP 2023-07-24 23:27:14 -06:00
Quinn Wilton dd504f5965 Add tree-sitter-glsl 2023-07-23 22:22:11 -07:00
Quinn Wilton a4914fcf3b Add tree-sitter-elm 2023-07-23 22:22:11 -07:00
Quinn Wilton fe388ed71e Add tree-sitter-nix 2023-07-23 17:24:50 -07:00
Conrad Irwin 458916409c Add a mode indicator for vim 
This is the second most common remaining complaint (after :w not
working).

Fixes: zed-industries/community#409
 2023-07-21 16:06:14 -06:00
KCaverly e02d6bc0d4 add glob filtering functionality to semantic search 2023-07-20 13:46:27 -04:00