Caius Durling
6863b9263e
Add Terraform & HCL syntax highlighting ( #6882 )
...
Terraform and HCL are almost the same language, but not quite so
proposing them as separate languages within Zed. (Terraform is an
extension of HCL, with a different formatter.)
This is just adding the language definition, parsing and highlighting
functionality, not any LSP or formatting beyond that for either
language.
I've taken a bunch of inspiration from Neovim for having the separate
languages, and also lifted some of their `scm` files (with attribution
comments in this codebase) as the tree-sitter repo doesn't contain them.
(Neovim's code is Apache-2.0 licensed, so should be fine here with
attribution from reading Zed's licenses files.) I've then amended to
make sure the capture groups are named for things Zed understands. I'd
love someone from Zed to confirm that's okay, or if I should clean-room
implement the `scm` files.
Highlighting in Terraform & HCL with a moderate amount of syntax in a
file (Terraform on left, HCL on right.)
<img width="1392" alt="Screenshot 2024-01-31 at 18 07 45"
src="https://github.com/zed-industries/zed/assets/696/1d3c9a08-588e-4b8f-ad92-98ce1e419659 ">
Release Notes:
- (|Improved) ...
([#5098 ](https://github.com/zed-industries/zed/issues/5098 )).
2024-02-05 11:38:30 -08:00
Conrad Irwin
e2e8e52ec4
Beancount syntax highlighting ( #7389 )
...
Release Notes:
- Added syntax highlighting for [Beancount](https://beancount.github.io )
2024-02-05 11:07:26 -07:00
Dzmitry Malyshau
59642bf29a
blade: point to master, remove the override
2024-02-03 14:13:36 -08:00
Rashid Almheiri
998f6cf80d
Add OCaml support ( #6929 )
...
This pull request implements support for the [OCaml
Language](https://ocaml.org/ ).
### Additions
- [x]
[tree-sitter-ocaml](https://github.com/tree-sitter/tree-sitter-ocaml )
grammar
- [x] Highlight, Indents, Outline queries
- [x] A new file icon for .ml(i) files. Based on
[ocaml/ocaml-logo](https://github.com/ocaml/ocaml-logo/blob/master/Colour/SVG/colour-transparent-icon.svg )
- [x] LSP Integration with
[ocaml-language-server](https://github.com/ocaml/ocaml-lsp )
- [x] Completion Labels
- [x] Symbol Labels
### Bug Fixes
- [x] Improper parsing of LSP headers.
### Missing [will file a separate issue]
- Documentation on completionItem, requires: `completionItem/resolve`
with support for `documentation` as a provider.
### Screenshots
<details><summary>Zed</summary>
<img width="1800" alt="Screenshot 2024-02-01 at 03 33 20"
src="https://github.com/zed-industries/zed/assets/69181766/e17c184e-203e-40c3-a08f-4de46226b79c ">
</details>
Release Notes:
- Added OCaml Support
([#5316 ](https://github.com/zed-industries/zed/issues/5316 )).
> [!NOTE]
> Partially completes #5316
> To complete #5316 :
> 1. addition of a reason tree-sitter grammar.
> 2. opam/esy integration, however it may be better as it's own plugin.
2024-02-02 16:58:07 +02:00
Dzmitry Malyshau
666b134d20
linux: shadow rendering
2024-02-01 21:43:28 -08:00
Dzmitry Malyshau
8aa768765f
linux: basic quad renderer logic
2024-02-01 21:41:15 -08:00
Dzmitry Malyshau
ef4ef5f0e8
Add blade dependency
2024-02-01 21:27:43 -08:00
Dairon M
97be0a930c
Add syntax highlighting and LSP (erlang_lsp) for Erlang ( #7093 )
...
This pull request implements support for the [Erlang
Language](https://erlang.org/ ).
**It adds:**
* [tree-sitter-erlang](https://github.com/WhatsApp/tree-sitter-erlang )
grammar
highlights (Licensed under Apache-2 from WhatsApp which is compatible
with Zed licensing model), folds and indents
* Erlang file icon based on the [official
one](https://www.erlang.org/doc/erlang-logo.png )
* [erlang_ls](https://github.com/erlang-ls/erlang_ls ) support
Fixes https://github.com/zed-industries/zed/issues/4939 , possibly a
duplicate of https://github.com/zed-industries/zed/pull/7085 with more
features. Suppose @wingyplus wants to join efforts here.
**To complete (out of scope for this PR):**
* Support for the ELP language server from WhatsApp. CC @robertoaloi
* Better indentation handling, need something like
`indentNextLinePattern` in VS Code
**Screenshots:**
Outline:
**Release Notes:**
* Added Erlang Support
([7093](https://github.com/zed-industries/zed/pull/7093 )).
---------
Signed-off-by: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
Co-authored-by: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
2024-02-01 18:54:26 +02:00
Kieran Gill
8bafc61ef5
Add initial markdown preview to Zed ( #6958 )
...
Adds a "markdown: open preview" action to open a markdown preview.
https://github.com/zed-industries/zed/assets/18583882/6fd7f009-53f7-4f98-84ea-7dd3f0dd11bf
This PR extends the work done in `crates/rich_text` to render markdown
to also support:
- Variable heading sizes
- Markdown tables
- Code blocks
- Block quotes
## Release Notes
- Added `Markdown: Open preview` action to partially close
([#6789 ](https://github.com/zed-industries/zed/issues/6789 )).
## Known issues that will not be included in this PR
- Images.
- Nested block quotes.
- Footnote Reference.
- Headers highlighting.
- Inline code highlighting (this will need to be implemented in
`rich_text`)
- Checkboxes (`- [ ]` and `- [x]`)
- Syntax highlighting in code blocks.
- Markdown table text alignment.
- Inner markdown URL clicks
2024-02-01 11:03:09 +02:00
d1y
5d85801d1f
Add highlighting for go.work ( #7142 )
...
<img width="617" alt="image"
src="https://github.com/zed-industries/zed/assets/45585937/ecb28152-db02-450e-bc81-395abd1c1eef ">
Release Notes:
- Added highlighting for go.work
2024-01-31 12:11:03 -07:00
d1y
b7ced3943e
Add highlighting for git_commit ( #7147 )
...
https://github.com/zed-industries/zed/assets/45585937/32cf5622-e960-4775-986d-bcfd30c81098
Release Notes:
- Added highlighting for git_commit
2024-01-31 09:41:19 -08:00
Marshall Bowers
8c8a5ad275
Make theme parsing more lenient ( #7154 )
...
This PR improves the theme parsing to be a bit more lenient, allowing
things like comments and trailing commas in theme files.
Release Notes:
- N/A
2024-01-31 11:05:22 -05:00
Derrick Laird
ba91adf48a
languages: add highlighting for go.mod ( #7137 )
...
Release Notes:
- Added syntax highlighting for go.mod files. Fixes #7133
<img width="863" alt="image"
src="https://github.com/zed-industries/zed/assets/8725798/dc521a02-c53a-44aa-b0c1-eebf31835679 ">
2024-01-31 08:46:13 +01:00
Max Brunsfeld
9459394ea0
Re-enable language plugin functionality with some fixes ( #7105 )
...
Part of https://github.com/zed-industries/zed/issues/7096
* [x] Load all queries for language plugins, not just highlight query
* [x] Auto-reload languages when changing the `plugins` directory
* [x] Bump Tree-sitter for language loading and unloading fixes
* [x] Figure out code signing
Release Notes:
- N/A
---------
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
2024-01-30 19:59:13 -08:00
Marshall Bowers
e338f34097
Sort dependencies in Cargo.toml files ( #7126 )
...
This PR sorts the dependency lists in our `Cargo.toml` files so that
they are in alphabetical order.
This should make them easier to visually scan when looking for a
dependency.
Apologies in advance for any merge conflicts 🙈
Release Notes:
- N/A
2024-01-30 21:41:29 -05:00
Marshall Bowers
176f63e86e
Add ability to copy a permalink to a line ( #7119 )
...
This PR adds the ability to copy the permalink to a line from within
Zed.
This functionality is available through the `editor: copy permalink to
line` action in the command palette:
<img width="589" alt="Screenshot 2024-01-30 at 7 07 46 PM"
src="https://github.com/zed-industries/zed/assets/1486634/332282cb-211f-4f16-9eb1-415bcfee9b7b ">
Executing this action will create a permalink to the currently selected
line(s) and copy it to the clipboard.
Here is an example line:
```
56c80e8011/src/lib.rs (L25)#6777 ](https://github.com/zed-industries/zed/issues/6777 )).
- Available via the `editor: copy permalink to line` action in the
command palette.
2024-01-30 19:20:15 -05:00
Piotr Osiewicz
e6ebe7974d
gpui: Add Global marker trait ( #7095 )
...
This should prevent a class of bugs where one queries the wrong type of
global, which results in oddities at runtime.
Release Notes:
- N/A
---------
Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
2024-01-30 14:08:20 -05:00
Derrick Laird
7bfa584eb6
Add protobuf support ( #6748 )
...
Release Notes:
- Added protobuf syntax highlighting
([#5160 ](https://github.com/zed-industries/zed/issues/5160 )).
2024-01-30 21:08:10 +02:00
fminkowski
e5c4c8522b
C# Support: Add treesitter and OmniSharp LSP support ( #6908 )
...
This PR adds the C# tree-sitter grammar. It also adds OmniSharp-Roslyn
for LSP support.
Resolves issue
[#5299 ](https://github.com/zed-industries/zed/issues/5299 )
Release Notes:
- Added C# support
## VSCode
<img width="984" alt="vscode"
src="https://github.com/zed-industries/zed/assets/6967829/1f6b4cb7-4e00-4d61-8e58-2867dc5c8ecf ">
## Zed
<img width="1722" alt="zed"
src="https://github.com/zed-industries/zed/assets/6967829/88436c78-93de-4e26-be15-b0dea6590c55 ">
2024-01-30 09:54:39 -08:00
Iván Molina Rebolledo
db68fc5130
Add PureScript LSP/Highlighting support ( #6911 )
...
This PR adds basic support for the language using the
`purescript-language-server`.
Release Notes:
- Added support for PureScript.
2024-01-28 17:44:50 -05:00
Marshall Bowers
dfad36f668
Upgrade tree-sitter-php to v0.21.1 ( #6902 )
...
This PR upgrades `tree-sitter-php` to v0.21.1.
Here is the diff between our current version and this version:
d43130fd15...29a49d3a53https://github.com/tree-sitter/tree-sitter-php/pull/193
This will silence the warning that is shown when running
`script/generate-licenses`.
Release Notes:
- Upgraded `tree-sitter-php` to v0.21.1.
2024-01-27 17:43:39 -05:00
Marshall Bowers
96a02dec7a
Bump tree-sitter-haskell ( #6899 )
...
This PR bumps our version of `tree-sitter-haskell` for the addition of
the `license` field in
https://github.com/tree-sitter/tree-sitter-haskell/pull/112 .
This will silence the warning that is shown when running
`script/generate-licenses`.
Release Notes:
- N/A
2024-01-27 17:13:23 -05:00
Marshall Bowers
536a4ab87a
Add font_style and font_weight to serialized theme representation ( #6838 )
...
This PR adds `font_style` and `font_weight` as fields on the
`HighlightStyleContent` used in the serialized theme representation.
Release Notes:
- N/A
2024-01-26 22:40:31 -05:00
Pseudomata
eccfc538fe
Remove xz feature (no longer using it)
2024-01-26 20:22:31 -05:00
Lei
ee750e102d
implement hls adapter
2024-01-27 00:55:13 +08:00
Pseudomata
2b9ba46cb6
Merge branch 'haskell-support' into add-haskell-grammar
2024-01-26 10:55:43 -05:00
Allan Calix
e5b71cc6ac
Add zig support
2024-01-25 18:04:04 -08:00
Marshall Bowers
50b9e5d8d2
Add Gleam support ( #6733 )
...
This PR adds support for [Gleam](https://gleam.run/ ).
<img width="1320" alt="Screenshot 2024-01-25 at 6 39 18 PM"
src="https://github.com/zed-industries/zed/assets/1486634/7891b6e9-d7dc-46a0-b7c5-8aa7854c1f35 ">
<img width="757" alt="Screenshot 2024-01-25 at 6 39 37 PM"
src="https://github.com/zed-industries/zed/assets/1486634/f7ce6b3f-6175-45cb-8547-cfd286d918c6 ">
<img width="694" alt="Screenshot 2024-01-25 at 6 39 55 PM"
src="https://github.com/zed-industries/zed/assets/1486634/b0838027-c377-47e6-bdd1-bdc9b67a8672 ">
There are still some areas of improvement, like extending what
constructs we support in the outline view, but this is a good start.
Release Notes:
- Added Gleam support
([#5162 ](https://github.com/zed-industries/zed/issues/5162 )).
2024-01-25 18:44:35 -05:00
gmorenz
dd07d2f8a2
Update cocoa to crates.io version ( #6452 )
...
https://github.com/servo/core-foundation-rs/pull/457 was released in
cocoa 0.25, so this patch dependency on github can be removed.
Release Notes:
- N/A
2024-01-25 10:04:29 +02:00
Pseudomata
02ab16037c
Get basic syntax highlighting for Haskell working
2024-01-24 18:08:47 -05:00
Julian Braha
fd6f71d287
Replace tempdir crate with tempfile
2024-01-24 17:58:09 +00:00
Max Brunsfeld
56556d71a1
Add API for retrieving the date that a contributor signed the CLA
...
Co-authored-by: Marshall <marshall@zed.dev>
2024-01-22 13:11:24 -08:00
Piotr Osiewicz
a33be893a4
chore: Revert asset compression
...
While it does reduce the size of a binary quite significantly, it doesn't seem to matter for .dmg which runs it's own compression on top of binaries.
2024-01-11 13:42:57 +01:00
Piotr Osiewicz
1c77104050
chore: Enable asset compression
...
This reduces size of release binary by ~20% from 134MB to 107MB without noticeable slowdown on startup. Assets are decompressed granularly, on first access
2024-01-10 13:54:25 +01:00
Piotr Osiewicz
ae6d09b9b2
chore: Extract assets module out of zed crate. ( #3957 )
...
This essentially shaves off about 10% off of an incremental build after
project change and potentially more if you're changing stuff like
`welcome` that's very close to the `zed` crate in the dep graph. That's
because macro expansion takes place even in incremental builds it seems?
And zed (lib) + zed (bin) could take up to 4 seconds out of an
incremental build, which is a *lot* in a 10s build. In reality though it
shaves 1 second off of 5 seconds incremental 'welcome'/ 1s off of 10s
'project' builds.
Note that we had `assets` crate in the past (removed in #2575 /cc
@maxbrunsfeld), but this is a bit different, because `assets` is a
dependency of *just* zed and nothing else. We essentially cache macro
expansion results ourselves.
Release Notes:
- N/A
2024-01-08 22:49:14 +01:00
Nate Butler
dcb9c0b9d8
Merge branch 'main' into copilot-ui
2024-01-05 15:56:33 -05:00
Marshall Bowers
4644d55493
Upgrade ctor to v0.2.6 ( #3915 )
...
This PR upgrades our version of `ctor` to v0.2.6.
We were previously using a fork that contained this fix:
https://github.com/mmastrac/rust-ctor/pull/295 .
A new version of `ctor` has now been released with that change, so we
can switch back to the mainline version.
I scanned through the diff between versions (since we're upgrading from
effectively v0.1.20) and didn't notice anything that seemed obviously
breaking:
564b87f1dc...ee6b4b1c7b
2024-01-05 12:08:41 -05:00
Joseph T. Lyons
c57a556c4c
Bump nu tree sitter dependency
2024-01-05 11:57:26 -05:00
Piotr Osiewicz
316d48393a
Merge branch 'main' into copilot-ui
2024-01-05 16:43:00 +01:00
Piotr Osiewicz
0602953af4
Rename copilot_button crate to copilot_ui
2024-01-05 16:36:26 +01:00
Piotr Osiewicz
a984a158fc
gpui: Use async-task 4.7
2024-01-05 11:42:28 +01:00
Max Brunsfeld
073128e4f3
Remove wasmtime for now
2024-01-03 21:44:58 -05:00
Max Brunsfeld
83f4c61657
Remove 2 suffix from gpui_macros, fix compile errors in tests
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 13:12:21 -08:00
Max Brunsfeld
f5ba22659b
Remove 2 suffix from gpui
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:59:39 -08:00
Max Brunsfeld
dfcb17fe74
Remove 2 suffix for theme
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:41:01 -08:00
Max Brunsfeld
4305c5fdbe
Remove 2 suffix for ui, storybook, text
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:33:51 -08:00
Max Brunsfeld
0cf65223ce
Remove 2 suffix for collab, rope, settings, menu
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:29:16 -08:00
Max Brunsfeld
5ddd298b4d
Remove 2 suffix for fs, db, semantic_index, prettier
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:09:42 -08:00
Max Brunsfeld
53bdf6beb3
Remove 2 suffix for client, call, channel
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:02:14 -08:00
Max Brunsfeld
9f99e58834
Remove 2 suffix for lsp, language, fuzzy
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:58:02 -08:00
Max Brunsfeld
c5a1950522
Remove 2 suffix for project
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:53:34 -08:00
Max Brunsfeld
4ddb26204f
Remove 2 suffix for ai, zed_actions, install_ci, feature_flags
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:48:46 -08:00
Max Brunsfeld
ecbd115542
Remove 2 suffix for assistant, journal
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:14:01 -08:00
Max Brunsfeld
789ce8dd75
Remove 2 suffix for workspace
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:08:51 -08:00
Max Brunsfeld
492805af9c
Remove 2 suffix for multi_buffer, outline, copilot
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 11:01:58 -08:00
Max Brunsfeld
bcad3a5847
Remove 2 suffix for picker, feedback
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:55:34 -08:00
Max Brunsfeld
0ac8aae17b
Remove 2 suffix for language_tools, search, terminal_view, auto_update
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:52:40 -08:00
Max Brunsfeld
292b3397ab
Remove 2 suffix for language selector, project panel, recent_projects, copilot_button, breadcrumbs, activity_indicator
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:47:33 -08:00
Max Brunsfeld
252694390a
Remove 2 suffix for vim, diagnostics, go_to_line, theme_selector, command_palette, file_finder
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:42:49 -08:00
Max Brunsfeld
37e6533b28
Remove 2 suffix for project_symbols, theme_selector
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:38:23 -08:00
Max Brunsfeld
2b8822fd08
Remove 2 suffix for welcome, vcs_menu, quick_action_bar, collab_ui
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:30:52 -08:00
Max Brunsfeld
7986ee18cd
Rename zed2 -> zed
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 10:14:19 -08:00
Max Brunsfeld
64e512232d
Start work on supporting custom languages
2024-01-02 08:01:59 -08:00
Joseph T. Lyons
38a8aa2d04
Bump tree-sitter-nu rev id
2023-12-21 12:15:27 -05:00
Kirill Bulatov
64925231b0
Create a new crate
2023-12-20 18:23:08 +02:00
Piotr Osiewicz
9bce30687e
Vcs menu2 ( #3648 )
...
Header and footer are gonna be added in a separate PR as they require
changes to Picker trait that I feel are separate from the contents of
this PR.
Release Notes:
- N/A
2023-12-14 12:36:53 +01:00
Conrad Irwin
9ff73d3a0a
Port project_symbols
2023-12-13 13:43:39 -07:00
Max Brunsfeld
726d761646
Bump tree-sitter-vue to remove dangling submodule
2023-12-08 10:12:18 -08:00
Marshall Bowers
a4b271e063
Port recent_projects to Zed2 ( #3525 )
...
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).
Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.
Release Notes:
- N/A
2023-12-06 18:41:50 -05:00
Max Brunsfeld
2d18b949ad
Upgrade async-compression dep
2023-12-06 14:29:09 -08:00
Antonio Scandurra
9eb98122ec
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Marshall Bowers
e0ca7f844a
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Piotr Osiewicz
412c6157b1
Port quick_action_bar to zed2
...
Co-authored-by: Nate <nate@zed.dev>
2023-12-05 17:33:35 +01:00
Antonio Scandurra
ede86d9187
WIP
2023-12-05 16:49:36 +01:00
Antonio Scandurra
09db455db2
Port semantic_index to gpui2
...
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-12-05 15:38:36 +01:00
Julia
5ab6874ae9
zed2: Port outline view
2023-12-04 11:44:32 -05:00
Conrad Irwin
2de6758443
+language_selector2
2023-12-01 21:23:20 -07:00
Julia
13f4cc563c
Merge branch 'main' into zed2-breadcrumbs
2023-12-01 11:02:34 -05:00
Max Brunsfeld
16dc978bb4
Bump Tree-sitter for a crash fix
2023-11-30 11:36:36 -08:00
Julia
428c517693
Merge branch 'main' into zed2-breadcrumbs
2023-11-30 11:38:29 -05:00
Max Brunsfeld
e49325080c
Implement activity indicator in zed2
2023-11-29 17:18:21 -08:00
Mikayla
a41c857855
Merge branch 'main' into welcome2
2023-11-28 15:38:51 -08:00
Mikayla
8faa1f6e58
Merge branch 'main' into welcome
2023-11-27 18:55:23 -08:00
Mikayla
a760508080
Add uiua and nu languages
2023-11-27 18:46:56 -08:00
Max Brunsfeld
1c62abbf79
Upgrade Tree-sitter for stack-overflow bugfix
2023-11-27 13:16:50 -08:00
Julia
d551b41aae
zed2: Mostly port breadcrumbs & improve StyledText api
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-11-27 16:09:31 -05:00
Piotr Osiewicz
41b7acc1de
chore: Use "limited" debug info
...
This one does not contain variable-level debug info; since we mostly rely on backtraces though, this should be fine. It also improves compile times a bunch for both incremental and clean scenarios.
2023-11-23 17:54:43 +01:00
Mikayla
663bbb06d9
WIP
2023-11-21 12:40:00 -08:00
Marshall Bowers
a94cf54aab
Fix storybook ( #3379 )
...
This PR fixes storybook and gets it back into a compiling and running
state.
Release Notes:
- N/A
2023-11-21 14:28:00 -05:00
Marshall Bowers
1b05aad30c
Extract Story into separate story crate ( #3378 )
...
This PR extracts the `Story` component into a separate `story` crate so
that it can be shared among various crates that define stories.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
2023-11-21 13:42:00 -05:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Mikayla
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Mikayla Maki
e1285b9780
Add nightly release channel for zed2 ( #3355 )
...
Release Notes:
- N/A
2023-11-17 22:12:18 -08:00
Mikayla
dd283b471a
Add autoupdate2
...
co-authoredby: max@zed.dev
2023-11-17 15:48:32 -08:00
Julia
3655a96e54
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
f4eb219c75
Get diagnostics view almost building in the zed2 world
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-17 16:32:35 -05:00
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01:00
Conrad Irwin
547888942f
Add storybook3
2023-11-16 19:42:25 -07:00
Piotr Osiewicz
6b6a30c3da
Merge branch 'main' into search2
2023-11-16 17:16:15 +01:00
Kirill Bulatov
d89c51135a
Start porting terminal_view to gpui2
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-11-16 10:04:03 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Mikayla
e9e1170976
Compile taffy in release mode
2023-11-15 23:15:36 -08:00
Conrad Irwin
793fa6e3a4
Move placeholder titlebar render to collab_ui
2023-11-15 16:09:21 -07:00
Piotr Osiewicz
b11bfa8821
Merge branch 'main' into search2
2023-11-15 12:54:26 +01:00
Max Brunsfeld
c7d80c7aac
Start work on creating gpui2 version of project panel ( #3299 )
...
I'm gonna land what I have, even though some features aren't ported yet,
since we're working on all of this code so actively.
* [x] get the basic structure compiling
* [x] get the panel laying out correctly
* [ ] rename / new file editor
* [ ] enable the tests
* [ ] drag and drop
* [ ] context menu
2023-11-14 09:56:46 -08:00
Joseph T. Lyons
a5fc5819f1
Bump tiktoken-rs to official release
2023-11-14 09:12:25 -05:00
Joseph T. Lyons
946a696d3d
Update tiktoken-rs dependency
...
The PR to add the `gpt-4-1106-preview` model was merged:
https://github.com/zurawiki/tiktoken-rs/pull/49
2023-11-14 09:00:04 -05:00
Joseph T. Lyons
516a8790b9
Add gpt-4-1106-preview model
2023-11-14 08:28:57 -05:00
Piotr Osiewicz
dfd68d4cb8
WIP: start search2
2023-11-13 20:38:37 +01:00
Max Brunsfeld
1968becf94
Merge branch 'main' into project-panel2
2023-11-13 11:26:51 -08:00
Max Brunsfeld
b9e098ead8
Start work on creating gpui2 version of project panel
2023-11-09 16:51:03 -08:00
Piotr Osiewicz
d184e0d426
Start working on command_palette2
2023-11-09 17:54:05 +01:00
Mikayla
7888dc4592
Add notifications2
2023-11-08 21:23:31 -08:00
Marshall Bowers
acf37804eb
Use a fork of ctor to silence warnings generated by macro ( #3275 )
...
This PR switches us over to a fork of `ctor` that contains the fixes
from https://github.com/mmastrac/rust-ctor/pull/295 , backported to our
current version of `ctor` (v0.1.20).
Once 1) the `ctor` maintainer publishes a new version with that change
and 2) we're ready to upgrade to the latest version of `ctor` we can
switch back to the mainline version.
Release Notes:
- N/A
2023-11-08 15:05:19 -05:00
Mikayla
9b30f490c7
Merge branch 'main' into add-collab-tests
2023-11-08 09:57:08 -08:00
Mikayla
3050c440f4
Merge branch 'main' into add-collab-tests
2023-11-08 09:41:57 -08:00
Max Brunsfeld
d690fb038d
Merge branch 'main' into picker
2023-11-07 11:27:14 -08:00
Max Brunsfeld
69eb49a2ed
Merge branch 'main' into picker
2023-11-07 09:34:57 -08:00
Conrad Irwin
a2a28af052
Add Modals
...
P.S. this is all completely different now
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 09:18:34 -07:00
Mikayla
3f7dc59512
Snapshot for kirill
2023-11-06 12:33:20 -08:00
Marshall Bowers
f8504c349c
Merge branch 'main' into import-theme
2023-11-06 12:08:46 -05:00
Piotr Osiewicz
7374ca999b
chore: Update vue.js parser (fixes wonky HTML parsing)
...
Vue.js defined a bunch of symbols in it's scanner that collided with those defined in HTML Tree-sitter grammar. I simply removed them as they were meant for consumption by the external parties interested in HTML parser with Vue support - since we handle that ourselves this is not really necessary to preserve anymore. cc was firing up a bunch of warnings about unused symbols, so yeah.
2023-11-05 22:56:35 +01:00
Mikayla
e1525e2b47
Get collab2 green
2023-11-03 18:01:06 -07:00
Marshall Bowers
12500364b4
Merge branch 'main' into import-theme
2023-11-03 15:41:12 -04:00
Max Brunsfeld
b085569b46
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
058981350c
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-02 17:21:11 -04:00
Mikayla
e82d8eb5b8
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Julia
b7625d81e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Marshall Bowers
36a73d657a
Remove old Theme definition ( #3195 )
...
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.
The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.
This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:
18431051d9/crates/language2/src/highlight_map.rs (L15-L41)
2023-10-31 23:05:50 -04:00
Julia
795369a1e3
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
3dadfb8ba8
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
Marshall Bowers
b31a004def
Add menu2 crate
2023-10-30 12:56:23 -04:00
Antonio Scandurra
bd750fbbe2
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
6b65d76014
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Conrad Irwin
4a6a17d866
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
98d03f6e7a
Revert "Add activity_indicator2"
...
This reverts commit 88a3a57789
2023-10-26 17:13:40 +02:00
Joseph T. Lyons
88a3a57789
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Antonio Scandurra
821fe0f5b5
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Max Brunsfeld
a4b7e3c9f6
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +02:00
Conrad Irwin
065d26f5b2
Get RPC2 tests passing
...
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
2023-10-26 12:47:37 +02:00
Antonio Scandurra
c8b5b085f4
WIP
2023-10-26 12:27:20 +02:00
Antonio Scandurra
06c22206af
Add install_cli2
...
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-26 12:09:54 +02:00
Kirill Bulatov
483ac9491a
Start fixing room2
2023-10-26 11:27:12 +02:00
Piotr Osiewicz
7f6bb3d1eb
Extract multi_buffer module out of editor ( #3170 )
...
Release Notes:
- N/A
2023-10-25 19:31:47 +02:00
Antonio Scandurra
412c0ff7dc
Add fs2
...
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
2023-10-25 19:17:50 +02:00
Marshall Bowers
6b5947a1fa
Start work on theme converter
2023-10-25 16:54:26 +02:00
Kirill Bulatov
18930c33fe
Make audio2
2023-10-24 17:15:59 +02:00
Antonio Scandurra
11953e613b
Checkpoint
2023-10-24 16:15:20 +02:00
Antonio Scandurra
191285a8f1
Checkpoint
2023-10-24 15:18:51 +02:00
Kirill Bulatov
4d5ca37edb
Fix the branch compilation
2023-10-24 14:04:45 +02:00
Antonio Scandurra
18eb4a7292
WIP
2023-10-24 10:01:19 +02:00
Piotr Osiewicz
97a0864134
grammars: Update Bash grammar ( #3155 )
...
Fixes zed-industries/community#2168
Release Notes:
- Updated Bash (Shell script) Tree-sitter grammar (fixes
zed-industries/community#2168 )
2023-10-24 09:16:06 +02:00
Antonio Scandurra
05cbceec24
WIP
2023-10-23 17:36:49 +02:00
Antonio Scandurra
a72434f67b
WIP
2023-10-23 12:16:33 +02:00
Antonio Scandurra
0de4a93ec7
WIP
2023-10-23 11:43:08 +02:00
Antonio Scandurra
56462ef793
Checkpoint
2023-10-23 10:59:29 +02:00
Antonio Scandurra
a0b667a2ca
WIP
2023-10-22 19:56:25 +02:00
Antonio Scandurra
72435af170
Checkpoint
2023-10-22 18:34:45 +02:00
Nathan Sobo
909fbb9538
Checkpoint
2023-10-21 19:07:59 +02:00
Antonio Scandurra
b7d30fca2b
WIP
2023-10-21 17:52:47 +02:00
Antonio Scandurra
e4fe9538d7
Checkpoint
2023-10-21 16:01:47 +02:00
Antonio Scandurra
f3979a9f28
Checkpoint
2023-10-21 15:59:52 +02:00
Max Brunsfeld
e590b43545
Merge branch 'main' into notifications
2023-10-13 11:31:53 -07:00
Piotr Osiewicz
bfbe4ae4b4
Piotr/z 651 vue support ( #3123 )
...
Release Notes:
- Added Vue language support.
2023-10-13 18:58:59 +02:00
Max Brunsfeld
d1756b621f
Start work on notification panel
2023-10-12 17:41:09 -07:00
Max Brunsfeld
cf6ce0dbad
Start work on storing notifications in the database
2023-10-12 17:41:07 -07:00
Marshall Bowers
ef18aaa66f
Merge branch 'main' into gpui2
2023-10-12 17:43:05 -04:00
Marshall Bowers
45f3a98359
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
Julia
eced842dfc
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
1cf5cdbeca
Add ui2 crate
2023-10-06 16:52:05 -04:00
Marshall Bowers
ad8187b151
Merge branch 'main' into marshall/gpui2-playground
2023-10-06 13:33:04 -04:00
Mikayla
c4870e1b6b
re-unify markdown parsing between hover_popover and chat
2023-10-05 14:22:41 -07:00
Mikayla
d298afba01
Create markdown text element and add to channel chat
2023-10-04 17:47:30 -07:00
Max Brunsfeld
95342c8c33
Merge branch 'main' into channel-changes
2023-10-03 17:52:28 -07:00
Max Brunsfeld
af09861f5c
Specify uuid crate in the root Cargo.toml
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:39:24 -07:00
Mikayla
6007c8705c
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. Lyons
892350fa2d
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
d14dc35efe
Merge branch 'gpui2' into marshall/gpui2-playground
2023-10-02 18:36:22 -04:00
KCaverly
dc49dec4f0
catchup with main
2023-09-22 09:43:39 -04:00
KCaverly
48e151495f
introduce ai crate with completion providers
2023-09-21 22:44:56 -04:00
KCaverly
5f6334696a
rename ai crate to assistant crate
2023-09-21 21:54:59 -04:00
Marshall Bowers
baa07e935e
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
dfeb702544
WIP - Next: implement Element derive macro
2023-09-20 22:26:46 -06:00
Nathan Sobo
44608517c1
WIP
2023-09-20 14:32:55 -06:00
KCaverly
25cb79e475
remove git2 dependency for repository cloning in semantic_index eval
2023-09-19 18:55:15 -04:00
KCaverly
b57b5c0b33
updated git2 to use ssl
2023-09-19 16:36:51 -04:00
KCaverly
d85acceeec
move git2 to workspace dependency globally
2023-09-19 16:13:47 -04:00
Nathan Sobo
e762f7f3c0
Checkpoint
2023-09-19 13:09:00 -06:00
Nathan Sobo
15ea4af5e7
Merge branch 'main' into storybook
2023-09-11 09:13:46 -06:00
Mikayla
2be34ef254
Add syntax highlighting for nu scripts
2023-09-09 15:39:39 -07:00
Mikayla
ef03e206d6
WIP: Add nushell support
2023-09-09 14:01:53 -07:00
Nathan Sobo
3b5ee59273
Split playground into gpui2 and storybook
2023-08-30 16:12:14 -06:00
Nathan Sobo
746f77bf7c
Checkpoint
2023-08-30 14:40:57 -06:00
Mikayla
74565ed0b8
Add feature flags handling to the client, rewrite staff mode to a trait extension style
2023-08-25 17:00:53 -07:00
Mikayla
a7a4e2e369
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
ff5035ea37
Start work on storing channel buffers
2023-08-23 18:34:43 -07:00
Mikayla
707ca34f19
Merge branch 'main' into disclosable-component
2023-08-23 16:30:27 -07:00
Piotr Osiewicz
1320fadc30
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
d375f7992d
Merge branch 'main' into divs
2023-08-22 16:35:56 -06:00
Mikayla
e946b0a2ec
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
09fcacdfd1
Upgrade Tree-sitter for error recovery bug fix
2023-08-18 11:31:40 -07:00
Nathan Sobo
9b74dc196e
Introduce Refinement trait and derive macro
2023-08-18 01:03:46 -06:00
Nathan Sobo
1ef486b227
WIP
2023-08-13 01:40:05 -06:00
Nathan Sobo
d6eaa3c6b8
Ditch the hot reloading approach
2023-08-11 00:26:58 -06:00
Nathan Sobo
c95aecdd53
Merge branch 'main' into cells
2023-08-08 21:23:57 -06:00
Nathan Sobo
adc50469ff
WIP
2023-08-06 12:45:31 -06:00
Nathan Sobo
379652f074
Merge branch 'main' into cells
2023-08-03 19:33:04 -06: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.
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 Maki
0dffb728db
Update elixir depedency
...
co-authored-by: Alex <alexviscreanu@gmail.com>
2023-07-27 17:36:09 -07:00
Mikayla Maki
d835274306
Downgrade our dependency on treesitter-cpp
2023-07-27 11:11:24 -07:00
Mikayla Maki
d5c30709b3
Downgrade tree sitter elm to 5.6.4
2023-07-26 15:44:06 -07:00
KCaverly
0ac919f6e0
catchup with main
2023-07-26 09:50:38 -04: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
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
KCaverly
9809ec3d70
update treesitter parsing to accomodate for collapsed nested functions
...
Co-authored-by: maxbrunsfeld <max@zed.dev>
2023-07-19 15:47:05 -04:00
Nate Butler
bf2dcd4582
Update cargo.toml
2023-07-18 12:15:03 -04:00
KCaverly
b9fdfd60f0
catch up with main
2023-07-18 10:26:28 -04:00
KCaverly
8b42f5b1b3
rename vector_store crate to semantic_index
2023-07-17 17:06:10 -04:00
Piotr Osiewicz
965cc2efbc
Fix a crash in tree-sitter-php
2023-07-17 12:07:25 +02:00
Piotr Osiewicz
11173b2199
Merge branch 'main' into piotr/z-2588-php
2023-07-17 11:47:08 +02:00
Nathan Sobo
87bafb04e2
Get playground app launching
...
Not sure if it should be in the workspace, but it's easier for now.
Co-Authored-By: Derek Briggs <derek.briggs@me.com>
2023-07-14 15:34:31 -06:00
Max Brunsfeld
2f2ef7c165
Use workspace dependencies for tree-sitter grammars
2023-07-14 09:25:51 -07:00
KCaverly
c141519dba
merged with main
2023-07-12 13:15:23 -04:00
Piotr Osiewicz
99c2395a86
chore: Disable http2 feature in isahc. ( #2709 )
...
This removes transitive dependency on libnghttp2, which is pretty heavy.
Release Notes:
- N/A
2023-07-12 17:24:01 +02:00
Piotr Osiewicz
78c8324698
chore: Disable http2 feature in isahc.
...
This removes transitive dependency on libnghttp2, which is pretty heavy.
2023-07-12 16:53:01 +02:00
KCaverly
dd0dbdc5bd
brought up to speed with main
2023-07-11 14:50:48 -04:00
Piotr Osiewicz
e00e73f608
branches: Add a modal branch list.
...
Extract branch list into a separate vcs_menu crate akin to recent_projects.
Add current bind for a modal branch to branch popover's tooltip.
Z-2555
2023-07-10 17:18:12 +02:00
KCaverly
3f5667b101
merged main
2023-07-07 14:24:29 -04:00
Mikayla Maki
d2127825e3
Add first-pass sound support to Zed
2023-07-03 13:30:04 -07:00
Mikayla Maki
33f5248d4f
Add the ability to make new directories by adding slashes to a file name
2023-06-29 17:35:22 -07:00
KCaverly
3ca3de807c
Merge branch 'main' of github.com:zed-industries/zed into vector_store
2023-06-28 14:42:24 -04:00
Piotr Osiewicz
625814d30a
Merge branch 'main' into collab-titlebar-2
2023-06-27 15:40:43 +02:00
Nate Butler
a305d93567
Z-2308 - Export Theme Types from Rust ( #2621 )
...
This PR adds JSON Schema definitions into GPUI's styles and adds a tool
for generating typescript types from these schema definitions.
Release Notes:
- N/A
2023-06-22 12:33:18 -04:00
Piotr Osiewicz
417a743b5e
chore: use codegen_units=1 ( #2633 )
...
Reduces binary size by about 31Mb (total .dmg size down by 15Mb after compression).
2023-06-22 18:06:17 +02:00
Piotr Osiewicz
af252888c4
Merge branch 'main' into sergey/z-2308-create-a-proof-of-concept-of-exporting-a-type-from-rust-and
2023-06-22 17:58:56 +02:00
Piotr Osiewicz
76366422a6
Merge branch 'main' into collab-titlebar-2
2023-06-22 13:48:16 +02:00
KCaverly
80a894b829
WIP: started work on vector store db, by walking project worktrees.\n\nCo-Authored-By: Max <max@zed.dev>
2023-06-21 14:53:08 -04:00
Piotr Osiewicz
86506a89ab
Remove theme_testbench
2023-06-21 19:11:55 +02:00
Piotr Osiewicz
9aa7a50951
Use xtask for theme generation
2023-06-21 18:48:09 +02:00
Piotr Osiewicz
4b87ce8952
add zed-actions crate
2023-06-15 22:05:43 -07:00
Max Brunsfeld
594b9def20
Upgrade Tree-sitter
2023-06-12 15:31:59 -07:00
Max Brunsfeld
086cfe57c5
Start work on a syntax tree view
2023-06-12 15:14:56 -07:00
Piotr Osiewicz
572c59eec4
chore: Enable full LTO ( #2548 )
...
Per conversation with Antonio, I've suggested enabling full LTO; right
now we use a crate-local ThinLTO, which does not inline function calls
across crates.
| Configuration | Current main (788f97e
2023-06-06 21:50:08 +02:00
