Commit Graph
162 Commits
Author SHA1 Message Date
Marshall Bowers 65db5f3d09 Merge branch 'main' into gpui2 2023-10-12 17:43:05 -04:00
Marshall Bowers 2270279119 Remove old ui and storybook crates (#3125)
This PR deletes the old `ui` and `storybook` crates in favor of their
newer variants that we'll be landing to `main` in the near future.

### Motivation

These crates are based off the old version of GPUI 2 (the `gpui2`
crate).

At this point we have since transitioned to the new version of GPUI 2
(the `gpui3` crate, currently still on the `gpui2` branch).

Having both copies around is confusing, so the old ones are going the
way of the dinosaurs.

Release Notes:

- N/A
2023-10-12 17:40:20 -04:00
JuliaandAntonio Scandurra 5033682ba9 Get started with a prettier server package
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-10-11 12:56:28 +03:00
Marshall Bowers fd7bc8cfe0 Add ui2 crate 2023-10-06 16:52:05 -04:00
Marshall Bowers c4493846ca Merge branch 'main' into marshall/gpui2-playground 2023-10-06 13:33:04 -04:00
Mikayla aa11e374c3 re-unify markdown parsing between hover_popover and chat 2023-10-05 14:22:41 -07:00
Mikayla 4dbb78ea12 Create markdown text element and add to channel chat 2023-10-04 17:47:30 -07:00
Max Brunsfeld 6f6460a858 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max BrunsfeldandMikayla a6eaeed919 Specify uuid crate in the root Cargo.toml
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:39:24 -07:00
MikaylaandMax 8052372c7c Upgrade SeaORM to latest version, also upgrade sqlite bindings, rustqlite, and remove SeaQuery
co-authored-by: Max <max@zed.dev>
2023-10-03 12:16:53 -07:00
Joseph T. LyonsandJulia 71b1bb2398 Add memory and cpu events
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-10-02 19:35:31 -04:00
Marshall Bowers d4b2d6c365 Merge branch 'gpui2' into marshall/gpui2-playground 2023-10-02 18:36:22 -04:00
KCaverly a12bcda282 catchup with main 2023-09-22 09:43:39 -04:00
KCaverly 4e6cfd3982 introduce ai crate with completion providers 2023-09-21 22:44:56 -04:00
KCaverly cbbf18051c rename ai crate to assistant crate 2023-09-21 21:54:59 -04:00
Marshall Bowers dc698c5662 Extract UI elements from storybook into new ui crate (#3008)
This PR extracts the various UI elements from the `storybook` crate into
a new `ui` library crate.

Release Notes:

- N/A
2023-09-21 19:25:35 -04:00
Nathan Sobo 4769f8dc4d WIP - Next: implement Element derive macro 2023-09-20 22:26:46 -06:00
Nathan Sobo ad9d487142 WIP 2023-09-20 14:32:55 -06:00
KCaverly 974e2bd350 remove git2 dependency for repository cloning in semantic_index eval 2023-09-19 18:55:15 -04:00
KCaverly 5825854d37 updated git2 to use ssl 2023-09-19 16:36:51 -04:00
KCaverly 4c41833cfb move git2 to workspace dependency globally 2023-09-19 16:13:47 -04:00
Nathan Sobo b40a92a9d6 Checkpoint 2023-09-19 13:09:00 -06:00
Nathan Sobo 444d8662a5 Merge branch 'main' into storybook 2023-09-11 09:13:46 -06:00
Mikayla df46bcf2be Add syntax highlighting for nu scripts 2023-09-09 15:39:39 -07:00
Mikayla c6a26b5cf7 WIP: Add nushell support 2023-09-09 14:01:53 -07:00
Nathan Sobo e54c98cc37 Split playground into gpui2 and storybook 2023-08-30 16:12:14 -06:00
Nathan Sobo f278fdb342 Checkpoint 2023-08-30 14:40:57 -06:00
Mikayla 1aa69013de Add feature flags handling to the client, rewrite staff mode to a trait extension style 2023-08-25 17:00:53 -07:00
MikaylaandMax 80c8940c36 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
Max Brunsfeld a47eaf190e Start work on storing channel buffers 2023-08-23 18:34:43 -07:00
Mikayla 7f16fb40ca Merge branch 'main' into disclosable-component 2023-08-23 16:30:27 -07:00
Piotr Osiewicz ce148b99a5 Bump rust embed (#2883)
This is a follow-up to a recent patch I've submitted to this crate to
improve compile time and runtime (in older versions file lookup was
essentially O(n) with respect to path count, now it's O(log n))

Release Notes:

- N/A
2023-08-24 00:16:35 +02:00
Nathan Sobo ec9bebc7f4 Merge branch 'main' into divs 2023-08-22 16:35:56 -06:00
Mikayla e24c757784 Finish building out adapters and names
Document core traits
Add start for a component storybook
2023-08-19 14:40:05 -07:00
Max Brunsfeld 7dd3b13932 Upgrade Tree-sitter for error recovery bug fix 2023-08-18 11:31:40 -07:00
Nathan Sobo 14368fd0b4 Introduce Refinement trait and derive macro 2023-08-18 01:03:46 -06:00
Nathan Sobo 43c97bc0e5 WIP 2023-08-13 01:40:05 -06:00
Nathan Sobo 284414cfba Ditch the hot reloading approach 2023-08-11 00:26:58 -06:00
Nathan Sobo 2ac55ed691 Merge branch 'main' into cells 2023-08-08 21:23:57 -06:00
Nathan Sobo d1e01ba625 WIP 2023-08-06 12:45:31 -06:00
Nathan Sobo 242765b6ad Merge branch 'main' into cells 2023-08-03 19:33:04 -06:00
Mikayla Maki 9636701e6c 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 a4bc62865b update to dependency without symbol conflict 2023-07-27 17:41:13 -07:00
Mikayla MakiandAlex 626eed7659 Update elixir depedency
co-authored-by: Alex <alexviscreanu@gmail.com>
2023-07-27 17:36:09 -07:00
Mikayla Maki 3dfa7ad3f2 Downgrade our dependency on treesitter-cpp 2023-07-27 11:11:24 -07:00
Mikayla Maki 038eeee16b Downgrade tree sitter elm to 5.6.4 2023-07-26 15:44:06 -07:00
KCaverly 3d2d6b9fa2 catchup with main 2023-07-26 09:50:38 -04:00
Nathan Sobo 8277425558 Merge branch 'paint-context' into cells 2023-07-25 17:36:05 -06:00
Mikayla Maki b500a49036 Merge branch 'main' into quinn/nix 2023-07-25 11:34:57 -07:00
Nathan Sobo b2d85f95c2 WIP 2023-07-24 23:27:14 -06:00