From 2564d5d648c7e9f9bd8118b801b9381f834901dd Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 22 May 2024 18:37:24 -0400 Subject: [PATCH] docs: Remove references to `language_overrides` (#12169) This PR replaces references to `language_overrides` in the docs with just `languages`. `language_overrides` is an alias for `languages`, and we want to move towards just using `languages`. Release Notes: - N/A --- docs/src/configuring-zed.md | 14 +++++++------- docs/src/languages/elixir.md | 2 +- docs/src/languages/javascript.md | 2 +- docs/src/languages/python.md | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md index 8e55e4af4d84bbfb057ef5504aac5c9daa0aa6f8..4f8a7d9d1abdd5ca9ad56ba0f427d92b34bae2db 100644 --- a/docs/src/configuring-zed.md +++ b/docs/src/configuring-zed.md @@ -12,7 +12,7 @@ The following global settings can be overridden with a folder-specific configura - `format_on_save` - `formatter` - `hard_tabs` -- `language_overrides` +- `languages` - `preferred_line_length` - `remove_trailing_whitespace_on_save` - `soft_wrap` @@ -858,18 +858,18 @@ Settings-related hint updates are not debounced. } ``` -## Language Overrides +## Languages -- Description: Configuration overrides for specific languages. -- Setting: `language_overrides` +- Description: Configuration for specific languages. +- Setting: `languages` - Default: `null` **Options** -To override settings for a language, add an entry for that languages name to the `language_overrides` value. Example: +To override settings for a language, add an entry for that languages name to the `languages` value. Example: ```json -"language_overrides": { +"languages": { "C": { "format_on_save": "off", "preferred_line_length": 64, @@ -1524,7 +1524,7 @@ Run the `theme selector: toggle` action in the command palette to see a current "font_family": "FiraCode Nerd Font Mono", "blinking": "off" }, - "language_overrides": { + "languages": { "C": { "format_on_save": "language_server", "preferred_line_length": 64, diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md index 22df3562a55ceb1e91eef00dd53be8862cbec7dc..86e7b83b8da1a1573f0535b80cc74001675761cb 100644 --- a/docs/src/languages/elixir.md +++ b/docs/src/languages/elixir.md @@ -27,7 +27,7 @@ If you prefer to format your code with [Mix](https://hexdocs.pm/mix/Mix.html), u ```json { - "language_overrides": { + "languages": { "Elixir": { "format_on_save": { "external": { diff --git a/docs/src/languages/javascript.md b/docs/src/languages/javascript.md index c43b4effa3e4540bc4b254981e417e7f93fce887..7452e200b1f1697dd731ef474213f80e99d3de2f 100644 --- a/docs/src/languages/javascript.md +++ b/docs/src/languages/javascript.md @@ -11,7 +11,7 @@ For example, if you have Prettier installed and on your `PATH`, you can use it t ```json { - "language_overrides": { + "languages": { "JavaScript": { "format_on_save": { "external": { diff --git a/docs/src/languages/python.md b/docs/src/languages/python.md index 4f3ff2be2cf6ddec9d0a7372623e5de90ba58518..f4841f6122ff7b6d7574dc8334341d15674b13c2 100644 --- a/docs/src/languages/python.md +++ b/docs/src/languages/python.md @@ -54,7 +54,7 @@ A common tool for formatting python code is [Black](https://black.readthedocs.io ```json { - "language_overrides": { + "languages": { "Python": { "format_on_save": { "external": {