oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,678 Commits 1 Branch 0 Tags
c0d85dc1dd5add35d3ec0cfdd2f05eba4cdacd24
Commit Graph
1436 Commits
Author SHA1 Message Date
Conrad Irwin c0d85dc1dd Fix text wrapping when a child of a v_stack() (#3362) 
Previously text that was rendered in a flex-column would reserve the
correct
amount of space during layout, and then paint itself incorrectly.

Release Notes:

- N/A
 2023-11-19 11:37:31 -07:00
Conrad Irwin 242a0b85b5 Update Taffy to latest main 2023-11-18 21:30:33 -07:00
Mikayla ede7656f02 please work 2023-11-18 10:46:35 -08: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 967ef9d414 Render diagnostics view and such a bit more 2023-11-17 16:32:35 -05:00
Julia a464a7da2a Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
JuliaandNathan Sobo 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
Conrad Irwin 6d4276ea5f Merge branch 'main' into collab_ui2 2023-11-16 22:08:42 -07:00
Conrad Irwin 547888942f Add storybook3 2023-11-16 19:42:25 -07:00
Mikayla a0e976599c Salvage old distributed slice code 2023-11-16 10:32:55 -08:00
Kirill BulatovandPiotr ab0a3f19ab Add an actual context menu into terminal-2 
(click the text, not the pane!)

Co-Authored-By: Piotr <piotr@zed.dev>
 2023-11-16 16:36:44 +02:00
Kirill Bulatov f638d4ce1d Add basic context menu element 2023-11-16 14:35:13 +02:00
Kirill Bulatov fd61683c46 WIP 2023-11-16 10:40:02 +02:00
Kirill BulatovandMikayla Maki d89c51135a Start porting terminal_view to gpui2 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-11-16 10:04:03 +02:00
Conrad Irwin 793fa6e3a4 Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00
Conrad Irwin 84bcbf1128 Add collab_ui2 2023-11-15 16:08:03 -07:00
Joseph T. Lyons d791fc707a v0.114.x dev 2023-11-15 12:47:40 -05:00
Conrad Irwin 80b7f75d24 Merge branch 'main' into file_finder 2023-11-14 13:34:25 -07:00
Mikayla caa0bae04f Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Conrad Irwin f4ccff7b72 TEMP 2023-11-14 11:03:55 -07: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
Max Brunsfeld b893ac2a02 Merge branch 'main' into project-panel2 2023-11-14 09:33:48 -08:00
Conrad Irwin 7d94d8940c Not working yet file-finder2 2023-11-14 09:28:18 -07: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
Mikayla ee4957dd47 Implement most core actions 2023-11-14 00:06:33 -08:00
Mikaylaandconrad a4e9fea133 WIP 
co-authored-by: conrad <conrad.irwin@zed.dev>
 2023-11-13 15:53:04 -08:00
Max Brunsfeld 1968becf94 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
Piotr Osiewicz c3461d274e chore: Bump cc to 1.0.84 (#3304) 
This resolves a minor issue where build scripts could've acquired more
job server tokens from Cargo than allowed by `-j` parameter. I've filled
a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated
on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially
shaving off a few seconds off of debug/release builds. Full description
of the issue is available in
https://github.com/rust-lang/cc-rs/issues/858

Release Notes:

- N/A
 2023-11-13 13:14:22 +01:00
Piotr Osiewicz cdd347c2a0 chore: Bump cc to 1.0.84 
This resolves a minor issue where build scripts could've acquired more job server tokens from Cargo than allowed by `-j` parameter. I've filled a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially shaving off a few seconds off of debug/release builds.
 2023-11-12 21:28:02 +01:00
Antonio Scandurra a0987f1121 Merge remote-tracking branch 'origin/main' into code-actions-2 2023-11-10 11:01:23 +01:00
Conrad Irwin a73265ace4 Merge branch 'main' into command_palette2 2023-11-09 20:58:54 -07:00
Max Brunsfeld b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Marshall Bowers cb8c534dac theme_importer: Support importing themes containing comments (#3298) 
This PR updates the `theme_importer` with support for parsing theme
files containing comments.

Up until now we've been manually removing comments from the VS Code
theme files.

Release Notes:

- N/A
 2023-11-09 19:22:15 -05:00
Conrad Irwin fa153a0d56 Make command dispatching work 2023-11-09 15:14:23 -07:00
Marshall Bowers 31a6409a4c Refine theme styles (#3291) 
This PR refines a number of styles in the default theme, as well as
updates the theme importer to support importing syntax styles from VS
Code themes.

Release Notes:

- N/A
 2023-11-09 15:32:10 -05:00
Nate ButlerandMarshall Bowers 54157eb99a Finish passing Syntax from VSCode themes to Zed Themes 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 14:41:26 -05:00
Marshall Bowers 978cff8095 Use IndexMap for a deterministic order when importing syntax colors 2023-11-09 13:12:36 -05:00
Antonio ScandurraandNathan 5d15886675 Render code actions indicator 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-11-09 18:43:26 +01: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
Mikayla Maki 8330fb5f10 port rope2 to zed2 (#3224) 
port rope2 to zed2

Release Notes:

- NA
 2023-11-08 20:19:05 -08:00
Mikayla 2c67cc80ba Merge branch 'main' into event-emitter 2023-11-08 20:10:38 -08:00
Mikayla a97c8bf58f Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Conrad Irwin cbdd4aca89 Merge branch 'main' into go-to-line2 2023-11-08 14:46:52 -07:00
Mikayla 097efdebc5 WIP 2023-11-08 12:49:09 -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