Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ZIm/crates
History
Ben Kunkle 3b9bb521f4
keymap_ui: Only show conflicts between user bindings (#34284) 
Closes #ISSUE

This makes it so conflicts are only shown between user bindings. User
bindings that override bindings in the Vim, Base, and Default keymaps
are not identified as conflicts

Release Notes:

- N/A *or* Added/Fixed/Improved ...

Co-authored-by: Anthony <anthony@zed.dev>
2025-07-11 13:51:21 +00:00
..
acp Update to acp 0.0.6 (#34159) 2025-07-09 19:14:29 -06:00
activity_indicator gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
agent agent: Disable thinking when using inline assistant/edit file tool (#34141) 2025-07-09 18:05:39 +00:00
agent_servers ACP (#34030) 2025-07-09 16:02:31 +00:00
agent_settings agent: Add setting to control terminal card expanded state (#34061) 2025-07-08 10:43:35 -03:00
agent_ui agent: Dismiss the agent panel notification if window is closed (#34230) 2025-07-10 16:45:17 -03:00
anthropic agent: Improve error handling and retry for zed-provided models (#33565) 2025-06-30 21:01:32 -06:00
askpass git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
assets Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
assistant_context agent: Disable thinking when using inline assistant/edit file tool (#34141) 2025-07-09 18:05:39 +00:00
assistant_slash_command Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
assistant_slash_commands chore: Bump Rust version to 1.88 (#33439) 2025-06-26 20:54:19 +02:00
assistant_tool tools: Send stale file notifications only once (#34026) 2025-07-07 22:30:01 +03:00
assistant_tools agent: Allow clicking on the read file tool header to jump to the exact file location (#33161) 2025-07-11 00:43:52 +00:00
audio agent: Add sound notification when done generating (#31472) 2025-05-26 21:20:41 -03:00
auto_update windows: Publish nightly (#24800) 2025-07-09 08:57:03 +08:00
auto_update_helper windows: Publish nightly (#24800) 2025-07-09 08:57:03 +08:00
auto_update_ui Fix documentation of view release notes actions (#33851) 2025-07-03 14:22:28 +00:00
aws_http_client Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
bedrock bedrock: Fix bedrock not streaming (#28281) 2025-07-01 12:51:09 +03:00
breadcrumbs breadcrumbs: Stylize filename in breadcrumbs when tab-bar is off and file is dirty (#30507) 2025-05-30 08:32:54 -07:00
buffer_diff chore: Bump Rust version to 1.88 (#33439) 2025-06-26 20:54:19 +02:00
call Fix screenshare sources error handling, is_sharing_screen() == false on error (#34250) 2025-07-10 23:35:21 +00:00
channel Fetch and wait for channels when opening channel notes via URL (#33291) 2025-06-24 05:14:15 +00:00
cli windows: Publish nightly (#24800) 2025-07-09 08:57:03 +08:00
client gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
clock Add the ability to follow the agent as it makes edits (#29839) 2025-05-04 08:28:39 +00:00
collab Add more admin to seed script (#34220) 2025-07-10 16:54:00 +00:00
collab_ui gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
collections Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
command_palette Sketch in a table for the keybindings UI (#32436) 2025-06-30 19:25:11 -04:00
command_palette_hooks Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
component gpui: Add shadow_xs, shadow_2xs and fix shadow values to match Tailwind CSS (#33361) 2025-07-03 09:50:26 -03:00
context_server agent: Use standardized MCP configuration format in settings (#33539) 2025-06-30 08:05:52 +00:00
copilot copilot: Indicate whether a request is initiated by an agent to Copilot API (#33895) 2025-07-07 10:24:17 +02:00
credentials_provider Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
dap debugger: Fix issues with restarting sessions (#33932) 2025-07-07 18:28:59 +00:00
dap_adapters debugger: Remove PHP debug adapter (#34020) 2025-07-08 01:36:32 +02:00
db Misc nitpicks, changes too small / unrelated to be in other PRs (#32768) 2025-06-15 19:51:04 +00:00
debug_adapter_extension Allow remote loading for DAP-only extensions (#33981) 2025-07-06 14:52:16 +02:00
debugger_tools gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
debugger_ui Add button to view dap logs (#34153) 2025-07-09 20:51:45 +00:00
deepseek language_models: Emit UsageUpdate events for token usage in DeepSeek and OpenAI (#33242) 2025-06-25 09:42:30 +02:00
diagnostics gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
docs_preprocessor gpui: Simplify Action macros + support doc comments in actions! (#33263) 2025-06-24 04:34:51 +00:00
editor Remove redundant autoscroll_horizontally during editor prepaint (#34218) 2025-07-10 11:03:34 -06:00
eval Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
explorer_command_injector Just Zed instead of Zed Editor (#34146) 2025-07-10 21:08:43 +02:00
extension Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
extension_api Move language-specific debugging docs to the page for each language (#33692) 2025-07-01 20:02:12 +00:00
extension_cli Touch up extension DAP schemas fix (#33548) 2025-06-27 15:34:21 -04:00
extension_host Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
extensions_ui Suggest powershell extension (#34211) 2025-07-10 14:34:59 +00:00
feature_flags ACP (#34030) 2025-07-09 16:02:31 +00:00
feedback gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
file_finder windows: Add support for SSH (#29145) 2025-07-08 14:34:57 +00:00
file_icons Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
fs git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
fsevent Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
fuzzy editor: Improve code completion filtering to provide fewer and more accurate suggestions (#32928) 2025-06-18 16:01:28 +05:30
git git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
git_hosting_providers Allow configuring custom git hosting providers in project settings (#31929) 2025-06-03 12:23:01 -04:00
git_ui git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
go_to_line Remove into SelectionEffects from .change_selections (#33554) 2025-06-27 14:31:31 -06:00
google_ai Update Gemini Models (#32902) 2025-06-17 20:26:27 +00:00
gpui linux: Use randr as fallback for scale factor in X11 (#34265) 2025-07-11 14:52:51 +05:30
gpui_macros gpui: Add shadow_xs, shadow_2xs and fix shadow values to match Tailwind CSS (#33361) 2025-07-03 09:50:26 -03: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 Add feature flag to use cloud.zed.dev instead of llm.zed.dev (#34076) 2025-07-08 18:44:51 +00:00
http_client_tls Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
icons agent: Fix edit bar's background color when zoomed in (#34163) 2025-07-09 23:25:56 +00:00
image_viewer Option to auto-close deleted files with no unsaved edits (#31920) 2025-06-03 13:18:29 +02:00
indexed_docs Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
inline_completion agent: Fix issues with usage display sometimes showing initially fetched usage (#33125) 2025-06-20 21:28:48 +00:00
inline_completion_button Another lsp tool UI migration (#34009) 2025-07-07 14:28:18 +00:00
inspector_ui Fix anchor biases for completion replacement ranges (esp slash commands) (#32262) 2025-06-06 20:54:00 +00:00
install_cli gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
jj Add a picker for jj bookmark list (#30883) 2025-05-17 16:42:45 +00:00
jj_ui editor: Improve code completion filtering to provide fewer and more accurate suggestions (#32928) 2025-06-18 16:01:28 +05:30
journal gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
language Default `#[schemars(deny_unknown_fields)] for json-language-server schemas (#33883) 2025-07-04 00:57:43 +00:00
language_extension Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
language_model agent: Disable thinking when using inline assistant/edit file tool (#34141) 2025-07-09 18:05:39 +00:00
language_models language_models: Refresh the list of models when the LLM token is refreshed (#34222) 2025-07-10 17:05:41 +00:00
language_selector gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
language_tools lsp tool: Make "Restart All Servers" always visible (#34255) 2025-07-10 22:00:01 -03:00
languages languages: Fix detents case line after typing : in Python (#34017) 2025-07-07 22:41:29 +05:30
livekit_api Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
livekit_client Windows screen sharing (#34223) 2025-07-10 14:02:00 -07:00
lmstudio Standardize on u64 for token counts (#32869) 2025-06-17 10:43:07 -04:00
lsp Migrate to schemars version 1.0 (#33635) 2025-06-30 21:07:28 +00:00
markdown gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
markdown_preview gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
media Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
menu gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
migrator editor: Change drag_and_drop_selection cursor on delay elapsed + Add drag_and_drop_selection delay setting (#33928) 2025-07-09 12:38:23 +05:30
mistral Standardize on u64 for token counts (#32869) 2025-06-17 10:43:07 -04:00
multi_buffer chore: Bump Rust version to 1.88 (#33439) 2025-06-26 20:54:19 +02:00
net windows: Add support for SSH (#29145) 2025-07-08 14:34:57 +00:00
node_runtime Replace async-watch with a custom watch (#32245) 2025-06-06 16:00:09 +00:00
notifications notification: Add built-in dismiss button in the Status Toast component (#33278) 2025-06-23 19:55:21 -03:00
ollama Standardize on u64 for token counts (#32869) 2025-06-17 10:43:07 -04:00
open_ai open_ai: Make OpenAI error message generic (#33383) 2025-06-28 14:38:27 +02:00
open_router language_models: Add thinking support to OpenRouter provider (#32541) 2025-06-21 08:03:50 +02:00
outline Remove into SelectionEffects from .change_selections (#33554) 2025-06-27 14:31:31 -06:00
outline_panel project panel: Add indent guides for sticky items (#34092) 2025-07-09 05:28:25 +05:30
panel git panel: Add some design refinements (#34064) 2025-07-08 11:23:36 -03:00
paths ACP (#34030) 2025-07-09 16:02:31 +00:00
picker gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
prettier Expand Prettier config list (#33744) 2025-07-02 08:44:14 +00:00
project git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
project_panel project panel: Add indent guides for sticky items (#34092) 2025-07-09 05:28:25 +05:30
project_symbols Remove into SelectionEffects from .change_selections (#33554) 2025-06-27 14:31:31 -06:00
prompt_store editor: Improve code completion filtering to provide fewer and more accurate suggestions (#32928) 2025-06-18 16:01:28 +05:30
proto git: Intercept signing prompt from GPG when committing (#34096) 2025-07-11 00:38:51 +00:00
recent_projects windows: Add support for SSH (#29145) 2025-07-08 14:34:57 +00:00
refineable Add a live Rust style editor to inspector to edit a sequence of no-argument style modifiers (#31443) 2025-05-26 17:43:57 +00:00
release_channel Use shortened SHA when displaying version to install (#31281) 2025-05-23 14:53:53 +00:00
remote windows: Don't show cmd window when remoting (#34187) 2025-07-10 09:19:12 +00:00
remote_server Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
repl Improve terminal rendering performance (#33345) 2025-07-08 09:05:01 -06:00
reqwest_client Respect NO_PROXY env var (#33742) 2025-07-02 10:05:34 -04:00
rich_text Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
rope chore: Fix warnings for Rust 1.89 (#32378) 2025-06-09 13:11:57 +02:00
rpc extensions: Add "Debug Adapters" category to the extension store (#32845) 2025-06-17 12:09:08 +02:00
rules_library agent: Disable thinking when using inline assistant/edit file tool (#34141) 2025-07-09 18:05:39 +00:00
schema_generator Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
search vim: Implement /n and /c in :s (#34102) 2025-07-09 06:14:04 +00:00
semantic_index agent: Disable thinking when using inline assistant/edit file tool (#34141) 2025-07-09 18:05:39 +00:00
semantic_version Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
session Avoid unnecessary DB writes (#29417) 2025-04-25 17:41:49 +03:00
settings keymap_ui: Add ability to delete user created bindings (#34248) 2025-07-10 23:23:26 +00:00
settings_ui keymap_ui: Only show conflicts between user bindings (#34284) 2025-07-11 13:51:21 +00:00
snippet Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
snippet_provider Default `#[schemars(deny_unknown_fields)] for json-language-server schemas (#33883) 2025-07-04 00:57:43 +00:00
snippets_ui gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
sqlez Use anyhow more idiomatically (#31052) 2025-05-20 23:06:07 +00:00
sqlez_macros Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
story gpui: Add a standard text example (#30747) 2025-05-16 17:35:44 +02:00
storybook project panel: Add indent guides for sticky items (#34092) 2025-07-09 05:28:25 +05:30
streaming_diff Introduce a new StreamingEditFileTool (#29733) 2025-05-01 17:37:43 +02:00
sum_tree chore: Fix warnings for Rust 1.89 (#32378) 2025-06-09 13:11:57 +02:00
supermaven gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
supermaven_api supermaven_api: Ensure downloaded Supermaven binary has executable permissions set (#32576) 2025-06-17 14:39:45 +00:00
svg_preview gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
tab_switcher gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
task Add support for Nushell in shell builder (#33806) 2025-07-08 14:57:37 +00:00
tasks_ui Remove into SelectionEffects from .change_selections (#33554) 2025-06-27 14:31:31 -06: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 Remove default shell breadcrumbs on windows (#34198) 2025-07-10 18:04:13 +02:00
terminal_view Don't apply contrast adjustment to decorative chars (#34238) 2025-07-11 02:48:49 +00:00
text chore: Fix warnings for Rust 1.89 (#32378) 2025-06-09 13:11:57 +02:00
theme Default `#[schemars(deny_unknown_fields)] for json-language-server schemas (#33883) 2025-07-04 00:57:43 +00:00
theme_extension Add workspace-hack (#27277) 2025-04-02 13:26:34 -07:00
theme_importer chore: Bump Rust version to 1.88 (#33439) 2025-06-26 20:54:19 +02:00
theme_selector gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
time_format agent: Add date separators to Thread History (#29961) 2025-05-06 10:18:48 +00:00
title_bar title_bar: Add setting to always show menu for Linux and Windows (#34139) 2025-07-09 09:44:11 -07:00
toolchain_selector gpui: Store action documentation (#33809) 2025-07-02 21:14:33 -04:00
ui Make inline and regular diagnostics more related (#34237) 2025-07-10 21:11:49 +00:00
ui_input Fix IndentGuides story (#32781) 2025-07-01 15:43:39 +00:00
ui_macros Update syn crate from 1.0.109 to 2.0.101 (#31301) 2025-05-23 19:31:25 +00:00
ui_prompt Add element_selection_background highlight to theme (#32388) 2025-06-27 15:46:04 +00:00
util windows: Add support for SSH (#29145) 2025-07-08 14:34:57 +00:00
util_macros Remove separator! macro and make path! handle relative paths (#32527) 2025-06-13 06:32:29 +00:00
vercel vercel: Use proper model identifiers and add image support (#33377) 2025-06-25 13:26:41 +00:00
vim vim: Fix panic when scrolling beyond last line (#34172) 2025-07-10 01:37:16 +00:00
vim_mode_setting vim: Fix escape key switching back to default mode instead of normal mode (#31843) 2025-06-18 21:26:12 +00:00
watch chore: Fix warnings for Rust 1.89 (#32378) 2025-06-09 13:11:57 +02:00
web_search agent: Expose web search tool to beta users (#29273) 2025-04-23 15:30:20 +00:00
web_search_providers Add feature flag to use cloud.zed.dev instead of llm.zed.dev (#34076) 2025-07-08 18:44:51 +00:00
welcome keymap_ui: Add auto-complete for context in keybind editor (#34031) 2025-07-07 21:54:51 +00:00
workspace Stop extensions' servers and message loops before removing their files (#34208) 2025-07-10 19:25:10 +00:00
worktree chore: Bump Rust version to 1.88 (#33439) 2025-06-26 20:54:19 +02:00
zed Fix icon size on Windows (#34277) 2025-07-11 15:09:10 +02:00
zed_actions ACP (#34030) 2025-07-09 16:02:31 +00:00
zeta Add feature flag to use cloud.zed.dev instead of llm.zed.dev (#34076) 2025-07-08 18:44:51 +00:00
zlog Initialize zlog default filters on init rather than waiting for settings load (#32209) 2025-06-06 00:49:30 -06:00
zlog_settings VSCode Settings import (#29018) 2025-04-23 20:54:09 +00:00