Commit log

d81fb36 Uncomment copilot2 tests

Piotr Osiewicz created

d788bf3 Fix retrieval of app version in auto_update2 (#3481)

Click to expand commit body
With this fix, auto-updates should work on nightly.

Max Brunsfeld created

c07455e Update path header style

Click to expand commit body
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>

Nate Butler and Marshall Bowers created

d85db44 Fix retrieval of app version in auto_update2

Max Brunsfeld created

89aa6a3 Re-add diagnostic headers

Nate Butler created

f5679f9 Update diagnostics style

Nate Butler created

be509a5 test_clipboard

Piotr Osiewicz created

5dd9db3 collab 0.29.1

Max Brunsfeld created

aace0d8 Prevent moving a channel into its descendant (#3480)

Click to expand commit body
This fixes a bug where it was possible to put the channel tree into a
bad state by accidentally dragging a channel into itself or one of its
descendants.

Max Brunsfeld created

4479628 Prevent moving a channel into its descendant

Max Brunsfeld created

0a1765b test_following_with_multiple_excerpts (passes)

Piotr Osiewicz created

c3e7732 Add support for optional icon to `Button` (#3479)

Click to expand commit body
This PR extends `Button` with support for an optional icon to be
displayed next to the label.

As part of this, the functionality for displaying an icon within a
button has been factored out into an internal `ButtonIcon` component.
`ButtonIcon` is now used by both `IconButton` and `Button` to
encapsulate the concerns of an icon that is rendered within a button.

Release Notes:

- N/A

Marshall Bowers created

a985b7a test_following (passes :))

Piotr Osiewicz created

20ae58e Bunch of new tests

Piotr Osiewicz created

9408eec test_navigation_history (pass)

Piotr Osiewicz created

2ab84b8 test_edit_events

Piotr Osiewicz created

e821e1f Display map tests (3 flaky tests for chunks)

Piotr Osiewicz created

237efc8 Another batch of tests

Piotr Osiewicz created

4b23c5c Add `selected_label` to `Button` (#3478)

Click to expand commit body
This PR adds a new `selected_label` method to `Button`.

This can be used to set a different label that should be rendered when
the `Button` is selected.

Release Notes:

- N/A

Marshall Bowers created

1c52b93 Uncomment flaky tests

Piotr Osiewicz created

4f50775 Add `selected_icon` to `IconButton` (#3477)

Click to expand commit body
This PR adds a new `selected_icon` method to `IconButton`.

This can be used to set a different icon that should be rendered when
the `IconButton` is selected.

Release Notes:

- N/A

Marshall Bowers created

12b58f5 Add `selected_icon` to `IconButton`

Marshall Bowers created

f09d9ef Clean up some `ButtonLike` doc comments

Marshall Bowers created

be5eb3e Zed2 breadcrumbs & tab bar context menus & pane focus events (#3475)

Click to expand commit body
See title

Release Notes:

- N/A

Julia created

53f3f96 Another batch of tests

Piotr Osiewicz created

6f9e08c Merge branch 'main' into zed2-breadcrumbs

Julia created

85d72f6 Add Tinted button style placeholder and document ButtonLike (#3476)

Click to expand commit body
- Adds a placeholder `ButtonStyle::Tinted`.
  - Note: Using this now will just give you a block of `gpui::red()`
- Documents ButtonLike and ButtonStyle to hopefully help make choosing a
button style easier.

Release Notes:

- N/A

Nate Butler created

4c4ec22 Uncomment a bunch of tests in the editor

Piotr Osiewicz created

910aeb4 I'm a dunce

Julia created

0d33f01 Collab UI Refinement - Part 1 (#3460)

Click to expand commit body
[[PR Description]]

Still WIP, merging this to get menu changes in.

Release Notes:

- N/A

Nate Butler created

e0ccaa6 editor tests: Reintroduce block_on_ticks.

Click to expand commit body
Co-authored-by: Antonio <antonio@zed.dev>

Piotr Osiewicz and Antonio created

a40a5fb Revert "editor tests: Reintroduce block_on_ticks."

Click to expand commit body
This reverts commit aed11ee8cbeb25fca0a089b3d1b921c41a60d3e2.

Piotr Osiewicz created

aed11ee editor tests: Reintroduce block_on_ticks.

Click to expand commit body
Co-authored-by: Antonio <antonio@zed.dev>

Piotr Osiewicz and Antonio created

13f4cc5 Merge branch 'main' into zed2-breadcrumbs

Julia created

ab75dbe Update collab_titlebar_item.rs

Nate Butler created

88188b0 Merge branch 'main' into collab-ui-refinement

Nate Butler created

ce16e5b Unbreak toolbar layout & improve disabling ButtonLike

Julia created

134f3eb Add mouse context menu to `editor2` (#3473)

Click to expand commit body
We observed some weird behavior in `ContextMenu`, specifically:

- It seems like we don't intercept actions that have been dispatched,
which causes the context menu to stay open.
- The key bindings for editor actions in the context menu seem to come
from Vim

Release Notes:

- N/A

Antonio Scandurra created

5fefc12 Add mouse context menu to `editor2`

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

Antonio Scandurra and Piotr created

9fedb4c Get `editor2` mostly to feature-parity with `editor` (#3472)

Click to expand commit body
The only missing piece is the context menu, which I'll work on next.

Release Notes:

- N/A

Antonio Scandurra created

f0c205b Respond to modifiers changed event in editor2 and set cursor

Antonio Scandurra created

f0bc4a0 Uncomment git gutter painting

Antonio Scandurra created

1abc876 Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor

Click to expand commit body
# Conflicts:
#	crates/editor2/src/items.rs

Antonio Scandurra created

8e4f2fb Remove all todos in Editor's Item implementation

Antonio Scandurra created

faa8963 Register NewFile and NewFileInDirection from Editor

Antonio Scandurra created

a8a5785 Re-enable opening excerpts in Editor

Antonio Scandurra created

c9be637 Re-introduce auto-height in `editor2` (#3471)

Click to expand commit body
Release Notes:

- N/A

Antonio Scandurra created

0b7e324 :fire:

Antonio Scandurra created

8c59a2d Delete commented out code for editor element

Antonio Scandurra created

21d3ae6 Remove stray dbg statements

Antonio Scandurra created