Skip to content

feat(cli): add Zed editor support for project creation #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengmk2 merged 7 commits into from
Mar 14, 2026
+134 −9
Merged

feat(cli): add Zed editor support for project creation #832

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6afdd78
feat(cli): add Zed editor support for project creation
xingwangzhe Mar 13, 2026
409a2e6
feat(cli): add onSave to zed oxfmt config
xingwangzhe Mar 13, 2026
1757033
Potential fix for pull request finding
xingwangzhe Mar 13, 2026
acb6cfc
fix(cli): use recursive deep merge for editor configs
xingwangzhe Mar 13, 2026
e0dcda8
fix(cli): move deepMerge outside to satisfy oxlint
xingwangzhe Mar 13, 2026
f8b9196
Merge branch 'voidzero-dev:main' into main
xingwangzhe Mar 14, 2026
482a880
Merge branch 'main' into main
fengmk2 Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 134 additions & 9 deletions packages/cli/src/utils/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,119 @@ const VSCODE_EXTENSIONS = {
recommendations: ['VoidZero.vite-plus-extension-pack'],
} as const;

const ZED_SETTINGS = {
lsp: {
oxlint: {
initialization_options: {
settings: {
configPath: './.oxlintrc.json',
Comment thread
xingwangzhe marked this conversation as resolved.
run: 'onType',
disableNestedConfig: false,
Comment thread
xingwangzhe marked this conversation as resolved.
fixKind: 'safe_fix',
typeAware: true,
Comment thread
xingwangzhe marked this conversation as resolved.
unusedDisableDirectives: 'deny',
},
},
},
oxfmt: {
initialization_options: {
settings: {
configPath: './.oxfmtrc.jsonc',
run: 'onSave',
},
},
},
},
languages: {
CSS: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
GraphQL: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
Handlebars: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
HTML: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
JavaScript: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
code_action: 'source.fixAll.oxc',
},
JSX: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
JSON: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
JSON5: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
JSONC: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
Less: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
Markdown: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
MDX: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
SCSS: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
TypeScript: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
TSX: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
Vue: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
YAML: {
format_on_save: 'on',
prettier: { allowed: false },
formatter: [{ language_server: { name: 'oxfmt' } }],
},
},
} as const;

export const EDITORS = [
{
id: 'vscode',
Expand All @@ -31,6 +144,14 @@ export const EDITORS = [
'extensions.json': VSCODE_EXTENSIONS as Record<string, unknown>,
},
},
{
id: 'zed',
label: 'Zed',
targetDir: '.zed',
files: {
'settings.json': ZED_SETTINGS as Record<string, unknown>,
},
},
] as const;

export type EditorId = (typeof EDITORS)[number]['id'];
Expand Down Expand Up @@ -247,9 +368,15 @@ function mergeEditorConfigs(
};
}

// settings.json: 2-level deep merge, preserving existing keys
const result = { ...existing };
for (const [key, value] of Object.entries(incoming)) {
return deepMerge(existing, incoming);
}

function deepMerge(
target: Record<string, unknown>,
source: Record<string, unknown>,
): Record<string, unknown> {
const result = { ...target };
for (const [key, value] of Object.entries(source)) {
if (!(key in result)) {
result[key] = value;
} else if (
Expand All @@ -260,13 +387,11 @@ function mergeEditorConfigs(
value !== null &&
!Array.isArray(value)
) {
// Nested object: merge preserving existing keys
result[key] = {
...(value as Record<string, unknown>),
...(result[key] as Record<string, unknown>),
};
result[key] = deepMerge(
result[key] as Record<string, unknown>,
value as Record<string, unknown>,
);
}
// else: existing key is preserved as-is
}
return result;
}
Expand Down
Loading