Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Fix excluded language servers starting nonetheless (#60000)

Kirill Bulatovf961889ad4d2
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index de67375cccc..1cf70338f46 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -19,7 +19,8 @@ pub use settings::{
AutoIndentMode, CompletionSettingsContent, EditPredictionDataCollectionChoice,
EditPredictionPromptFormatContent, EditPredictionProvider, EditPredictionsMode, FormatOnSave,
Formatter, FormatterList, InlayHintKind, LanguageSettingsContent, LineEndingSetting,
- LspInsertMode, RewrapBehavior, ShowWhitespaceSetting, SoftWrap, WordsCompletionMode,
+ LspInsertMode, REST_OF_LANGUAGE_SERVERS, RewrapBehavior, ShowWhitespaceSetting, SoftWrap,
+ WordsCompletionMode,
};
use settings::{RegisterSetting, Settings, SettingsLocation, SettingsStore, merge_from::MergeFrom};
use shellexpand;
@@ -276,9 +277,6 @@ pub struct PrettierSettings {
}
impl LanguageSettings {
- /// A token representing the rest of the available language servers.
- const REST_OF_LANGUAGE_SERVERS: &'static str = "...";
-
pub fn for_buffer<'a>(buffer: &'a Buffer, cx: &'a App) -> Cow<'a, LanguageSettings> {
Self::resolve(Some(buffer), None, cx)
}
@@ -382,7 +380,7 @@ impl LanguageSettings {
enabled_language_servers
.into_iter()
.flat_map(|language_server| {
- if language_server.0.as_ref() == Self::REST_OF_LANGUAGE_SERVERS {
+ if language_server.0.as_ref() == REST_OF_LANGUAGE_SERVERS {
rest.clone()
} else {
vec![language_server]
@@ -1090,7 +1088,7 @@ mod tests {
// A value of just `["..."]` is the same as taking all of the available language servers.
assert_eq!(
LanguageSettings::resolve_language_servers(
- &[LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()],
+ &[REST_OF_LANGUAGE_SERVERS.into()],
&available_language_servers,
),
available_language_servers
@@ -1101,7 +1099,7 @@ mod tests {
LanguageSettings::resolve_language_servers(
&[
"biome".into(),
- LanguageSettings::REST_OF_LANGUAGE_SERVERS.into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
"deno".into()
],
&available_language_servers
@@ -1122,7 +1120,7 @@ mod tests {
"deno".into(),
"!typescript-language-server".into(),
"!biome".into(),
- LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
+ REST_OF_LANGUAGE_SERVERS.into()
],
&available_language_servers
),
@@ -1134,7 +1132,7 @@ mod tests {
LanguageSettings::resolve_language_servers(
&[
"my-cool-language-server".into(),
- LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
+ REST_OF_LANGUAGE_SERVERS.into()
],
&available_language_servers
),
diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs
index 2e5ef23875e..f31ef08e1d2 100644
--- a/crates/settings_content/src/language.rs
+++ b/crates/settings_content/src/language.rs
@@ -54,10 +54,32 @@ impl merge_from::MergeFrom for AllLanguageSettingsContent {
// A user's global settings override the default global settings and
// all default language-specific settings.
- //
self.defaults.merge_from(&other.defaults);
+ let globally_disabled_servers = other.defaults.language_servers.as_ref().map(|servers| {
+ servers
+ .iter()
+ .filter(|entry| entry.starts_with('!'))
+ .cloned()
+ .collect::<Vec<_>>()
+ });
for language_settings in self.languages.0.values_mut() {
+ let language_server_overrides = language_settings.language_servers.clone();
language_settings.merge_from(&other.defaults);
+ if let Some(mut language_server_overrides) = language_server_overrides {
+ if let Some(disabled) = &globally_disabled_servers {
+ let insert_before = language_server_overrides
+ .iter()
+ .position(|entry| entry == REST_OF_LANGUAGE_SERVERS)
+ .unwrap_or(language_server_overrides.len());
+ for disabled_server in disabled {
+ if !language_server_overrides.contains(disabled_server) {
+ language_server_overrides
+ .insert(insert_before, disabled_server.clone());
+ }
+ }
+ }
+ language_settings.language_servers = Some(language_server_overrides);
+ }
}
// A user's language-specific settings override default language-specific settings.
@@ -390,6 +412,8 @@ pub enum SoftWrap {
Bounded,
}
+pub const REST_OF_LANGUAGE_SERVERS: &str = "...";
+
/// The settings for a particular language.
#[with_fallible_options]
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
@@ -1157,7 +1181,7 @@ pub enum IndentGuideBackgroundColoring {
#[cfg(test)]
mod test {
- use crate::{ParseStatus, fallible_options};
+ use crate::{ParseStatus, fallible_options, merge_from::MergeFrom};
use super::*;
@@ -1228,6 +1252,231 @@ mod test {
assert!(matches!(result, ParseStatus::Failed { .. }));
}
+ #[test]
+ fn test_language_servers_merge_preserves_per_language_config() {
+ let mut base = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ languages: LanguageToSettingsMap(
+ [(
+ "TypeScript".into(),
+ LanguageSettingsContent {
+ language_servers: Some(vec![
+ "!typescript-language-server".into(),
+ "vtsls".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ let user = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec![
+ "!tailwindcss-language-server".into(),
+ "!eslint".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ ..AllLanguageSettingsContent::default()
+ };
+
+ base.merge_from(&user);
+
+ let ts_servers = base.languages.0["TypeScript"]
+ .language_servers
+ .as_ref()
+ .unwrap();
+ assert_eq!(
+ ts_servers,
+ &vec![
+ "!typescript-language-server".to_string(),
+ "vtsls".to_string(),
+ "!eslint".to_string(),
+ "!tailwindcss-language-server".to_string(),
+ REST_OF_LANGUAGE_SERVERS.to_string(),
+ ]
+ );
+
+ let default_servers = base.defaults.language_servers.as_ref().unwrap();
+ assert_eq!(
+ default_servers,
+ &vec![
+ "!tailwindcss-language-server".to_string(),
+ "!eslint".to_string(),
+ REST_OF_LANGUAGE_SERVERS.to_string(),
+ ]
+ );
+ }
+
+ #[test]
+ fn test_language_servers_merge_no_per_language_config_uses_global() {
+ let mut base = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ languages: LanguageToSettingsMap(
+ [(
+ "Rust".into(),
+ LanguageSettingsContent {
+ tab_size: Some(std::num::NonZeroU32::new(4).unwrap()),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ let user = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec!["!eslint".into(), REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ ..AllLanguageSettingsContent::default()
+ };
+
+ base.merge_from(&user);
+
+ let rust_servers = base.languages.0["Rust"].language_servers.as_ref().unwrap();
+ assert_eq!(
+ rust_servers,
+ &vec!["!eslint".to_string(), REST_OF_LANGUAGE_SERVERS.to_string(),]
+ );
+ }
+
+ #[test]
+ fn test_language_servers_merge_user_per_language_overrides() {
+ let mut base = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ languages: LanguageToSettingsMap(
+ [(
+ "TypeScript".into(),
+ LanguageSettingsContent {
+ language_servers: Some(vec![
+ "!typescript-language-server".into(),
+ "vtsls".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ let user = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec!["!eslint".into(), REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ languages: LanguageToSettingsMap(
+ [(
+ "TypeScript".into(),
+ LanguageSettingsContent {
+ language_servers: Some(vec![
+ "deno".into(),
+ "!vtsls".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ base.merge_from(&user);
+
+ let ts_servers = base.languages.0["TypeScript"]
+ .language_servers
+ .as_ref()
+ .unwrap();
+ assert_eq!(
+ ts_servers,
+ &vec![
+ "deno".to_string(),
+ "!vtsls".to_string(),
+ REST_OF_LANGUAGE_SERVERS.to_string(),
+ ]
+ );
+ }
+
+ #[test]
+ fn test_user_per_language_config_overrides_default_disables() {
+ let mut base = AllLanguageSettingsContent {
+ defaults: LanguageSettingsContent {
+ language_servers: Some(vec![REST_OF_LANGUAGE_SERVERS.into()]),
+ ..LanguageSettingsContent::default()
+ },
+ languages: LanguageToSettingsMap(
+ [(
+ "TypeScript".into(),
+ LanguageSettingsContent {
+ language_servers: Some(vec![
+ "!typescript-language-server".into(),
+ "vtsls".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ let user = AllLanguageSettingsContent {
+ languages: LanguageToSettingsMap(
+ [(
+ "TypeScript".into(),
+ LanguageSettingsContent {
+ language_servers: Some(vec![
+ "typescript-language-server".into(),
+ REST_OF_LANGUAGE_SERVERS.into(),
+ ]),
+ ..LanguageSettingsContent::default()
+ },
+ )]
+ .into_iter()
+ .collect(),
+ ),
+ ..AllLanguageSettingsContent::default()
+ };
+
+ base.merge_from(&user);
+
+ let ts_servers = base.languages.0["TypeScript"]
+ .language_servers
+ .as_ref()
+ .unwrap();
+ assert_eq!(
+ ts_servers,
+ &vec![
+ "typescript-language-server".to_string(),
+ REST_OF_LANGUAGE_SERVERS.to_string(),
+ ]
+ );
+ }
+
#[test]
fn test_prettier_options() {
let raw_prettier = r#"{"allowed": false, "tabWidth": 4, "semi": false}"#;