yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Conrad Irwin f9cee6b4cf Convert rich_text2 2023-11-02 19:30:33 -06:00
Conrad Irwin bd8b5d2318 Add rich_text2 2023-11-02 19:19:18 -06:00
Conrad Irwin 5e2813d913 git -> git3 
This is needed for the editor.
 2023-11-02 19:18:01 -06:00
Conrad Irwin 6091480720 Into the woods 2023-11-02 18:52:08 -06:00
Nate Butler 7d5e80d90a Merge branch 'main' into import-theme 2023-11-02 20:16:09 -04:00
Nate Butler 86aeedd5e6 Update theme importer 2023-11-02 20:15:51 -04:00
Nate Butler 93dde97c6e Remove unintentionally committed txt file 2023-11-02 20:06:35 -04:00
Nate Butler 0685483f99 Add terminal colors to ThemeColors, add _background to some color names. 2023-11-02 19:53:52 -04:00
Nathan Sobo f4502c5da6 Use correct color values in quad fragment shader (#3217) 
Previously, when using rounded corners, the borders would get wider.
Looks like we weren't using the input color values consistently in the
fragment shader. The quad values are raw HSLA and are converted in the
vertex shader.

Release Notes:

- N/A
 2023-11-02 17:49:56 -06:00
Marshall Bowers 6930e7066d Clean up unused code 2023-11-02 19:20:21 -04:00
Marshall Bowers 270c15ae97 Add themes2/src/themes directory 2023-11-02 19:17:39 -04:00
Marshall Bowers ce9a070d73 Finish up theme printer 2023-11-02 19:14:51 -04:00
Marshall Bowers 8490ac6d58 Start work on theme printer 2023-11-02 18:57:13 -04:00
Nathan Sobo 7ebf696940 WIP 2023-11-02 16:47:14 -06:00
Marshall Bowers 876d0fc428 Add basic VsCodeThemeConverter 2023-11-02 18:24:38 -04:00
Marshall Bowers 5d2e8aa6fb Parse VSCode theme files 2023-11-02 18:00:55 -04:00
Conrad Irwin 0fca49be33 WIP 2023-11-02 15:27:49 -06:00
Nate ButlerandMarshall Bowers 538664e784 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
Conrad Irwin ec5209de48 Editor2 2023-11-02 14:36:42 -06:00
Conrad IrwinandNathan 2e06b2586a Fix error handling of open_path 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-11-02 14:34:43 -06:00
Nate Butler c9c18d1f29 Deserialize theme metadata 2023-11-02 16:31:22 -04:00
Nate Butler 3ecb46ad01 [Broken] Load a src theme in test 2023-11-02 16:26:27 -04:00
Marshall Bowers 5bb88445e5 Make the Zed2 window movable (#3218) 
This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.

Release Notes:

- N/A
 2023-11-02 16:17:31 -04:00
Conrad Irwin 9bd0926a50 workspace2 (#3188) 
Tracking PR for workspace port
 2023-11-02 13:34:19 -06:00
Conrad Irwin 13b85165d3 Disable selective warnings to make cargo check happy 2023-11-02 13:28:58 -06:00
Nathan SoboandJulia Risley b6e6f89bc8 Use correct color values in quad fragment shader 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 13:18:20 -06:00
Conrad Irwin fdeff77625 Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Mikayla Maki 4c1ddba949 Remove the 2s from source code (#3216) 
Release Notes:

- N/A
 2023-11-02 12:11:16 -07:00
Marshall Bowers 0a49ddb9e3 Remove commented-out label code 2023-11-02 15:04:52 -04:00
Nate Butler 24fb5d36ac WIP 2023-11-02 14:54:53 -04:00
Marshall Bowers 28a31b6b74 Render active item in pane 2023-11-02 14:40:34 -04:00
Nathan Sobo 08ceed8fbd Enforce Send bound on next frame callback functions, because they're invoked on arbitrary threads (#3215) 
This enforces the send bound, then uses an async task looping on a
channel to run callbacks on the main thread.
 2023-11-02 12:36:38 -06:00
Marshall Bowers 54ea96f3b0 Checkpoint: Basic tab bar structure 2023-11-02 14:34:48 -04:00
Nathan Sobo 12fe5d7d49 Fix formatting 2023-11-02 12:28:58 -06:00
Nathan Sobo 2cb2794a7b Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow 2023-11-02 12:25:06 -06:00
Nate Butler dd57f15f4c WIP 2023-11-02 14:23:43 -04:00
Nathan SoboandJulia Risley f6c20cdc20 Enforce a Send bound on next frame callbacks 
This required using mpsc channels to invoke frame callbacks on the
main thread and send the receiver to the platform display link.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 12:01:22 -06:00
Mikayla d8b8390702 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Conrad Irwin d8f6dd8d39 WIP 2023-11-02 11:34:31 -06:00
Marshall Bowers deecb5eb73 WIP 2023-11-02 13:21:28 -04:00
Conrad IrwinandAntonio 38c49ea4a7 Render status bar 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 11:18:11 -06:00
Conrad IrwinandAntonio 13ab124444 Add double click to zoom the window 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 10:58:46 -06:00
Marshall Bowers fb4132cd65 Checkpoint: Narrow down error 2023-11-02 12:47:06 -04:00
Marshall Bowers 071112b838 Checkpoint: Reproduction with Avatar story 2023-11-02 12:34:40 -04:00
Conrad IrwinandMikayla 6605085a27 Render titlebar 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-11-02 10:31:18 -06:00
Conrad IrwinandAntonio 64ddd2696e Add back some window events for workspace 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 10:03:03 -06:00
Nate Butler a1b69e9615 Document format_distance (#3214) 
Adds docs for `ui2::util::format_distance`:
- distance_in_seconds
- distance_string
- naive_format_distance
- naive_format_distance_from_now

These are ports of
[`date-fns`](https://date-fns.org/v2.30.0/docs/formatDistance)'s format
distance utilities

[[PR Description]]

Release Notes:

- N/A
 2023-11-02 11:58:45 -04:00
Julia a1679d9368 Uncomment lsp2 tests (#3213) 
Release Notes:

- N/A
 2023-11-02 11:54:06 -04:00
Nate Butler 22d9ca9a3f Document format_distance 
Adds docs for:
- distance_in_seconds
- distance_string
- naive_format_distance
- naive_format_distance_from_now
 2023-11-02 11:53:20 -04:00
Conrad Irwin 6da8bb337f Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 09:44:38 -06:00