3 people 0b7583bae5 Refine styling of merge conflicts (#31012) ...

- Improved colors
- Blank out diff hunk gutter highlights in conflict regions
- Paint conflict marker highlights all the way to the gutter

Release Notes:

- Improved the highlighting of merge conflict markers in editors.

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Cole Miller <cole@zed.dev>

2025-06-09 19:03:19 +00:00

..

agent_configuration

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

context_picker

No longer instantiate recently opened agent threads on startup (#32285)

2025-06-07 14:53:36 -06:00

prompts

danger: Check for changes in prompt files (#31744)

2025-05-30 13:46:41 +00:00

ui

agent: Show warning for image context pill if model doesn't support images (#31848)

2025-06-04 16:20:56 +00:00

active_thread.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

agent_configuration.rs

Revert "agent: Namespace MCP server tools" (#31588)

2025-05-28 13:25:53 +00:00

agent_diff.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

agent_model_selector.rs

agent: Introduce ModelUsageContext (#32076)

2025-06-04 15:35:50 +00:00

agent_panel.rs

No longer instantiate recently opened agent threads on startup (#32285)

2025-06-07 14:53:36 -06:00

agent_profile.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

agent.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

buffer_codegen.rs

More resilient eval (#32257)

2025-06-09 18:07:22 +00:00

context_picker.rs

agent: Add a whitespace after inserting @-mention to allow for continuous typing (#30381)

2025-05-26 09:55:19 -03:00

context_server_configuration.rs

agent: Rename a number of constructs from Assistant to Agent (#30196)

2025-05-08 01:18:51 +00:00

context_server_tool.rs

context_server: Make notifications type safe (#32396)

2025-06-09 15:11:01 +00:00

context_store.rs

agent: Show actual file name and icon in context pill (#31813)

2025-06-02 10:35:22 +00:00

context_strip.rs

agent: Show warning for image context pill if model doesn't support images (#31848)

2025-06-04 16:20:56 +00:00

context.rs

agent: Show warning for image context pill if model doesn't support images (#31848)

2025-06-04 16:20:56 +00:00

debug.rs

Update zed_llm_client to v0.8.1 (#30433)

2025-05-09 21:08:03 +00:00

history_store.rs

No longer instantiate recently opened agent threads on startup (#32285)

2025-06-07 14:53:36 -06:00

inline_assistant.rs

Refine styling of merge conflicts (#31012)

2025-06-09 19:03:19 +00:00

inline_prompt_editor.rs

inline assistant: Allow to attach images from clipboard (#32087)

2025-06-04 16:43:52 +00:00

message_editor.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

profile_selector.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

slash_command_settings.rs

Remove assistant crate (#30168)

2025-05-07 23:05:38 +00:00

terminal_codegen.rs

terminal: Match trait bounds with terminal input (#31441)

2025-06-02 21:12:28 -06:00

terminal_inline_assistant.rs

terminal: Match trait bounds with terminal input (#31441)

2025-06-02 21:12:28 -06:00

thread_history.rs

No longer instantiate recently opened agent threads on startup (#32285)

2025-06-07 14:53:36 -06:00

thread_store.rs

context_server: Make notifications type safe (#32396)

2025-06-09 15:11:01 +00:00

thread.rs

More resilient eval (#32257)

2025-06-09 18:07:22 +00:00

tool_compatibility.rs

Store profile per thread (#31907)

2025-06-06 12:05:27 +00:00

tool_use.rs

agent: Allow to accept and reject all via the panel (#31971)

2025-06-03 15:20:25 -03:00

ui.rs

Add an onboarding banner for the Agent panel (#30050)

2025-05-06 23:41:04 +00:00