zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,874 Commits 699 Branches 767 Tags 282 MiB
3451a3c7fe
Commit Graph

49 Commits

Author SHA1 Message Date
Mikayla Maki
3451a3c7fe Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :( 
Co-Authored-By: kay@zed.dev
 2022-12-03 16:04:10 -08:00
Max Brunsfeld
fb35631337 Bump tree-sitter after merging included-ranges PR 2022-11-14 16:56:09 -08:00
Max Brunsfeld
3612c46d6d Bump tree-sitter for included range bugfix 2022-11-11 16:36:04 -08:00
Max Brunsfeld
c838a7d973 Get combined injections basically working 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2022-11-07 16:58:12 -08:00
Max Brunsfeld
5efe2ed6d3 Start work on handling combined injections in SyntaxMap 2022-11-07 14:45:17 -08:00
Antonio Scandurra
04477e9f97 Explicitly list cargo workspace members 
This prevents build failures when there are stale subfolders under
`crates/`.
 2022-10-25 19:31:58 +02:00
K Simmons
79cf5dbd4b remove rocksdb 2022-10-18 17:21:15 -07:00
Mikayla Maki
0beb97547e Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Mikayla Maki
cc8ae45012 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Max Brunsfeld
1f12186e3c Update to latest tree-sitter commit 
This is needed for https://github.com/tree-sitter/tree-sitter/pull/1845
 2022-08-25 10:58:46 -07:00
Max Brunsfeld
58fda5ac1c Test more editing patterns of SyntaxMap, fix bugs 2022-08-22 15:36:58 -07:00
Antonio Scandurra
afc8e9050c
Merge pull request #1252 from zed-industries/plugin 
Language Server WebAssembly Plugin Integration (Part 2)
 2022-07-12 11:04:20 +02:00
Max Brunsfeld
1f16c68e6b Upgrade Tree-sitter and limit query cursors' concurrently-buffered matches 2022-07-08 14:09:34 -07:00
Isaac Clayton
feae434684 Update lockfile 2022-07-07 15:11:48 +02:00
Nathan Sobo
36b462182b Send telemetry to Honeycomb via GRPC 
We updated the core-foundation crates because Tonic (the GRPC crate) relies on a newer version of core foundation to find TLS root certificates.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-27 09:58:55 -06:00
Max Brunsfeld
c054e4c9bf Use new feature resolver 
This fixes a build failure on linux because gpui was being spuriously
included as a dependency of zed-server, due to its presence as an
optional dependency in the rpc crate.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-26 12:51:29 -08:00
Max Brunsfeld
026c3476db Upgrade tree-sitter to 0.20.1 2021-12-05 21:37:08 -08:00
Nathan Sobo
fdfed3d7db Move all crates to a top-level crates folder 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:22:21 -06:00
Nathan Sobo
c236b0828c Extract worktree, rpc_client, and util crates 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:07:35 -06:00
Antonio Scandurra
becae9feee Pull out buffer into its own crate 2021-10-04 16:50:12 +02:00
Antonio Scandurra
034aed053c Extract a clock subcrate for logical clocks 2021-10-04 14:34:02 +02:00
Nathan Sobo
74a47a1384 Extract fuzzy module to its own crate 
We still have a fuzzy module in the zed crate with some app-specific logic.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-01 17:08:19 -06:00
Nathan Sobo
cf270b4dff Extract sum_tree to its own crate 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-01 15:55:21 -06:00
Max Brunsfeld
33b9a6e281 Specify zed as the workspace's default member 
This way, `cargo run` at the root of the repo will run the Zed app
instead of the server.
 2021-07-30 10:00:04 -07:00
Antonio Scandurra
391ad489ff Rename zed-rpc to zrpc 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-07-13 18:22:00 +02:00
Antonio Scandurra
f836a25500 Use an executor::Background in AppContext::thread_pool 2021-07-13 14:06:38 +02:00
Nathan Sobo
1537500fcb Include contents of the zed-server repo 
We're going full monorepo.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-07-12 14:14:39 -06:00
Antonio Scandurra
cb9002254f Use a websocket to connect to the server 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-07 18:49:38 +02:00
Antonio Scandurra
ee962eab9b Revert "Start work on handling TLS for the RPC endpoint" 
This reverts commit 193c704875.
 2021-07-07 15:19:00 +02:00
Max Brunsfeld
193c704875 Start work on handling TLS for the RPC endpoint 2021-07-06 16:27:57 -07:00
Max Brunsfeld
327c20510b Introduce zed-rpc with some shared auth utilities 2021-06-08 13:07:06 -07:00
Max Brunsfeld
7339b9bce7 Bump Tree-sitter 
Pass ranges to `set_byte_range`, `set_point_range`

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-28 14:25:30 -07:00
Max Brunsfeld
8b7a314474 Implement bracket matching using queries 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-28 13:09:57 -07:00
Antonio Scandurra
ab64f2dd1d Update tree-sitter 2021-05-26 09:10:06 +02:00
Max Brunsfeld
5d2ac3f4e4 Use new Tree-sitter captures API 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-25 16:02:43 -07:00
Max Brunsfeld
e54a31ead2 Bump tree-sitter for QueryCaptures::advance methods 2021-05-24 21:21:31 -07:00
Max Brunsfeld
b51ae1f668 WIP 2021-05-23 21:42:45 -07:00
Antonio Scandurra
c7d97adf23 Introduce a gpui::test macro 2021-05-12 17:05:03 +02:00
Max Brunsfeld
e32b6bc8f8 Merge branch 'master' into new-file 2021-05-07 10:10:20 -07:00
Max Brunsfeld
29d44c8a10 Go back to using upstream core-foundation-rs 2021-05-07 09:53:07 -07:00
Antonio Scandurra
f85669c681 Include debug symbols in release mode 2021-05-07 14:42:56 +02:00
Max Brunsfeld
5fd084ec09 Start work on creating and saving new files 2021-05-04 19:04:11 -07:00
Max Brunsfeld
9fd8acdce7 Use our own scoped_pool implementation 2021-04-20 14:07:36 -07:00
Max Brunsfeld
8fb79a3094 Enable split debuginfo for faster compiles 2021-04-19 15:00:10 -07:00
Max Brunsfeld
fbaab121f6 Add fsevent crate to workspace 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-15 16:29:55 -07:00
Max Brunsfeld
6873662c47 Use upstream git revision of core-foundation-rs 2021-04-09 08:45:23 -07:00
Max Brunsfeld
7ebcbdc0cb Implement File > Open menu item 2021-04-08 22:25:54 -07:00
Nathan Sobo
914cf37f37 Remove executor::ForegroundTask wrapper 
Now that smol returns the same Task as async_task, we can simply re-export the async_task::Task struct from our executor module.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 11:02:09 -06:00
Nathan Sobo
b400449a58 Start rebuilding with a cleanly-separated UI framework 2021-02-20 10:02:34 -07:00