yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Antonio Scandurra 1fc83692d2 Introduce ViewContext::observe_window_{activation,bounds} (#3212) 
Release Notes:

- N/A
 2023-11-02 16:44:26 +01:00
Julia 1a0a14f89d Uncomment lsp2 tests 2023-11-02 11:42:48 -04:00
Marshall Bowers 77bb709e42 Add map method to Components (#3210) 
This PR adds a `map` method to the `Component` trait.

`map` is a fully-generalized form of `when`, as `when` can be expressed
in terms of `map`:

```rs
div().map(|this| if condition { then(this) } else { this })
```

This allows us to take advantage of Rust's pattern matching when
building up conditions:

```rs
// Before
div()
    .when(self.current_side == PanelSide::Left, |this| this.border_r())
    .when(self.current_side == PanelSide::Right, |this| {
        this.border_l()
    })
    .when(self.current_side == PanelSide::Bottom, |this| {
        this.border_b().w_full().h(current_size)
    })

// After
div()
    .map(|this| match self.current_side {
        PanelSide::Left => this.border_r(),
        PanelSide::Right => this.border_l(),
        PanelSide::Bottom => this.border_b().w_full().h(current_size),
    })
```

Release Notes:

- N/A
 2023-11-02 11:39:40 -04:00
Antonio ScandurraandConrad Irwin ae9e7aa6b5 Implement ViewContext::observe_window_activation 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-02 16:37:57 +01:00
Antonio ScandurraandConrad Irwin 8b551beb77 Subsume observe_fullscreen into observe_window_bounds 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-02 16:31:27 +01:00
Nate Butler 4960ed5a71 Work on default theme, Notifications, Add ListHeader meta (#3203) 
Work on default theme, Notifications, Add ListHeader `meta`

Also adds `naive_format_distance` & `naive_format_distance_from_now`

Release Notes:

- N/A
 2023-11-02 11:19:48 -04:00
Antonio ScandurraandConrad Irwin 889de80768 Add ViewContext::observe_fullscreen 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-02 16:11:52 +01:00
Julia c2b9babeae Uncomment db2 tests (#3211) 
Release Notes:

- N/A
 2023-11-02 11:10:08 -04:00
Nate Butler 708091c82c Remove unused import 2023-11-02 11:04:04 -04:00
Nate Butler 4482d528dc Merge branch 'main' into n/t2 2023-11-02 11:02:55 -04:00
Nate Butler 931d6f0b61 Remove unused import 2023-11-02 11:02:46 -04:00
Nate Butler eddf9edda1 Use naive_format_distance_from_now in Notifications 2023-11-02 11:02:17 -04:00
Julia 097353a483 Uncomment db2 tests 2023-11-02 11:01:38 -04:00
Nate Butler 1b5160f0e1 Update naive_format_distance and tests 2023-11-02 10:37:33 -04:00
Kyle Caverly ab7a2a21fe authenticate with completion provider on new inline assists (#3209) 
authenticate with completion provider on new inline assists

Release Notes:

- Fixed bug which lead the inline assist functionality to never
authenticate
 2023-11-02 10:14:52 -04:00
Nate Butler abce383ba0 Checkpoint - impl format_distance 2023-11-02 10:11:25 -04:00