Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove copilot and show_copilot_suggestions setting aliases (#13167)

Browse source 
This PR removes the Copilot-specific aliases for the
`inline_completions` and `show_inline_completions` settings.

While these aliases were added to maintain backward-compatibility, the
aliasing behavior here can lead to a confusing experience when both keys
end up in the `settings.json`.

Release Notes:

- Breaking Change: Removed the `copilot` alias for the
`inline_completions` setting. If you have settings under `copilot` they
should get moved to `inline_completions`.
- Breaking Change: Removed the `show_copilot_suggestions` alias for the
`show_inline_completions` setting.
This commit is contained in:
Marshall Bowers 2024-06-17 15:51:37 -04:00 • committed by GitHub
parent 3707734f0a
commit 71cc95d315
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
assets/settings/default.json
View file

@ -145,9 +145,9 @@
// Otherwise(when `true`), the closing characters are always skipped over and auto-removed // Otherwise(when `true`), the closing characters are always skipped over and auto-removed
// no matter how they were inserted. // no matter how they were inserted.
"always_treat_brackets_as_autoclosed": false, "always_treat_brackets_as_autoclosed": false,
// Controls whether copilot provides suggestion immediately // Controls whether inline completions are shown immediately (true)
// or waits for a `copilot::Toggle` // or manually by triggering `editor::ShowInlineCompletion` (false).
"show_copilot_suggestions": true, "show_inline_completions": true,
// Whether to show tabs and spaces in the editor. // Whether to show tabs and spaces in the editor.
// This setting can take three values: // This setting can take three values:
// //
@ -516,9 +516,8 @@
// "delay_ms": 600 // "delay_ms": 600
} }
}, },
"copilot": { "inline_completions": {
// The set of glob patterns for which copilot should be disabled // A list of globs representing files that inline completions should be disabled for.
// in any matching file.
"disabled_globs": [".env"] "disabled_globs": [".env"]
}, },
// Settings specific to journaling // Settings specific to journaling

4
crates/language/src/language_settings.rs
View file

@ -194,7 +194,7 @@ pub struct AllLanguageSettingsContent {
#[serde(default)] #[serde(default)]
pub features: Option<FeaturesContent>, pub features: Option<FeaturesContent>,
/// The inline completion settings. /// The inline completion settings.
#[serde(default, alias = "copilot")] #[serde(default)]
pub inline_completions: Option<InlineCompletionSettingsContent>, pub inline_completions: Option<InlineCompletionSettingsContent>,
/// The default language settings. /// The default language settings.
#[serde(flatten)] #[serde(flatten)]
@ -297,7 +297,7 @@ pub struct LanguageSettingsContent {
/// or manually by triggering `editor::ShowInlineCompletion` (false). /// or manually by triggering `editor::ShowInlineCompletion` (false).
/// ///
/// Default: true /// Default: true
#[serde(default, alias = "show_copilot_suggestions")] #[serde(default)]
pub show_inline_completions: Option<bool>, pub show_inline_completions: Option<bool>,
/// Whether to show tabs and spaces in the editor. /// Whether to show tabs and spaces in the editor.
#[serde(default)] #[serde(default)]