diff --git a/docs/guide/ide-integration.md b/docs/guide/ide-integration.md index 07c269aeb9..47637e6d13 100644 --- a/docs/guide/ide-integration.md +++ b/docs/guide/ide-integration.md @@ -82,14 +82,26 @@ You can also manually set up the Zed config: "JavaScript": { "format_on_save": "on", "prettier": { "allowed": false }, - "formatter": [{ "language_server": { "name": "oxfmt" } }], - "code_action": "source.fixAll.oxc" + "formatter": [ + { "language_server": { "name": "oxfmt" } }, + { "code_action": "source.fixAll.oxc" } + ] + }, + "JSX": { + "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.js": { "format_on_save": "on", "prettier": { "allowed": false }, diff --git a/packages/cli/src/utils/editor.ts b/packages/cli/src/utils/editor.ts index cdf4e63ab0..6c3604b500 100644 --- a/packages/cli/src/utils/editor.ts +++ b/packages/cli/src/utils/editor.ts @@ -87,9 +87,11 @@ const ZED_SETTINGS = { { format_on_save: 'on', prettier: { allowed: false }, - formatter: [{ language_server: { name: 'oxfmt' } }], - // Only the JavaScript entry runs the oxc fix-all code action on save - ...(language === 'JavaScript' ? { code_action: 'source.fixAll.oxc' } : {}), + formatter: [ + { language_server: { name: 'oxfmt' } }, + // Only the JavaScript entry runs the oxc fix-all code action on save. + ...(language === 'JavaScript' ? [{ code_action: 'source.fixAll.oxc' }] : []), + ], }, ]), ),