diff --git a/assets/settings/default.json b/assets/settings/default.json index 48ceeed2aa..10624aa0c1 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -145,9 +145,9 @@ // Otherwise(when `true`), the closing characters are always skipped over and auto-removed // no matter how they were inserted. "always_treat_brackets_as_autoclosed": false, - // Controls whether copilot provides suggestion immediately - // or waits for a `copilot::Toggle` - "show_copilot_suggestions": true, + // Controls whether inline completions are shown immediately (true) + // or manually by triggering `editor::ShowInlineCompletion` (false). + "show_inline_completions": true, // Whether to show tabs and spaces in the editor. // This setting can take three values: // @@ -516,9 +516,8 @@ // "delay_ms": 600 } }, - "copilot": { - // The set of glob patterns for which copilot should be disabled - // in any matching file. + "inline_completions": { + // A list of globs representing files that inline completions should be disabled for. "disabled_globs": [".env"] }, // Settings specific to journaling diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 3718e8550a..1d5fd8713d 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -194,7 +194,7 @@ pub struct AllLanguageSettingsContent { #[serde(default)] pub features: Option, /// The inline completion settings. - #[serde(default, alias = "copilot")] + #[serde(default)] pub inline_completions: Option, /// The default language settings. #[serde(flatten)] @@ -297,7 +297,7 @@ pub struct LanguageSettingsContent { /// or manually by triggering `editor::ShowInlineCompletion` (false). /// /// Default: true - #[serde(default, alias = "show_copilot_suggestions")] + #[serde(default)] pub show_inline_completions: Option, /// Whether to show tabs and spaces in the editor. #[serde(default)]