Commit log

2c3c238 Fix warnings

Max Brunsfeld created

b893ac2 Merge branch 'main' into project-panel2

Max Brunsfeld created

c14efb7 Finish up touchups for search UI.

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

Piotr Osiewicz and Nate created

08dde94 WIP styling

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

Piotr Osiewicz and Nate created

e08f169 Remove commented field

Nathan Sobo created

5ae96e4 Render blocks in `editor2` (#3320)

Click to expand commit body
Release Notes:

- N/A

Antonio Scandurra created

7d94d89 Not working yet file-finder2

Conrad Irwin created

40c634e Merge remote-tracking branch 'origin/main' into editor2-blocks

Antonio Scandurra created

7f5014b Add red background to blocks that need styling

Antonio Scandurra created

0b8ec53 Return the line length when `x` is past the last glyph

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

Antonio Scandurra and Julia created

6c69e40 WIP

Piotr Osiewicz created

d855e91 Honor `cmd-w` to close active item

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

Antonio Scandurra and Julia created

6b366c1 Allow a button to take a color (#3315)

Click to expand commit body
[[PR Description]]
- Allows a button to take a color and resolve it into `IconColor` and
`LabelColor`
- Extend `IconColor` and `LabelColor` to allow them to take a
`Player(i)`
- `impl From<LabelColor> for IconColor`

Release Notes:

- N/A

Nate Butler created

ac6babd Add gpt-4-1106-preview model (#3319)

Click to expand commit body
This PR adds the `gpt-4-1106-preview` model. It required forking two
repos from different organizations, as one is a submodule of another.

Update 1:

~Currently, I'm just temporarily pointing towards a personal fork of the
repo, but once [this
PR](https://github.com/zurawiki/tiktoken-rs/pull/49) lands, we can
switch back to using the official crate.~

Update 2:

~PR was merged, we are now pointing to a specific commit on the original
official repo - may want to bump it to an official version once a new
one has been released.~

Update 3:

Author published a [new
version](https://crates.io/crates/tiktoken-rs/0.5.7). Now, we are back
to relying on the official crate.

<img width="1118" alt="SCR-20231114-ibgs"
src="https://github.com/zed-industries/zed/assets/19867440/cc2657b6-98f9-413f-9a0c-f337636f367c">

Release Notes:

- Added support for the
[`gpt-4-1106-preview`](https://openai.com/blog/new-models-and-developer-products-announced-at-devday)
model in the assistant panel.
- Updated the `assistant.default_open_ai_model` setting to default to
`gpt-4-1106-preview`. To override the default, use the following snippet
to your `settings.json` file:

```rs
"assistant": {
    // 1. "gpt-3.5-turbo-0613""
    // 2. "gpt-4-0613""
    // 3. "gpt-4-1106-preview"
    "default_open_ai_model": "<Your choice of model here>"
  },
```

Joseph T. Lyons created

b6914bf Re-enable find all references

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

Antonio Scandurra and Julia created

f9b9b75 Render block elements

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

Antonio Scandurra and Julia created

a5fc581 Bump `tiktoken-rs` to official release

Joseph T. Lyons created

946a696 Update `tiktoken-rs` dependency

Click to expand commit body
The PR to add the `gpt-4-1106-preview` model was merged:

https://github.com/zurawiki/tiktoken-rs/pull/49

Joseph T. Lyons created

fc5ec47 WIP

Antonio Scandurra created

516a879 Add gpt-4-1106-preview model

Joseph T. Lyons created

6abaacc Fix formatting

Nathan Sobo created

364e3e7 Merge remote-tracking branch 'origin/main' into element-types

Nathan Sobo created

c6e8a09 Rename back to div

Nathan Sobo created

be18c47 Remove unnecessary with_element_id calls

Nathan Sobo created

a5306c2 Remove div module

Nathan Sobo created

80014a2 No compile errors or warnings

Nathan Sobo created

27fb381 Checkpoint

Nathan Sobo created

8aa0766 Add missing global

Mikayla created

ee4957d Implement most core actions

Mikayla created

ce30a68 Checkpoint

Nathan Sobo created

ec16e70 Sketch in core zed actions code

Mikayla created

58f9ef9 command 2 2 (#3317)

Click to expand commit body
- Update command matches faster
- Fix action dispatching...
- Add Text::styled() and use it in command palette
- Fix SingleLine editor font size
- Fix elevation on go_to_line2
- Allow clicking on commands in the command palette

Release Notes:

- N/A

Conrad Irwin created

9382a30 Checkpoint

Nathan Sobo created

1668330 Checkpoint

Nathan Sobo created

4a3a1ad Checkpoint

Nathan Sobo created

54a817a Checkpoint

Nathan Sobo created

f71afdb Checkpoint

Nathan Sobo created

83a5f74 Checkpoint

Nathan Sobo created

ad017a5 Allow clicking on commands in the command palette

Conrad Irwin created

4ef95f0 Fix elevation on go_to_line2

Conrad Irwin created

e0416e9 Fix SingleLine editor font size

Conrad Irwin created

044d967 Checkpoint

Nathan Sobo created

c5878cb Add Text::styled() and use it in command palette

Click to expand commit body
Prevents jumping while typing

Conrad Irwin created

872b518 Checkpoint

Nathan Sobo created

922bb31 WIP

Nathan Sobo created

06f3c60 Fix action dispatching...

Conrad Irwin created

abdaa31 Update command matches faster

Conrad Irwin created

76754c5 WIP

Nathan Sobo created

ca3341f Improve actions macros (#3292)

Click to expand commit body
- `actions!` now uses `#[action]` on each struct to reduce duplication.
- The `#[action]` macro now works on unit structs.
- Renamed `menu::unused` to `menu::init` and added more explanation in
comments.

Release Notes:

- N/A

Mikayla Maki created

f25c794 WIP: Add some editor tests (#3285)

Click to expand commit body
This is a continuation of
https://github.com/zed-industries/zed/pull/3232, however as I started
working on this it seemed a bit premature.

There are a few GPUI changes to finish getting the editor green (mainly
clipboard and simulate_resize), as well as several editor methods to
port (several around changing selections), as well as several editor
methods that are now fully broken (tagged with 'todo(finish editor
tests)').

I am also comitting the partially ported integration tests, which where
close to compiling.

Release Notes:

- N/A

Mikayla Maki created