Commit log

feeb44c Merge remote-tracking branch 'origin/main' into editor2-rename

Click to expand commit body 
# Conflicts:
#	crates/editor2/src/editor.rs
#	crates/editor2/src/element.rs
#	crates/gpui2/src/style.rs

Antonio Scandurra created

c3094b7 Introduce gpui::render_view

Antonio Scandurra created

1def355 Don't return `Result` from `TextStyle::highlight`

Antonio Scandurra created

c81bd28 Fix test

Conrad Irwin created

91b54b3 Add command palette tests and simulate_keystrokes

Conrad Irwin created

e37d7f5 Fix click events by notifying when we assign pending_mouse_down (#3329)

Click to expand commit body 
We need to notify when we set the pending mouse down so we attach the
mouse up event listener before the mouse button is released.

Release Notes:

- N/A

Nathan Sobo created

32ad486 Document contexts

Nathan Sobo created

00d8921 Fix click events by notifying when we assign pending_mouse_down

Nathan Sobo created

f9a5e14 Fix uncached raster_bounds computation and font selection (#3328)

Click to expand commit body 
This fixes some slowness we noticed when scrolling an editor in `zed2`.

Max Brunsfeld created

8de8615 Fix uncached raster_bounds computation and font selection

Click to expand commit body 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>

Max Brunsfeld , Nathan Sobo , and Mikayla created

96f0257 Simplify element types (#3318)

Click to expand commit body 
This PR does away with the extra type parameters on Div and instead
introduces two wrapper elements, `Stateful` and `Focusable`. All of the
interactivity is stored on `Interactivity` and `InteractiveState`, which
is stored on the base element. The wrappers simply control what methods
are available to call.

Not sure this is fully working, but a smoke test does work.

/cc @as-cii @ConradIrwin 

Release Notes:

- N/A

Mikayla Maki created

817c6dd remove dbg

Mikayla created

b81b96f Merge branch 'element-types' of github.com:zed-industries/zed into element-types

Mikayla created

7f72df6 Merge branch 'main' into element-types

Mikayla created

df64a3c Not working yet file-finder2 (#3321)

Click to expand commit body 
Porting file_finder

Release Notes:

- N/A

Mikayla Maki created

1109cd1 Abandon ship

Conrad Irwin created

bef4df5 Return an id from `Element::element_id` instead of calling `cx.with_element_id`

Click to expand commit body 
Co-Authored-By: Julia <julia@zed.dev>

Nathan Sobo and Julia created

ca63a99 Enable tests in project panel 2 (#3325)

Max Brunsfeld created

860959f Implement simulated prompts in TestPlatform

Max Brunsfeld created

6b25841 WIP

Mikayla created

606ab74 Project panel: detect filename editor blur via an editor event

Max Brunsfeld created

b40daa1 Set Pane Size (#3327)

Click to expand commit body 
[[PR Description]]

Set the size of panes to their `size`.

Release Notes:

- N/A

Nate Butler created

008655b Set Pane Size

Nate Butler created

3b01a03 In the middle of stuff

Conrad Irwin created

fea0ff3 Use `IconElement` in project panel (#3326)

Click to expand commit body 
This PR updates the project panel to use the `IconElement` to render
icons instead of duplicating the styles.

Release Notes:

- N/A

Marshall Bowers created

123faed Re-enable all project panel tests

Click to expand commit body 
Some are still failing.

Max Brunsfeld created

22f024b Use `IconElement` in project panel

Marshall Bowers created

80b7f75 Merge branch 'main' into file_finder

Conrad Irwin created

3a4c5aa Implement FileFinder

Conrad Irwin created

dcdbf43 Fix some small quit and recursion bugs (#3323)

Click to expand commit body 
Release Notes:

- N/A

Mikayla Maki created

62fc0b2 Remove unnescessary unimplemented

Mikayla created

75490fe Avoid user NPM config/cache & put NodeRuntime installation behind a lock (#3324)

Click to expand commit body 
Release Notes:

- Fixed a case where system NPM configuration could effect Node based
language server installation.

Julia created

59ec9e5 Avoid user NPM config/cache & put NodeRuntime installation behind a lock

Julia created

3419aaf Fix several shutdown related bugs

Mikayla created

37d0b84 Merge branch 'main' into element-types

Conrad Irwin created

5c8db99 Extend Label & Tooltip (#3322)

Click to expand commit body 
This PR extends the `Label` component with additional functionality,
partially for use in the `TextTooltip` component.

- [x] `Label` should take a `size` (`Default` & `Small` for now)
  - These should use `text_ui` and `text_ui_sm`
- [x] Fold `LabelColor` and `IconColor` into one enum
  - `TextColor`
- [x] `TextTooltip`'s keybinding field should take whatever we use for
keybindings instead of a string, and render the keybinding component
- [x] `TextTooltip` should use small `Label`s

Release Notes:

- N/A

Marshall Bowers created

76c1522 Combine `LabelColor` and `IconColor` into `TextColor`

Marshall Bowers created

5dda105 Merge branch 'main' into element-types

Conrad Irwin created

dc56a7b Add `LabelSize`

Marshall Bowers created

48b3a90 WIP

Antonio Scandurra created

6add446 WIP: Zed2: Add core mac app actions (#3316)

Click to expand commit body 
Add back cmd-q, cmd-n, etc.

TODO:
- [x] Fix quit checking workspace windows
- [ ] ~~See if GPUI2 has a DebugElements analog~~

Release Notes:

- N/A

Mikayla Maki created

9d31523 Rename `keybinding` method on `PaletteItem` to `key_binding`

Marshall Bowers created

90d7033 Pass `KeyBinding`s to `TextTooltip`s

Marshall Bowers created

2757452 Restore quit action

Mikayla created

b69b574 Fix panicking unwrap()

Conrad Irwin created

aa14719 Merge branch 'main' into extend-label-and-tooltip

Marshall Bowers created

caa0bae Merge branch 'main' into core-actions

Mikayla created

f4ccff7 TEMP

Conrad Irwin created

bb584cc WIP

Nathan Sobo created

251b464 Extend tooltip to take meta + kb

Nate Butler created