Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ZIm/crates
History
Finn Evers 1ecd00a113
editor: Ensure minimap is shown when show_minimap is toggled to true (#30326) 
Follow-up of #30285

This PR ensures the action added in the linked PR also works when the
user does not have the minimap enabled via settings. Currently, the
toggle only works when the user has already enabled the minimap in their
settings.

This happens because in


b4fbb9bc08/crates/editor/src/element.rs (L7160-L7164)

as well as


b4fbb9bc08/crates/editor/src/element.rs (L1542)

we check for the user configuration before reserving space for the
minimap as well as layouting it and because in

b4fbb9bc08/crates/editor/src/editor.rs (L16404)

with


b4fbb9bc08/crates/editor/src/editor_settings.rs (L132-L134)

we would not even create a minimap when the user disabled it via their
settings.

---

This PR fixes this by ensuring a minimap is created on the toggle issue
as well as lifting some of the restrictions. Since we are always only
returning a minimap in


b4fbb9bc08/crates/editor/src/editor.rs (L16443-L16445)

when `show_minimap` is set to `true`, we can assume in the rendering
code that if a minimap is present, it should be layouted and rendered no
matter if `ShowMinimap` is currently set to `Never`. We can do this
since `show_minimap` always reflects the current user configuration, see


b4fbb9bc08/crates/editor/src/editor.rs (L18163-L18164)

I also removed the minimap deletion/recreation on the toggling of
`show_minimap`, since this is not really needed - once we have stored a
minimap editor within the editor, `show_minimap` is sufficient to ensure
that it is only shown when the user requests it. Notice that we still
will never create a minimap unless neccesary.

Lastly, I updated the `supports_minimap` check to account for the fact
that the minimap is currently disabled entirely for multibuffers.

--- 

One thing I ~~did not tackle here~~ tackled in the second commit is that
due to `show_minimap` now being exposed to the user, it is possible to
enable the minimap for all full mode editors, e.g. the agent text thread
editor

<img width="592" alt="grafik"
src="https://github.com/user-attachments/assets/5f6c0e8b-45f9-44e8-9625-9d51c1480f98"
/>

which should most likely not be possible when the minimap is
programmatically disabled.

Release Notes:

- N/A
2025-05-09 08:32:31 +03:00
..
activity_indicator Add a way to clear activity indicator (#30156) 2025-05-07 17:50:52 +00:00
agent Implement rendering of images with data urls in markdown (#30322) 2025-05-08 18:26:24 -07:00
anthropic Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
askpass Fix license symlinks (#29758) 2025-05-01 19:24:14 +00:00
assets Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
assistant_context_editor Add minimap into the editor controls (#30285) 2025-05-08 17:58:24 +00:00
assistant_settings assistant_context_editor: Remove suggest edits (#30286) 2025-05-08 17:27:49 +00:00
assistant_slash_command Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
assistant_slash_commands assistant_slash_commands: Be more precise in content type matching (#29124) 2025-05-06 04:38:03 +00:00
assistant_tool Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
assistant_tools agent: Render edit tool error as markdown (#30325) 2025-05-09 01:18:52 +00:00
audio Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
auto_update Add a way to clear activity indicator (#30156) 2025-05-07 17:50:52 +00:00
auto_update_helper Update block diagnostics (#28006) 2025-04-15 09:35:13 -06:00
auto_update_ui Restyle notification close control (#30262) 2025-05-08 14:10:30 +00:00
aws_http_client Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
bedrock Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
breadcrumbs breadcrumbs: Update multibuffer to match singleton (#28267) 2025-04-07 20:26:55 +00:00
buffer_diff Fix diff recalculation hang (#28377) 2025-04-10 22:58:41 +00:00
call VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00
channel Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
cli Try to weak-link ScreenCaptureKit always (#28585) 2025-04-11 17:38:14 +00:00
client language_models: Improve subscription states in the Agent configuration view (#30252) 2025-05-08 09:10:50 -04:00
clock Add the ability to follow the agent as it makes edits (#29839) 2025-05-04 08:28:39 +00:00
collab collab: Check if the user has a payment method before upgrading to Zed Pro (#30310) 2025-05-08 20:58:36 +00:00
collab_ui Use ESC to cancel dragging in Zed (#30318) 2025-05-08 22:58:38 +00:00
collections Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
command_palette Simplify the SerializableItem::cleanup implementation (#29567) 2025-04-28 22:15:24 +00:00
command_palette_hooks Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
component component: Component crate cleanup (#29967) 2025-05-06 03:41:52 +00:00
component_preview component: Component crate cleanup (#29967) 2025-05-06 03:41:52 +00:00
context_server context_store: Refactor state management (#29910) 2025-05-05 21:36:12 +02:00
copilot Make copilot::SignIn open sign-in modal when needed (#30239) 2025-05-08 14:52:07 +00:00
credentials_provider Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
dap debugger: Fix up Rust test tasks definitions (#30232) 2025-05-08 14:39:56 +02:00
dap_adapters Add rdbg for Ruby (#30126) 2025-05-08 09:37:20 +01:00
db Simplify the SerializableItem::cleanup implementation (#29567) 2025-04-28 22:15:24 +00:00
debugger_tools debugger: Run build in terminal (#29645) 2025-05-05 20:08:14 +00:00
debugger_ui Use ESC to cancel dragging in Zed (#30318) 2025-05-08 22:58:38 +00:00
deepseek Default to fast model for thread summaries and titles + don't include system prompt / context / thinking segments (#29102) 2025-04-19 23:26:29 +00:00
diagnostics Allow to temporarily toggle diagnostics in the editor (#30316) 2025-05-08 21:47:32 +00:00
docs_preprocessor Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
editor editor: Ensure minimap is shown when show_minimap is toggled to true (#30326) 2025-05-09 08:32:31 +03:00
eval Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
extension debugger/extensions: Revert changes to extension store related to language config (#30225) 2025-05-08 14:01:39 +02:00
extension_api zed_extension_api: Release v0.5.0 (#29802) 2025-05-02 15:58:54 +00:00
extension_cli Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
extension_host debugger/extensions: Revert changes to extension store related to language config (#30225) 2025-05-08 14:01:39 +02:00
extensions_ui Suggest nim extension for *.nim files (#29912) 2025-05-05 11:46:42 +00:00
feature_flags agent: Remove feature flag checks (#30055) 2025-05-06 21:38:05 -04:00
feedback feedback: Update issue template URL (#28790) 2025-04-15 21:36:30 -04:00
file_finder Allow opening the FS root dir as a remote project (#30190) 2025-05-07 16:50:57 -07:00
file_icons Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
fs windows: Fix atomic write (#30234) 2025-05-08 19:57:16 +08:00
fsevent Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
fuzzy Properly score fuzzy match queries with multiple chars in lower case (#29794) 2025-05-02 15:02:53 +00:00
git Improve handling of remote-tracking branches in the picker (#29744) 2025-05-01 21:24:26 -04:00
git_hosting_providers VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00
git_ui Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
go_to_line editor: Add minimap (#26893) 2025-05-07 23:11:09 +03:00
google_ai Add support for getting the token count for all parts of Gemini generation requests (#29630) 2025-05-04 21:32:45 +00:00
gpui Implement rendering of images with data urls in markdown (#30322) 2025-05-08 18:26:24 -07:00
gpui_macros Rename regex search tool to grep and accept an include glob pattern (#29100) 2025-04-20 00:53:30 +00:00
gpui_tokio Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
html_to_markdown Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
http_client Remove individual URL overrides for LLM service (#30290) 2025-05-08 17:54:46 +00:00
http_client_tls Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
icons agent: Make feedback buttons more minimal (#30133) 2025-05-07 12:43:46 -03:00
image_viewer Add the ability to follow the agent as it makes edits (#29839) 2025-05-04 08:28:39 +00:00
indexed_docs indexed_docs: Remove some unnecessary cloning (#30236) 2025-05-08 10:59:56 +00:00
inline_completion Show edit predictions usage in status bar menu (#29046) 2025-04-18 14:15:19 +00:00
inline_completion_button Add a divider below "Usage" in the Edit Prediction menu (#30284) 2025-05-08 14:19:51 -03:00
install_cli install_cli: Show feedback when installing CLI from welcome screen (#28532) 2025-04-11 01:47:40 +05:30
journal VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00
language debugger/extensions: Revert changes to extension store related to language config (#30225) 2025-05-08 14:01:39 +02:00
language_extension debugger/extensions: Revert changes to extension store related to language config (#30225) 2025-05-08 14:01:39 +02:00
language_model Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
language_model_selector agent: Remove feature flag checks (#30055) 2025-05-06 21:38:05 -04:00
language_models bedrock: Fix UX bug (#28350) 2025-05-08 22:09:18 +00:00
language_selector Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
language_tools Add searchable global tab switcher (#28047) 2025-04-28 09:21:27 +00:00
languages languages: Fix python indent block for more keywords (#30323) 2025-05-09 05:51:33 +05:30
livekit_api Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
livekit_client Fix deafening new participants (#28330) 2025-04-08 16:01:27 +00:00
lmstudio lmstudio: Fix streaming not working in v0.3.15 (#30013) 2025-05-06 12:59:36 -04:00
lsp lsp: Don't log oneshot channel errors from notify (#29857) 2025-05-05 08:21:45 -04:00
markdown Implement rendering of images with data urls in markdown (#30322) 2025-05-08 18:26:24 -07:00
markdown_preview Use image cache to stop leaking images (#29452) 2025-04-29 19:30:16 +00:00
media chore: Make objc a workspace level crate (#28258) 2025-04-07 18:46:09 +00:00
menu agent: Add new panel navigation dropdown (#29539) 2025-04-29 21:58:45 -03:00
migrator settings: Migration for fixing duplicated agent keys (#30237) 2025-05-08 12:38:19 +00:00
mistral mistral: Add new Mistral medium model (#30171) 2025-05-07 21:57:15 -04:00
multi_buffer agent: Review edits in single-file editors (#29820) 2025-05-02 17:57:16 -03:00
node_runtime reqwest_client: Only register proxies with valid proxy URIs (#27773) 2025-04-28 11:12:16 -04:00
notifications Merge Component and ComponentPreview trait (#28365) 2025-04-08 16:09:06 -06:00
ollama Improve Ollama tool use (#30120) 2025-05-07 15:37:06 +00:00
open_ai open_ai: Remove list of supported countries (#29347) 2025-04-24 14:55:37 +00:00
outline Highlight merge conflicts and provide for resolving them (#28065) 2025-04-23 12:38:46 -04:00
outline_panel editor: Remove extra quotes from outline search term (#29829) 2025-05-06 10:50:33 +03:00
panel Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
paths debugger: Update New Session Modal (#30018) 2025-05-08 16:19:14 +00:00
picker debugger: Add debug task picker to new session modal (#29702) 2025-05-02 08:38:29 +00:00
prettier Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
project Implement rendering of images with data urls in markdown (#30322) 2025-05-08 18:26:24 -07:00
project_panel Use ESC to cancel dragging in Zed (#30318) 2025-05-08 22:58:38 +00:00
project_symbols Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
prompt_store assistant_context_editor: Remove suggest edits (#30286) 2025-05-08 17:27:49 +00:00
proto language_models: Improve subscription states in the Agent configuration view (#30252) 2025-05-08 09:10:50 -04:00
recent_projects Allow opening the FS root dir as a remote project (#30190) 2025-05-07 16:50:57 -07:00
refineable Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
release_channel Fix handling of --system-specs argument so it happens before Application::new (#29240) 2025-04-22 21:32:32 +00:00
remote Add a test for remote tool use by the agent (#30289) 2025-05-08 16:53:04 -04:00
remote_server Add a test for remote tool use by the agent (#30289) 2025-05-08 16:53:04 -04:00
repl Implement rendering of images with data urls in markdown (#30322) 2025-05-08 18:26:24 -07:00
reqwest_client Fix license symlinks (#29758) 2025-05-01 19:24:14 +00:00
rich_text Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
rope chore: Bump Rust version to 1.86 (#28021) 2025-04-03 23:32:50 +02:00
rpc rpc: Remove llm module in favor of zed_llm_client (#28900) 2025-04-16 20:22:44 +00:00
rules_library Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
schema_generator Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
search search: Do not consider filters if they are toggled off (#30162) 2025-05-08 09:42:40 +03:00
semantic_index Reuse conversation cache when streaming edits (#30245) 2025-05-08 14:36:34 +02:00
semantic_version Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
session Avoid unnecessary DB writes (#29417) 2025-04-25 17:41:49 +03:00
settings Fall back to old key when loading agent settings (#30001) 2025-05-06 14:31:38 +00:00
settings_ui Add searchable global tab switcher (#28047) 2025-04-28 09:21:27 +00:00
snippet Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
snippet_provider snippet_provider: Use proper casing of VsCode in identifiers (#29038) 2025-04-18 12:11:54 +00:00
snippets_ui Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
sqlez Simplify the SerializableItem::cleanup implementation (#29567) 2025-04-28 22:15:24 +00:00
sqlez_macros Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
story Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
storybook Merge Component and ComponentPreview trait (#28365) 2025-04-08 16:09:06 -06:00
streaming_diff Introduce a new StreamingEditFileTool (#29733) 2025-05-01 17:37:43 +02:00
sum_tree Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
supermaven Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
supermaven_api Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
tab_switcher Add searchable global tab switcher (#28047) 2025-04-28 09:21:27 +00:00
task debugger: Update New Session Modal (#30018) 2025-05-08 16:19:14 +00:00
tasks_ui debugger: Add debug task picker to new session modal (#29702) 2025-05-02 08:38:29 +00:00
telemetry Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
telemetry_events Add new action to run agent eval (#29158) 2025-04-21 21:30:21 -07:00
terminal Do not flicker when switching cmd-hovered words in terminal (#30098) 2025-05-07 11:04:11 +00:00
terminal_view Add a terminal::RerunTask action (#30288) 2025-05-08 17:39:52 +00:00
text format: Re-implement support for formatting with code actions that contain commands (#28392) 2025-04-09 01:53:54 +00:00
theme theme: Add scrollbar_thumb_active_background color (#30177) 2025-05-07 23:15:32 +03:00
theme_extension Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
theme_importer theme: Add scrollbar_thumb_active_background color (#30177) 2025-05-07 23:15:32 +03:00
theme_selector theme_selector: Don't select last theme when fuzzy searching (#28278) 2025-04-28 14:29:17 +00:00
time_format agent: Add date separators to Thread History (#29961) 2025-05-06 10:18:48 +00:00
title_bar title_bar: Add link indicator to current plan entry in user menu (#30153) 2025-05-07 14:25:38 -04:00
toolchain_selector toolchain: Respect currently focused file when querying toolchains (#28875) 2025-04-16 19:05:57 +02:00
ui Fix panel button context menu overlap with tooltip hint (#30108) 2025-05-07 12:33:13 +00:00
ui_input Merge Component and ComponentPreview trait (#28365) 2025-04-08 16:09:06 -06:00
ui_macros Merge Component and ComponentPreview trait (#28365) 2025-04-08 16:09:06 -06:00
ui_prompt markdown: Don't retain MarkdownStyle in favor of using MarkdownElement directly (#28255) 2025-04-07 19:03:24 +00:00
util Better match path-like strings in terminal (#30087) 2025-05-07 14:47:23 +00:00
util_macros Fix license symlinks (#29758) 2025-05-01 19:24:14 +00:00
vim Add :h[elp] vim command (#30179) 2025-05-07 17:26:42 -07:00
vim_mode_setting VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00
web_search agent: Expose web search tool to beta users (#29273) 2025-04-23 15:30:20 +00:00
web_search_providers Remove individual URL overrides for LLM service (#30290) 2025-05-08 17:54:46 +00:00
welcome welcome: Theme preview tile (#29689) 2025-04-30 17:46:11 +00:00
workspace Use ESC to cancel dragging in Zed (#30318) 2025-05-08 22:58:38 +00:00
worktree Allow opening the FS root dir as a remote project (#30190) 2025-05-07 16:50:57 -07:00
zed editor: Ensure minimap is shown when show_minimap is toggled to true (#30326) 2025-05-09 08:32:31 +03:00
zed_actions Add :h[elp] vim command (#30179) 2025-05-07 17:26:42 -07:00
zeta Add minimap into the editor controls (#30285) 2025-05-08 17:58:24 +00:00
zlog zlog: Fall back to printing module path instead of *unknown* or just crate name (#29691) 2025-05-01 10:59:51 -04:00
zlog_settings VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00