yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	Cargo.lock
#	crates/settings_content/src/settings_content.rs
#	crates/zed/Cargo.toml
#	script/bundle-linux
This commit is contained in:
yenru0 committed 2026-09-22 13:17:50 +09:00
2 parents 06b53ae438 8e29ede557
commit f1ba3ea49f
775 files changed
+86177 -17521
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

assets/keymaps/default-linux.json
+51 -16
View File
@@ -226,14 +226,6 @@
"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],
},
},
{
"context": "AgentPanel > Markdown",
"bindings": {
"copy": "markdown::CopyAsMarkdown",
"ctrl-insert": "markdown::CopyAsMarkdown",
"ctrl-c": "markdown::CopyAsMarkdown",
},
},
{
"context": "AgentFeedbackMessageEditor > Editor",
"bindings": {
@@ -387,6 +379,15 @@
"enter": "editor::Newline",
},
},
{
"context": "Elicitation || (Elicitation > Editor)",
"use_key_equivalents": true,
"bindings": {
"enter": "menu::Confirm",
"tab": "menu::SelectNext",
"shift-tab": "menu::SelectPrevious",
},
},
{
"context": "ThreadHistory",
"bindings": {
@@ -555,8 +556,8 @@
"ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
"ctrl-k ctrl-i": "editor::Hover",
"ctrl-k ctrl-b": "editor::BlameHover",
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-k ctrl-c": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": true }],
"ctrl-k ctrl-c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": true }],
"ctrl-k ctrl-/": "editor::ToggleBlockComments",
"shift-alt-a": "editor::ToggleBlockComments",
"f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
@@ -736,8 +737,9 @@
// or by tag:
// "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
"f5": "debugger::Rerun",
"ctrl-f4": "workspace::CloseActiveDock",
"ctrl-w": "workspace::CloseActiveDock",
"ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
"ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
"ctrl-alt-w": "workspace::CloseActiveDock",
},
},
{
@@ -834,6 +836,12 @@
"enter": "editor::ConfirmRename",
},
},
{
"context": "Editor && inline_input",
"bindings": {
"enter": "menu::Confirm",
},
},
{
"context": "Editor && showing_completions",
"bindings": {
@@ -1011,6 +1019,8 @@
"alt-d": "project_panel::CompareMarkedFiles",
"shift-find": "project_panel::NewSearchInDirectory",
"ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
"menu": "project_panel::OpenContextMenu",
"shift-f10": "project_panel::OpenContextMenu",
"shift-down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"escape": "menu::Cancel",
@@ -1029,6 +1039,17 @@
"ctrl-2": "git_panel::ActivateHistoryTab",
},
},
{
"context": "GitPanel && (ChangesList || HistoryList) && !GitBranchSelector && !GitRepositorySelector",
"bindings": {
"up": "menu::SelectPrevious",
"down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"enter": "menu::Confirm",
"escape": "menu::Cancel",
},
},
{
"context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"bindings": {
@@ -1036,9 +1057,6 @@
"right": "git_panel::ExpandSelectedEntry",
"up": "git_panel::PreviousEntry",
"down": "git_panel::NextEntry",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"enter": "menu::Confirm",
"alt-y": "git::StageFile",
"alt-shift-y": "git::UnstageFile",
"ctrl-alt-y": "git::ToggleStaged",
@@ -1050,7 +1068,6 @@
"alt-ctrl-shift-c": "workspace::CopyRelativePath",
"tab": "git_panel::FocusEditor",
"shift-tab": "git_panel::FocusEditor",
"escape": "menu::Cancel",
"alt-enter": "menu::SecondaryConfirm",
"delete": ["git::RestoreFile", { "skip_prompt": false }],
"backspace": ["git::RestoreFile", { "skip_prompt": false }],
@@ -1217,6 +1234,12 @@
// Editor bindings.
},
},
{
"context": "LspCommandSelector > Picker > Editor",
"bindings": {
"tab": "lsp_command_selector::ToggleArgumentsFocus",
},
},
{
"context": "ChannelModal > Picker > Editor",
"bindings": {
@@ -1237,6 +1260,12 @@
"ctrl-shift-i": "search::ToggleIncludeIgnored",
},
},
{
"context": "CommandPalette || (CommandPalette > Picker > Editor)",
"bindings": {
"shift-backspace": "command_palette::RemoveSelected",
},
},
{
"context": "RecentProjects || (RecentProjects > Picker > Editor)",
"bindings": {
@@ -1396,6 +1425,12 @@
"ctrl-e": "zed::OpenKeymapFile",
},
},
{
"context": "KeymapEditor > BufferSearchBar",
"bindings": {
"alt-ctrl-f": "keymap_editor::ToggleKeystrokeSearch",
},
},
{
"context": "KeystrokeInput",
"use_key_equivalents": true,
assets/keymaps/default-macos.json
+53 -13
View File
@@ -264,13 +264,6 @@
"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],
},
},
{
"context": "AgentPanel > Markdown",
"use_key_equivalents": true,
"bindings": {
"cmd-c": "markdown::CopyAsMarkdown",
},
},
{
"context": "AgentFeedbackMessageEditor > Editor",
"use_key_equivalents": true,
@@ -421,6 +414,15 @@
"enter": "editor::Newline",
},
},
{
"context": "Elicitation || (Elicitation > Editor)",
"use_key_equivalents": true,
"bindings": {
"enter": "menu::Confirm",
"tab": "menu::SelectNext",
"shift-tab": "menu::SelectPrevious",
},
},
{
"context": "ThreadHistory",
"bindings": {
@@ -596,7 +598,7 @@
"cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
"cmd-k cmd-i": "editor::Hover",
"cmd-k cmd-b": "editor::BlameHover",
"cmd-/": ["editor::ToggleComments", { "advance_downwards": false }],
"cmd-/": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": true }],
"cmd-k cmd-/": "editor::ToggleBlockComments",
"shift-alt-a": "editor::ToggleBlockComments",
"f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
@@ -775,7 +777,8 @@
"cmd-k shift-down": "workspace::SwapPaneDown",
"cmd-shift-x": "zed::Extensions",
"f5": "debugger::Rerun",
"cmd-w": "workspace::CloseActiveDock",
"cmd-w": ["pane::CloseActiveItem", { "close_pinned": false }],
"ctrl-alt-w": "workspace::CloseActiveDock",
},
},
{
@@ -887,6 +890,13 @@
"enter": "editor::ConfirmRename",
},
},
{
"context": "Editor && inline_input",
"use_key_equivalents": true,
"bindings": {
"enter": "menu::Confirm",
},
},
{
"context": "Editor && showing_completions",
"use_key_equivalents": true,
@@ -1054,6 +1064,7 @@
"alt-d": "project_panel::CompareMarkedFiles",
"cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
"cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
"shift-f10": "project_panel::OpenContextMenu",
"shift-down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"escape": "menu::Cancel",
@@ -1087,19 +1098,28 @@
"cmd-2": "git_panel::ActivateHistoryTab",
},
},
{
"context": "GitPanel && (ChangesList || HistoryList) && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "menu::SelectPrevious",
"down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"enter": "menu::Confirm",
"escape": "menu::Cancel",
},
},
{
"context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "git_panel::PreviousEntry",
"down": "git_panel::NextEntry",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"cmd-up": "git_panel::FirstEntry",
"cmd-down": "git_panel::LastEntry",
"left": "git_panel::CollapseSelectedEntry",
"right": "git_panel::ExpandSelectedEntry",
"enter": "menu::Confirm",
"cmd-alt-y": "git::ToggleStaged",
"space": "git::ToggleStaged",
"shift-space": "git::StageRange",
@@ -1110,7 +1130,6 @@
"alt-down": "git_panel::FocusEditor",
"tab": "git_panel::FocusEditor",
"shift-tab": "git_panel::FocusEditor",
"escape": "menu::Cancel",
"backspace": ["git::RestoreFile", { "skip_prompt": false }],
"delete": ["git::RestoreFile", { "skip_prompt": false }],
"cmd-backspace": ["git::RestoreFile", { "skip_prompt": true }],
@@ -1267,6 +1286,13 @@
// Editor bindings.
},
},
{
"context": "LspCommandSelector > Picker > Editor",
"use_key_equivalents": true,
"bindings": {
"tab": "lsp_command_selector::ToggleArgumentsFocus",
},
},
{
"context": "ChannelModal > Picker > Editor",
"use_key_equivalents": true,
@@ -1288,6 +1314,13 @@
"cmd-shift-i": "search::ToggleIncludeIgnored",
},
},
{
"context": "CommandPalette || (CommandPalette > Picker > Editor)",
"use_key_equivalents": true,
"bindings": {
"shift-backspace": "command_palette::RemoveSelected",
},
},
{
"context": "RecentProjects || (RecentProjects > Picker > Editor)",
"use_key_equivalents": true,
@@ -1480,6 +1513,13 @@
"cmd-e": "zed::OpenKeymapFile",
},
},
{
"context": "KeymapEditor > BufferSearchBar",
"use_key_equivalents": true,
"bindings": {
"cmd-alt-f": "keymap_editor::ToggleKeystrokeSearch",
},
},
{
"context": "KeystrokeInput",
"use_key_equivalents": true,
assets/keymaps/default-windows.json
+49 -15
View File
@@ -228,13 +228,6 @@
"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],
},
},
{
"context": "AgentPanel > Markdown",
"use_key_equivalents": true,
"bindings": {
"ctrl-c": "markdown::CopyAsMarkdown",
},
},
{
"context": "AgentFeedbackMessageEditor > Editor",
"use_key_equivalents": true,
@@ -389,6 +382,15 @@
"enter": "editor::Newline",
},
},
{
"context": "Elicitation || (Elicitation > Editor)",
"use_key_equivalents": true,
"bindings": {
"enter": "menu::Confirm",
"tab": "menu::SelectNext",
"shift-tab": "menu::SelectPrevious",
},
},
{
"context": "ThreadHistory",
"use_key_equivalents": true,
@@ -557,8 +559,8 @@
"ctrl-k ctrl-i": "editor::Hover",
"ctrl-k ctrl-b": "editor::BlameHover",
"ctrl-k ctrl-f": "editor::FormatSelections",
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-k ctrl-c": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": true }],
"ctrl-k ctrl-c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": true }],
"ctrl-k ctrl-/": "editor::ToggleBlockComments",
"shift-alt-a": "editor::ToggleBlockComments",
"f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
@@ -723,8 +725,9 @@
// or by tag:
// "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
"f5": "debugger::Rerun",
"ctrl-f4": "workspace::CloseActiveDock",
"ctrl-w": "workspace::CloseActiveDock",
"ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
"ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
"ctrl-alt-w": "workspace::CloseActiveDock",
},
},
{
@@ -824,6 +827,13 @@
"enter": "editor::ConfirmRename",
},
},
{
"context": "Editor && inline_input",
"use_key_equivalents": true,
"bindings": {
"enter": "menu::Confirm",
},
},
{
"context": "Editor && showing_completions",
"use_key_equivalents": true,
@@ -1002,6 +1012,8 @@
"ctrl-shift-enter": "project_panel::OpenWithSystem",
"alt-d": "project_panel::CompareMarkedFiles",
"ctrl-k ctrl-shift-f": "project_panel::NewSearchInDirectory",
"menu": "project_panel::OpenContextMenu",
"shift-f10": "project_panel::OpenContextMenu",
"shift-down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"escape": "menu::Cancel",
@@ -1021,17 +1033,26 @@
"ctrl-2": "git_panel::ActivateHistoryTab",
},
},
{
"context": "GitPanel && (ChangesList || HistoryList) && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "menu::SelectPrevious",
"down": "menu::SelectNext",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"enter": "menu::Confirm",
"escape": "menu::Cancel",
},
},
{
"context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "git_panel::PreviousEntry",
"down": "git_panel::NextEntry",
"shift-up": "menu::SelectPrevious",
"shift-down": "menu::SelectNext",
"left": "git_panel::CollapseSelectedEntry",
"right": "git_panel::ExpandSelectedEntry",
"enter": "menu::Confirm",
"alt-y": "git::StageFile",
"shift-alt-y": "git::UnstageFile",
"space": "git::ToggleStaged",
@@ -1040,7 +1061,6 @@
"ctrl-k ctrl-shift-c": "workspace::CopyRelativePath",
"tab": "git_panel::FocusEditor",
"shift-tab": "git_panel::FocusEditor",
"escape": "menu::Cancel",
"alt-enter": "menu::SecondaryConfirm",
"delete": ["git::RestoreFile", { "skip_prompt": false }],
"backspace": ["git::RestoreFile", { "skip_prompt": false }],
@@ -1222,6 +1242,13 @@
// Editor bindings.
},
},
{
"context": "LspCommandSelector > Picker > Editor",
"use_key_equivalents": true,
"bindings": {
"tab": "lsp_command_selector::ToggleArgumentsFocus",
},
},
{
"context": "ChannelModal > Picker > Editor",
"use_key_equivalents": true,
@@ -1244,6 +1271,13 @@
"ctrl-shift-i": "search::ToggleIncludeIgnored",
},
},
{
"context": "CommandPalette || (CommandPalette > Picker > Editor)",
"use_key_equivalents": true,
"bindings": {
"shift-backspace": "command_palette::RemoveSelected",
},
},
{
"context": "RecentProjects || (RecentProjects > Picker > Editor)",
"use_key_equivalents": true,
assets/keymaps/linux/emacs.json
+2 -2
View File
@@ -52,8 +52,8 @@
"alt-l": "editor::ConvertToLowerCase", // downcase-word
"alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
"ctrl-t": "editor::Transpose", // transpose-chars
"alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-x ctrl-;": "editor::ToggleComments",
"alt-;": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"ctrl-x ctrl-;": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"alt-.": "editor::GoToDefinition", // xref-find-definitions
"alt-?": "editor::FindAllReferences", // xref-find-references
"alt-,": "pane::GoBack", // xref-pop-marker-stack
assets/keymaps/linux/jetbrains.json
+1 -1
View File
@@ -35,7 +35,7 @@
"alt-shift-g": "editor::SplitSelectionIntoLines",
"alt-j": ["editor::SelectNext", { "replace_newest": false }],
"alt-shift-j": ["editor::SelectPrevious", { "replace_newest": false }],
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": true }],
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": true, "comment_empty_lines": true }],
"ctrl-w": "editor::SelectLargerSyntaxNode",
"ctrl-shift-w": "editor::SelectSmallerSyntaxNode",
"shift-alt-up": "editor::MoveLineUp",
assets/keymaps/linux/vscode.json
+2
View File
@@ -13,6 +13,8 @@
"alt-z": "editor::ToggleSoftWrap", // Toggle Word Wrap
"ctrl-shift-space": "editor::ShowSignatureHelp", // Trigger Parameter Hints
"ctrl-shift-a": "editor::ToggleBlockComments", // Toggle Block Comment
"ctrl-k ctrl-c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }], // Add Line Comment
"ctrl-/": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"ctrl-k f12": "editor::GoToDefinitionSplit", // Open Definition to the Side
},
},
assets/keymaps/macos/emacs.json
+2 -2
View File
@@ -46,8 +46,8 @@
"alt-l": "editor::ConvertToLowerCase", // downcase-word
"alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
"ctrl-t": "editor::Transpose", // transpose-chars
"alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
"ctrl-x ctrl-;": "editor::ToggleComments",
"alt-;": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"ctrl-x ctrl-;": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"alt-.": "editor::GoToDefinition", // xref-find-definitions
"alt-?": "editor::FindAllReferences", // xref-find-references
"alt-,": "pane::GoBack", // xref-pop-marker-stack
assets/keymaps/macos/jetbrains.json
+1 -1
View File
@@ -35,7 +35,7 @@
"ctrl-g": ["editor::SelectNext", { "replace_newest": false }],
"ctrl-shift-g": "editor::UndoSelection",
"ctrl-cmd-g": ["editor::SelectPrevious", { "replace_newest": false }],
"cmd-/": ["editor::ToggleComments", { "advance_downwards": true }],
"cmd-/": ["editor::ToggleComments", { "advance_downwards": true, "comment_empty_lines": true }],
"alt-up": "editor::SelectLargerSyntaxNode",
"alt-down": "editor::SelectSmallerSyntaxNode",
"shift-alt-up": "editor::MoveLineUp",
assets/keymaps/macos/vscode.json
+2 -1
View File
@@ -14,7 +14,8 @@
"cmd-shift-space": "editor::ShowSignatureHelp", // Trigger Parameter Hints
"ctrl-shift-cmd-right": "editor::SelectLargerSyntaxNode", // Expand AST Selection
"ctrl-shift-cmd-left": "editor::SelectSmallerSyntaxNode", // Shrink AST Selection
"cmd-k cmd-c": ["editor::ToggleComments", { "advance_downwards": false }], // Add Line Comment (closest analog)
"cmd-k cmd-c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }], // Add Line Comment (closest analog)
"cmd-/": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"cmd-k f12": "editor::GoToDefinitionSplit", // Open Definition to the Side
},
},
assets/keymaps/vim.json
+11 -5
View File
@@ -504,7 +504,7 @@
"*": "buffer_search::UseSelectionForFind",
"shift-x": "editor::SelectLine",
"_": "vim::HelixTrimSelections",
"ctrl-c": "editor::ToggleComments",
"ctrl-c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"alt-o": "editor::SelectLargerSyntaxNode",
"alt-i": "editor::SelectSmallerSyntaxNode",
"alt-p": "editor::SelectPreviousSyntaxNode",
@@ -562,7 +562,7 @@
"space r": "editor::Rename",
"space a": "editor::ToggleCodeActions",
"space h": "editor::SelectAllMatches",
"space c": "editor::ToggleComments",
"space c": ["editor::ToggleComments", { "advance_downwards": false, "comment_empty_lines": false }],
"space p": "editor::Paste",
"space y": "editor::Copy",
"space /": "pane::DeploySearch",
@@ -1123,17 +1123,23 @@
"g g": "menu::SelectFirst",
},
},
{
"context": "GitPanel && (ChangesList || HistoryList) && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"j": "menu::SelectNext",
"k": "menu::SelectPrevious",
"g f": "menu::Confirm",
},
},
{
"context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"h": "git_panel::CollapseSelectedEntry",
"j": "menu::SelectNext",
"k": "menu::SelectPrevious",
"l": "git_panel::ExpandSelectedEntry",
"g g": "menu::SelectFirst",
"shift-g": "menu::SelectLast",
"g f": "menu::Confirm",
"i": "git_panel::FocusEditor",
"x": "git::ToggleStaged",
"shift-x": "git::StageAll",
assets/settings/default.json
+116 -29
View File
@@ -79,12 +79,6 @@
"agent_buffer_font_size": 12,
// The default font size for the commit editor in the git panel and commit modal.
"git_commit_buffer_font_size": 12,
// The default font size for the markdown preview. Falls back to the UI font size if unset.
"markdown_preview_font_size": null,
// The font family for the markdown preview. Falls back to the UI font family if unset.
"markdown_preview_font_family": null,
// The font family for code blocks in the markdown preview. Falls back to the editor font family if unset.
"markdown_preview_code_font_family": null,
// How much to fade out unused code.
"unnecessary_code_fade": 0.3,
// Active pane styling settings.
@@ -118,6 +112,14 @@
},
// Markdown preview settings
"markdown_preview": {
// The default font size for the markdown preview. Falls back to the UI font size if unset.
"font_size": null,
// The font family for the markdown preview. Falls back to the UI font family if unset.
"font_family": null,
// The font family for code blocks in the markdown preview. Falls back to the editor font family if unset.
"code_font_family": null,
// Whether to automatically open Markdown files in the preview.
"open_markdown_files_in_preview": false,
// Whether to limit the width of the rendered markdown content. When
// enabled, content is constrained to `max_width` and centered
// horizontally within the preview pane.
@@ -210,6 +212,13 @@
// 3. Never close the window
// "when_closing_with_no_tabs": "keep_window_open",
"when_closing_with_no_tabs": "platform_default",
// What to show when opening a new window.
// May take 2 values:
// 1. Show an empty untitled buffer
// "on_new_window": "empty_tab"
// 2. Show the launchpad with recent projects
// "on_new_window": "launchpad"
"on_new_window": "launchpad",
// What to do when the last window is closed.
// May take 2 values:
// 1. Use the current platform's convention
@@ -232,6 +241,23 @@
//
// Default: true
"zoomed_padding": true,
// Window title template.
// Available variables are ${projectName}, ${fileName}, ${filePath},
// ${relativePath}, ${fileStem}, ${remoteName}, ${remoteHost},
// ${appName}, ${branch}, and ${separator}.
// ${separator} is omitted when adjacent variables are empty,
// but literal text is preserved.
// The collaboration indicator, when present, is appended after the
// rendered template.
// If the template renders to nothing, the default template is used instead.
//
// Default: "${projectName}${separator}${fileName}"
"window_title_format": "${projectName}${separator}${fileName}",
// String substituted for ${separator} in the window title format.
// Include any surrounding whitespace in the value.
//
// Default: " — "
"window_title_separator": " — ",
// On Linux, what draws Zed's window decorations (titlebar).
// This setting has no effect on other platforms:
// 1. Zed draws its own window decorations.
@@ -269,6 +295,12 @@
//
// Default: "bar"
"cursor_shape": "bar",
// Cursor movement animation settings.
// Enabling this may cause additional editor redraws and increase rendering overhead.
"cursor_animation": {
// Whether cursor movement animation is enabled.
"enabled": false,
},
// Determines when the mouse cursor should be hidden in response to keyboard
// input.
//
@@ -508,8 +540,18 @@
// Controls whether edit predictions are shown immediately (true)
// or manually by triggering `editor::ShowEditPrediction` (false).
"show_edit_predictions": true,
// Controls whether edit predictions are shown in a given language scope.
// Example: ["string", "comment"]
// Disable edit predictions in these language scopes, such as "comment" and
// "string".
//
// Use `"..."` to add scopes without repeating the inherited list. In project
// settings, it extends the user or parent configuration value. In
// language-specific settings, it extends the scopes inherited by that
// language. Omit `"..."` to replace the inherited list.
//
// Inherited scopes are inserted at `"..."`, and duplicates keep their first
// occurrence.
//
// Set `[]` to clear the inherited list. Omit this setting to inherit it unchanged.
"edit_predictions_disabled_in": [],
// Whether to show tabs and spaces in the editor.
// This setting can take four values:
@@ -554,7 +596,7 @@
// Whether to show code action buttons in the editor toolbar.
"code_actions": false,
},
// Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
// Whether to allow windows to tab together based on the user's tabbing preference (macOS only).
"use_system_window_tabs": false,
// Which fullscreen mode the `zed::ToggleFullScreen` action enters (macOS only).
//
@@ -842,6 +884,8 @@
"button": true,
// Whether to hide the gitignore entries in the project panel.
"hide_gitignore": false,
// Delay in milliseconds before tooltips appear for project panel titles.
"title_tooltip_delay": "default",
// Default width of the project panel.
"default_width": 240,
// Where to dock the project panel. Can be 'left' or 'right'.
@@ -1080,9 +1124,9 @@
//
// Default: false
"collapse_untracked_diff": false,
/// Whether to show entries with tree or flat view in the panel
///
/// Default: false
// Whether to show entries with tree or flat view in the panel
//
// Default: false
"tree_view": false,
// Whether the git panel should open on startup.
//
@@ -1126,13 +1170,23 @@
"button": true,
// Where to dock the agent panel. Can be 'left', 'right' or 'bottom'.
"dock": "left",
// Whether the agent panel should use flexible (proportional) sizing.
// Whether the agent panel should use flexible (proportional) sizing when docked
// to the left or right. When enabled, `default_width` does not control the panel
// width, and resetting the panel restores the default proportion.
//
// Default: true
"flexible": true,
// Where to position the threads sidebar. Can be 'left' or 'right'.
"sidebar_side": "left",
// Default width when the agent panel is docked to the left or right.
// Settings for the sidebar holding the agent panel and the list of agent threads.
"threads_sidebar": {
// Where to position the Threads Sidebar. Can be 'left' or 'right'.
"position": "left",
// Default width of the Threads Sidebar.
"default_width": 300,
// Automatically open the Threads Sidebar when opening a folder in an existing window.
"auto_open": true,
},
// Default fixed width when the agent panel is docked to the left or right and
// `flexible` is false.
"default_width": 640,
// Default height when the agent panel is docked to the bottom.
"default_height": 320,
@@ -1310,6 +1364,10 @@
//
// Default: never
"play_sound_when_agent_done": "never",
// Whether to keep the system awake while agent threads are running.
//
// Default: true
"prevent_idle_sleep": true,
// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
//
// Default: true
@@ -1461,7 +1519,7 @@
// when you open another preview tab.
// This is useful for quickly viewing files without cluttering your workspace.
"enabled": true,
// Whether to open tabs in preview mode when opened from the project panel with a single click.
// Whether to open tabs in preview mode when opened from the project panel with a single click or the Open action.
"enable_preview_from_project_panel": true,
// Whether to open tabs in preview mode when selected from the file finder.
"enable_preview_from_file_finder": false,
@@ -1482,6 +1540,11 @@
// Default: medium
"modal_max_width": "medium",
},
// Settings related to the command palette.
"command_palette": {
// Whether to use command history ranking for sorting in the command palette.
"use_command_history": true,
},
// Settings related to the file finder.
"file_finder": {
// Whether to show file icons in the file finder.
@@ -1748,9 +1811,9 @@
// 2. Hide the gutter
// "git_gutter": "hide"
"git_gutter": "tracked_files",
/// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
///
/// Default: 0
// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
//
// Default: 0
"gutter_debounce": 0,
// Control whether the git blame information is shown for the currently
// focused line, and where it is rendered.
@@ -1834,11 +1897,20 @@
"edit_predictions": {
// Which edit prediction provider to use.
"provider": "zed",
// A list of globs representing files that edit predictions should be disabled for.
// There's a sensible default list of globs already included.
// Any addition to this list will be merged with the default list.
// Globs are matched relative to the worktree root,
// except when starting with a slash (/) or equivalent in Windows.
// Disable edit predictions for files matching these glob patterns.
//
// Use `"..."` to add patterns without repeating Zed's defaults. In project
// settings, it extends the user or parent configuration value. Omit
// `"..."` to replace the inherited list.
//
// Inherited patterns are inserted at `"..."`, and duplicates keep their first
// occurrence.
//
// Set `[]` to clear the inherited list. Omit this setting to inherit it unchanged.
//
// Relative patterns are matched against paths relative to the worktree root.
// Absolute patterns are matched against absolute paths.
// A leading `~` is expanded to your home folder.
"disabled_globs": [
"**/.env*",
"**/*.pem",
@@ -1934,6 +2006,10 @@
"line_endings_button": false,
// Control when to show the active encoding in the status bar.
"active_encoding_button": "non_utf8",
// Whether to show an indicator while multi-stroke input is pending.
// If the input has a timeout, a countdown is shown and hovering pauses it.
// Its binding preview popover is disabled when "which_key.enabled" is true.
"pending_keystrokes_indicator": true,
},
// Settings specific to the terminal
"terminal": {
@@ -2145,14 +2221,23 @@
//
// [
// "\\s+(-->|:::|at) (?<link>(?<path>.+?))(:$|$)",
// "\\s+(Compiling|Checking|Documenting) [^(]+\\((?<link>(?<path>.+))\\)"
// "\\s+(Compiling|Checking|Documenting) [^(]+\\((?<link>(?<path>.+))\\)",
// "..."
// ],
//
// could be used. Processing stops at the first regex with a match, even if no link is
// could be used. The `"..."` entry inserts inherited regexes at that position. In project
// settings, it extends the user or parent configuration value. Omit `"..."` to replace the
// inherited list, or set `[]` to clear it. Duplicates keep their first occurrence, comparing
// regex text after joining multiline entries with newlines. The marker is recognized only
// as a top-level string. Write `["..."]` as an entry to keep the three-character regex instead.
// A `"..."` line inside a multiline entry is always regex text. Invalid regexes are logged
// and ignored.
//
// Processing stops at the first regex with a match, even if no link is
// produced which is the case when the cursor is not over the hyperlinked text. For best
// performance it is recommended to order regexes from most common to least common. For
// readability and documentation, each regex may be an array of strings which are collected
// into one multi-line regex string for use in terminal path hyperlink detection.
// readability and documentation, each regex may be an array of strings which are joined
// with newlines into one regex string for use in terminal path hyperlink detection.
"path_hyperlink_regexes": [
// Python-style diagnostics
"File \"(?<path>[^\"]+)\", line (?<line>[0-9]+)",
@@ -2756,6 +2841,8 @@
// Which-key popup settings
"which_key": {
// Whether to show the which-key popup when holding down key combinations.
// When enabled, the pending keystrokes indicator remains visible, but its
// binding preview popover is disabled.
"enabled": false,
// Delay in milliseconds before showing the which-key popup.
"delay_ms": 1000,