oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,839 Commits 1 Branch 0 Tags
94293b3bf92fb5a85eb28f157f17052d41bf526e
Commit Graph
152 Commits
Author SHA1 Message Date
Max Brunsfeld 08a4307d71 Fix failure to write to keychain because of dropping a future 2024-01-11 16:22:34 -08:00
Max Brunsfeld 258c2fdad4 Fix routing of leader updates from unshared projects 
Previously, leader updates in unshared projects would be sent to
all followers regardless of project, as if they were not scoped
to any project.
 2024-01-11 13:47:31 -08:00
Marshall Bowers aff119b80a Fix possessive "its" in docs and comments (#3998) 
This PR fixes a number of places where we were incorrectly using "it's"
where we needed to use the possessive "its".

Release Notes:

- N/A
 2024-01-10 10:09:48 -05:00
Max BrunsfeldandMikayla f5ba22659b Remove 2 suffix from gpui 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 12:59:39 -08:00
Max Brunsfeld b594e59134 Lay some groundwork for language plugins (#3837) 
This PR adds undocumented functionality for loading custom language
plugins at runtime. I don't intend to expose the functionality to end
users yet, but this will allow the team to test the capability
internally.

### Implementation

There isn't much new code in Zed. Most of the work here is within
Tree-sitter, in PRs https://github.com/tree-sitter/tree-sitter/pull/1864
and https://github.com/tree-sitter/tree-sitter/pull/2840, which allow
Tree-sitter to load languages from WASM blobs. I've tested the
functionality in Tree-sitter's test suite and via its CLI, but having it
wired into Zed allows us to test the functionality more fully.

### Details

Now, on startup, Zed will look for subdirectories inside of
`~/Application Support/plugins`. These subdirectories are expected to
look similar to the per-language subdirectories in
[`crates/zed2/src/languages`](https://github.com/zed-industries/zed/tree/main/crates/zed2/src/languages),
except that they also contain a `.wasm` file for the parser itself.

I'll add more details here as I go.
 2024-01-03 09:37:42 -08:00
Max Brunsfeld 64e512232d Start work on supporting custom languages 2024-01-02 08:01:59 -08:00
Piotr Osiewicz 4fa28b3de2 chore: fix clippy lints for rope2, sum_tree, text2 and util 2024-01-01 23:50:14 +01:00
Marshall Bowers dc64411cca Extend theme_importer in preparation for importing Zed1 themes (#3791) 
This PR extends the `theme_importer` with the overall structure required
to support importing themes from Zed1.

Release Notes:

- N/A
 2023-12-22 13:47:30 -05:00
Mikayla 25df11dd26 Begin porting the PaneAxis element 2023-12-07 17:16:19 -08:00
Antonio Scandurra 9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Antonio Scandurra d86da04584 WIP 2023-12-05 19:27:15 +01:00
Kirill Bulatov 92fbdb429c Add project search in gitignored test 2023-12-05 12:45:44 +02:00
Kirill Bulatov 2c2c14a360 Fix the regex matcher 2023-12-05 12:45:36 +02:00
Kirill Bulatov f0ca7141b8 Ignore excluded files on worktree entry refresh 2023-12-05 12:30:29 +02:00
Kirill Bulatov 1f6c69c7dc Allow opening buffers without a project entry 2023-12-05 12:30:29 +02:00
Conrad Irwin 4f885252ab [Zed2] Collab UI (#3403) 
Release Notes:

- N/A
 2023-11-27 12:40:59 -07:00
Piotr Osiewicz c191943849 Add basic call/user UI in top-right corner. 
Allow ui::Avatar to take custom data instead of always relying on URI resolution
 2023-11-23 15:00:13 +01:00
Kirill Bulatov 92953fb53d If enabled, search in ignored files during project search 2023-11-22 16:41:02 +02:00
Mikayla Maki e1285b9780 Add nightly release channel for zed2 (#3355) 
Release Notes:

- N/A
 2023-11-17 22:12:18 -08:00
Max BrunsfeldMikaylaKirill
 		a03d062120 Make the commit sha availabe in the app, via a global 
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Kirill <kirill@zed.dev>
 2023-11-17 14:52:43 -08:00
Max Brunsfeld a8bea41ad8 Put release channel back to dev 2023-11-17 14:31:49 -08:00
Kirill Bulatov 9373d38434 Rescan worktree on scan exclusions settings change 2023-11-17 21:40:56 +02:00
Kirill Bulatov 1612c90052 More lenient file path matchers 2023-11-17 21:40:56 +02:00
Kirill Bulatov 6680e1e9fe Create new Zed release channel: nightly 2023-11-17 12:13:32 +02:00
Kirill Bulatov d673efebd2 Add prettier workspace resolution test 2023-11-03 11:02:50 +02:00
Conrad Irwin 4a6a17d866 Merge branch 'main' into zed2 2023-10-27 10:55:15 +02:00
Conrad Irwin 51aa0d6a94 Clearer error on importing both gpui and gpui2 2023-10-26 10:39:52 +02:00
Piotr OsiewiczandJulia Risley bc3572f80e util: Improve error message for failing requests to GH. (#3159) 
Release notes:
- N/A

Co-authored-by: Julia Risley <julia@zed.dev>
 2023-10-26 10:39:45 +02:00
Mikayla 26a3d41dc7 Change from try (reserved keyword) to maybe 2023-10-25 07:10:21 -07:00
Mikayla Maki beb0af9763 Rename IIFE to try 
Too good of an idea to forget
 2023-10-24 21:13:22 +02:00
Antonio Scandurra 8a11053f1f Checkpoint 2023-10-20 11:44:19 +02:00
Piotr Osiewicz bfbe4ae4b4 Piotr/z 651 vue support (#3123) 
Release Notes:

- Added Vue language support.
 2023-10-13 18:58:59 +02:00
Marshall Bowers ef18aaa66f Merge branch 'main' into gpui2 2023-10-12 17:43:05 -04:00
Antonio Scandurra 23f11fcd5e Merge branch 'main' into gpui2 2023-10-12 10:55:17 +02:00
Kirill Bulatov 4f956d71e2 Slightly better prettier settings and discovery 2023-10-11 12:56:29 +03:00
Nathan Sobo f1cc62c21f WIP 2023-10-10 22:49:47 -06:00
Conrad Irwin d4ef764305 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Kirill Bulatov ba4f4e0a3e Detect file paths that end with : 
New rustc messages look like

```
thread 'tests::test_history_items_vs_very_good_external_match' panicked at crates/file_finder/src/file_finder.rs:1902:13:
assertion `left == right` failed: Only one history item contains collab_ui, it should be present and others should be filtered out
  left: 0
 right: 1
```

now and we fail to parse that `13:` bit properly, fix that.
 2023-10-09 23:55:58 +03:00
Marshall Bowers f6a4151f60 Merge branch 'main' into gpui2 2023-10-07 10:50:05 -04:00
Conrad Irwin f6bc229d1d More progress and some debug logs to remove 2023-10-06 16:48:29 -06:00
Conrad Irwin b58c42cd53 TEMP 2023-10-06 13:47:35 -06:00
Conrad Irwin 13192fa03c Code to allow opening zed:/channel/1234 
Refactored a bit how url arguments are handled to avoid adding too much
extra complexity to main.
 2023-10-05 14:57:45 -07:00
Conrad Irwin a63eccf188 Add url schemes to Zed 2023-10-05 14:55:39 -07:00
Antonio Scandurra 4cf2ba20c2 Checkpoint: render SVGs 2023-10-04 10:51:47 +02:00
Piotr Osiewicz 0a491e773b workspace: Improve save prompt. (#3025) 
Add buffer path to the prompt.

Z-2903

Release Notes:
- Added a "Save all/Discard all" prompt when closing a pane with
multiple edited buffers.
 2023-09-25 16:15:29 +02:00
KCaverly d85acceeec move git2 to workspace dependency globally 2023-09-19 16:13:47 -04:00
Nathan Sobo 4fd4f44bb7 Checkpoint 2023-09-14 18:51:03 -06:00
Nathan Sobo 37ef28a3bf Merge branch 'main' into storybook 2023-09-07 07:56:57 -06:00
Nathan Sobo 99ad60460a Add support for fetching/rendering images 2023-09-06 17:13:43 -06:00
Nathan Sobo 6d4dd0e7a4 Checkpoint 2023-09-06 15:22:35 -06:00