diff --git a/Cargo.lock b/Cargo.lock index b9cdff3ef16..aeede1b3880 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3443,7 +3443,7 @@ dependencies = [ "time", "title_bar", "tokio", - "toml 0.8.23", + "toml 0.9.8", "tower 0.4.13", "tower-http 0.4.4", "tracing", @@ -5410,7 +5410,7 @@ dependencies = [ "telemetry_events", "text", "thiserror 2.0.17", - "toml 0.8.23", + "toml 0.9.8", "ui", "util", "uuid", @@ -5478,7 +5478,7 @@ dependencies = [ "telemetry_events", "tempfile", "terminal_view", - "toml 0.8.23", + "toml 0.9.8", "util", "wasmtime", "watch", @@ -6154,7 +6154,7 @@ dependencies = [ "serde_json", "task", "tempfile", - "toml 0.8.23", + "toml 0.9.8", "tracing", "url", "util", @@ -6188,7 +6188,7 @@ dependencies = [ "theme_settings", "thiserror 2.0.17", "tokio", - "toml 0.8.23", + "toml 0.9.8", "tree-sitter", "wasmtime", ] @@ -6236,7 +6236,7 @@ dependencies = [ "theme", "theme_extension", "theme_settings", - "toml 0.8.23", + "toml 0.9.8", "tracing", "url", "util", @@ -9630,7 +9630,7 @@ dependencies = [ "text", "theme", "theme_settings", - "toml 0.8.23", + "toml 0.9.8", "tracing", "tree-sitter", "tree-sitter-c", @@ -9671,7 +9671,7 @@ dependencies = [ "serde_json", "smallvec", "strum 0.28.0", - "toml 0.8.23", + "toml 0.9.8", "tree-sitter", ] @@ -14176,7 +14176,7 @@ dependencies = [ "tempfile", "terminal", "text", - "toml 0.8.23", + "toml 0.9.8", "tracing", "unindent", "url", @@ -15330,7 +15330,7 @@ dependencies = [ "theme", "theme_settings", "thiserror 2.0.17", - "toml 0.8.23", + "toml 0.9.8", "unindent", "util", "uuid", @@ -22592,7 +22592,7 @@ dependencies = [ "tempfile", "thiserror 2.0.17", "tokio", - "toml 0.8.23", + "toml 0.9.8", "toml_edit 0.22.27", "url", ] diff --git a/Cargo.toml b/Cargo.toml index 4d9a614a10d..2bf720afb27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -875,7 +875,7 @@ time = { version = "0.3", features = [ tiny_http = "0.12" tokio = { version = "1" } tokio-rustls = { version = "0.26", default-features = false } -toml = "0.8" +toml = "0.9" toml_edit = { version = "0.22", default-features = false, features = [ "display", "parse", diff --git a/crates/agent/src/tools/write_file_tool.rs b/crates/agent/src/tools/write_file_tool.rs index 451a0416aa7..f423247a4d6 100644 --- a/crates/agent/src/tools/write_file_tool.rs +++ b/crates/agent/src/tools/write_file_tool.rs @@ -538,7 +538,7 @@ mod tests { language::LanguageConfig { name: "Rust".into(), matcher: (language::LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/agent_ui/src/message_editor.rs b/crates/agent_ui/src/message_editor.rs index abf21684cb1..041fa4b3412 100644 --- a/crates/agent_ui/src/message_editor.rs +++ b/crates/agent_ui/src/message_editor.rs @@ -3538,7 +3538,7 @@ mod tests { language::LanguageConfig { name: "Plain Text".into(), matcher: (language::LanguageMatcher { - path_suffixes: vec!["txt".to_string()], + path_suffixes: vec!["txt".into()], ..Default::default() }) .into(), diff --git a/crates/call_hierarchy/src/call_hierarchy.rs b/crates/call_hierarchy/src/call_hierarchy.rs index 6680fca443b..377c7a0d76e 100644 --- a/crates/call_hierarchy/src/call_hierarchy.rs +++ b/crates/call_hierarchy/src/call_hierarchy.rs @@ -2354,7 +2354,7 @@ mod tests { LanguageConfig { name: LanguageName::new("Rust"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -2368,7 +2368,7 @@ mod tests { LanguageConfig { name: LanguageName::new("Rust"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() diff --git a/crates/collab/tests/integration/integration_tests.rs b/crates/collab/tests/integration/integration_tests.rs index 77eeeeb53d0..64686525cd9 100644 --- a/crates/collab/tests/integration/integration_tests.rs +++ b/crates/collab/tests/integration/integration_tests.rs @@ -1631,7 +1631,7 @@ async fn assert_lsp_log_streams_reconnect( LanguageConfig { name: "Rust".into(), matcher: LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() } .into(), @@ -2921,7 +2921,7 @@ async fn test_propagate_saves_and_fs_changes( LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -2933,7 +2933,7 @@ async fn test_propagate_saves_and_fs_changes( LanguageConfig { name: "JavaScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["js".to_string()], + path_suffixes: vec!["js".into()], ..Default::default() }) .into(), @@ -4805,7 +4805,7 @@ async fn test_collaborating_with_diagnostics( LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -5530,7 +5530,7 @@ async fn test_prettier_formatting_buffer( LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), diff --git a/crates/collab/tests/integration/random_project_collaboration_tests.rs b/crates/collab/tests/integration/random_project_collaboration_tests.rs index 92fef2f79e2..58862784038 100644 --- a/crates/collab/tests/integration/random_project_collaboration_tests.rs +++ b/crates/collab/tests/integration/random_project_collaboration_tests.rs @@ -1048,7 +1048,7 @@ impl RandomizedTest for ProjectCollaborationTest { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs index 06989f81369..d34501e19f8 100644 --- a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs +++ b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs @@ -687,7 +687,7 @@ async fn test_ssh_collaboration_formatting_with_prettier( LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..LanguageMatcher::default() }) .into(), diff --git a/crates/debugger_ui/src/tests/inline_values.rs b/crates/debugger_ui/src/tests/inline_values.rs index 713d2930ef6..bfc2978dbbf 100644 --- a/crates/debugger_ui/src/tests/inline_values.rs +++ b/crates/debugger_ui/src/tests/inline_values.rs @@ -1832,7 +1832,7 @@ fn python_lang() -> Language { LanguageConfig { name: "Python".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["py".to_string()], + path_suffixes: vec!["py".into()], ..Default::default() }) .into(), @@ -1851,7 +1851,7 @@ fn go_lang() -> Arc { LanguageConfig { name: "Go".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["go".to_string()], + path_suffixes: vec!["go".into()], ..Default::default() }) .into(), @@ -2271,7 +2271,7 @@ fn javascript_lang() -> Arc { LanguageConfig { name: "JavaScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["js".to_string()], + path_suffixes: vec!["js".into()], ..Default::default() }) .into(), @@ -2291,7 +2291,7 @@ fn typescript_lang() -> Arc { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -2311,7 +2311,7 @@ fn tsx_lang() -> Arc { LanguageConfig { name: "TSX".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..Default::default() }) .into(), diff --git a/crates/editor/src/code_lens.rs b/crates/editor/src/code_lens.rs index c8ba5be7033..21c28e45fc3 100644 --- a/crates/editor/src/code_lens.rs +++ b/crates/editor/src/code_lens.rs @@ -1714,7 +1714,7 @@ mod tests { language::LanguageConfig { name: "TypeScript".into(), matcher: (language::LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..language::LanguageMatcher::default() }) .into(), diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index 4a864006c74..b7cf32b60e5 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -3281,7 +3281,7 @@ pub mod tests { LanguageConfig { name: "Test".into(), matcher: (LanguageMatcher { - path_suffixes: vec![".test".to_string()], + path_suffixes: vec![".test".into()], ..Default::default() }) .into(), @@ -3730,7 +3730,7 @@ pub mod tests { LanguageConfig { name: "Test".into(), matcher: (LanguageMatcher { - path_suffixes: vec![".test".to_string()], + path_suffixes: vec![".test".into()], ..Default::default() }) .into(), @@ -3818,7 +3818,7 @@ pub mod tests { LanguageConfig { name: "Test".into(), matcher: (LanguageMatcher { - path_suffixes: vec![".test".to_string()], + path_suffixes: vec![".test".into()], ..Default::default() }) .into(), diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs index 6b7e23c0431..0995f8fcff5 100644 --- a/crates/editor/src/editor_tests.rs +++ b/crates/editor/src/editor_tests.rs @@ -21119,7 +21119,7 @@ async fn test_document_format_manual_trigger(cx: &mut TestAppContext) { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -21571,7 +21571,7 @@ async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -25539,7 +25539,7 @@ async fn test_multiline_completion(cx: &mut TestAppContext) { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..LanguageMatcher::default() }) .into(), @@ -28507,7 +28507,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut TestAppContext) { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -28778,7 +28778,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppCon LanguageConfig { name: language_name.clone(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -30084,7 +30084,7 @@ async fn test_document_format_with_prettier(cx: &mut TestAppContext) { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -30175,7 +30175,7 @@ async fn test_document_format_with_prettier_explicit_language(cx: &mut TestAppCo LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..LanguageMatcher::default() }) .into(), @@ -30278,7 +30278,7 @@ async fn test_range_format_with_prettier(cx: &mut TestAppContext) { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -30355,7 +30355,7 @@ async fn test_range_format_with_prettier_explicit_language(cx: &mut TestAppConte LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..LanguageMatcher::default() }) .into(), @@ -39162,7 +39162,7 @@ async fn test_apply_code_lens_actions_with_commands(cx: &mut gpui::TestAppContex LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -39997,7 +39997,7 @@ async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) { LanguageConfig { name: "HTML".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["html".to_string()], + path_suffixes: vec!["html".into()], ..LanguageMatcher::default() }) .into(), @@ -40121,7 +40121,7 @@ async fn test_linked_edits_on_typing_punctuation(cx: &mut TestAppContext) { LanguageConfig { name: "TSX".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..LanguageMatcher::default() }) .into(), @@ -40193,7 +40193,7 @@ async fn test_linked_edits_on_typing_dash_in_custom_element_name(cx: &mut TestAp LanguageConfig { name: "TSX".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..LanguageMatcher::default() }) .into(), @@ -40256,7 +40256,7 @@ async fn test_linked_edits_on_typing_dot_without_language_override(cx: &mut Test LanguageConfig { name: "HTML".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["html".to_string()], + path_suffixes: vec!["html".into()], ..LanguageMatcher::default() }) .into(), @@ -48303,7 +48303,7 @@ async fn test_tsx_nested_jsx_member_expression_highlights(cx: &mut TestAppContex LanguageConfig { name: "TSX".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..LanguageMatcher::default() }) .into(), diff --git a/crates/editor/src/highlight_matching_bracket.rs b/crates/editor/src/highlight_matching_bracket.rs index a0b0ee37b98..ffc55b2b704 100644 --- a/crates/editor/src/highlight_matching_bracket.rs +++ b/crates/editor/src/highlight_matching_bracket.rs @@ -100,7 +100,7 @@ mod tests { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs index d9a0e2a564b..7a819c46a6d 100644 --- a/crates/editor/src/inlays/inlay_hints.rs +++ b/crates/editor/src/inlays/inlay_hints.rs @@ -1800,7 +1800,7 @@ pub mod tests { LanguageConfig { name: name.into(), matcher: (LanguageMatcher { - path_suffixes: vec![path_suffix.to_string()], + path_suffixes: vec![path_suffix.into()], ..Default::default() }) .into(), @@ -5418,7 +5418,7 @@ let c = 3;"# LanguageConfig { name: name.into(), matcher: (LanguageMatcher { - path_suffixes: vec![path_suffix.to_string()], + path_suffixes: vec![path_suffix.into()], ..Default::default() }) .into(), diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs index 7d08be60167..2f5d70e1242 100644 --- a/crates/editor/src/test/editor_lsp_test_context.rs +++ b/crates/editor/src/test/editor_lsp_test_context.rs @@ -188,7 +188,7 @@ impl EditorLspTestContext { LanguageConfig { name: "Typescript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }).into(), brackets: language::BracketPairConfig { @@ -293,7 +293,7 @@ impl EditorLspTestContext { LanguageConfig { name: "TSX".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..Default::default() }).into(), brackets: language::BracketPairConfig { diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs index 6fe06507881..4a5e4c067a4 100644 --- a/crates/extension_host/src/extension_store_test.rs +++ b/crates/extension_host/src/extension_store_test.rs @@ -3573,7 +3573,7 @@ async fn test_extension_cannot_shadow_language_registered_outside_extensions( language_registry.register_test_language(LanguageConfig { name: LanguageName::new("Shared"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["builtin".to_string()], + path_suffixes: vec!["builtin".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -3650,7 +3650,7 @@ languages = ["languages/shared"] language_registry.register_test_language(LanguageConfig { name: LanguageName::new("Shared"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["builtin".to_string()], + path_suffixes: vec!["builtin".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() diff --git a/crates/extensions_ui/src/extension_suggestions.rs b/crates/extensions_ui/src/extension_suggestions.rs index a32ec0ff777..9080c5297d2 100644 --- a/crates/extensions_ui/src/extension_suggestions.rs +++ b/crates/extensions_ui/src/extension_suggestions.rs @@ -877,7 +877,7 @@ mod tests { LanguageConfig { name: name.into(), matcher: LanguageMatcher { - path_suffixes: vec![path_suffix.to_string()], + path_suffixes: vec![path_suffix.into()], ..LanguageMatcher::default() } .into(), diff --git a/crates/json_schema_store/src/json_schema_store.rs b/crates/json_schema_store/src/json_schema_store.rs index 7cbd02e888d..6d16be04331 100644 --- a/crates/json_schema_store/src/json_schema_store.rs +++ b/crates/json_schema_store/src/json_schema_store.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, LazyLock}; use anyhow::{Context as _, Result}; use collections::HashMap; -use gpui::{App, AsyncApp, BorrowAppContext as _, Entity, Task, WeakEntity}; +use gpui::{App, AsyncApp, BorrowAppContext as _, Entity, SharedString, Task, WeakEntity}; use language::{ LanguageRegistry, LanguageServerName, LspAdapterDelegate, language_settings::AllLanguageSettings, @@ -418,13 +418,12 @@ pub fn all_schema_file_associations( .into_iter() .flatten() // Path suffixes can be entire file names or just their extensions. - .flat_map(|path_suffix| [format!("*.{path_suffix}"), path_suffix]); + .flat_map(|path_suffix| [format!("*.{path_suffix}").into(), path_suffix]); let override_globs = AllLanguageSettings::get(path, cx) .file_types .get(JSONC_LANGUAGE_NAME) .into_iter() - .flat_map(|(_, glob_strings)| glob_strings) - .cloned(); + .flat_map(|(_, glob_strings)| glob_strings.iter().map(SharedString::from)); let jsonc_globs = extension_globs.chain(override_globs).collect::>(); let mut file_associations = serde_json::json!([ diff --git a/crates/language/src/available_languages.rs b/crates/language/src/available_languages.rs index 1f783ba0909..a740c64d388 100644 --- a/crates/language/src/available_languages.rs +++ b/crates/language/src/available_languages.rs @@ -1,6 +1,7 @@ use crate::{LanguageId, LanguageLoader, LanguageMatcher, LanguageName, ManifestName}; use collections::FxHashMap; use globset::GlobSet; +use gpui::SharedString; use smallvec::SmallVec; use std::{cell::LazyCell, path::Path, sync::Arc}; use sum_tree::Bias; @@ -262,19 +263,20 @@ impl AvailableLanguages { self.find_best_match(move |language_name, matcher, current_best_match| { let path_matches_default_suffix = || { - let len = - matcher - .path_suffixes - .iter() - .fold(0, |acc: usize, path_suffix: &String| { - let ext = ".".to_string() + path_suffix; - let matched_suffix_len = path_suffixes - .iter() - .find(|(suffix, _)| suffix.ends_with(&ext) || suffix == path_suffix) - .map(|(suffix, _)| suffix.len()); + let len = matcher.path_suffixes.iter().fold( + 0, + |acc: usize, path_suffix: &SharedString| { + let ext = ".".to_string() + path_suffix; + let matched_suffix_len = path_suffixes + .iter() + .find(|(suffix, _)| { + suffix.ends_with(&ext) || *suffix == path_suffix.as_str() + }) + .map(|(suffix, _)| suffix.len()); - matched_suffix_len.map_or(acc, |len| acc.max(len)) - }); + matched_suffix_len.map_or(acc, |len| acc.max(len)) + }, + ); (len > 0).then_some(len) }; diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs index 1f4f1348da8..28ffa826c70 100644 --- a/crates/language/src/buffer_tests.rs +++ b/crates/language/src/buffer_tests.rs @@ -155,7 +155,7 @@ fn test_select_language(cx: &mut App) { LanguageConfig { name: LanguageName::new_static("Rust"), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -167,7 +167,7 @@ fn test_select_language(cx: &mut App) { LanguageConfig { name: "Rust with longer extension".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["longer.rs".to_string()], + path_suffixes: vec!["longer.rs".into()], ..Default::default() }) .into(), @@ -179,7 +179,7 @@ fn test_select_language(cx: &mut App) { LanguageConfig { name: LanguageName::new_static("Make"), matcher: (LanguageMatcher { - path_suffixes: vec!["Makefile".to_string(), "mk".to_string()], + path_suffixes: vec!["Makefile".into(), "mk".into()], ..Default::default() }) .into(), @@ -304,7 +304,7 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) LanguageConfig { name: "JavaScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["js".to_string()], + path_suffixes: vec!["js".into()], ..Default::default() }) .into(), @@ -313,7 +313,7 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string(), "ts.ecmascript".to_string()], + path_suffixes: vec!["ts".into(), "ts.ecmascript".into()], ..Default::default() }) .into(), @@ -322,7 +322,7 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) LanguageConfig { name: "C++".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["cpp".to_string()], + path_suffixes: vec!["cpp".into()], ..Default::default() }) .into(), @@ -331,7 +331,7 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) LanguageConfig { name: "C".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["c".to_string()], + path_suffixes: vec!["c".into()], ..Default::default() }) .into(), @@ -340,7 +340,7 @@ async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) LanguageConfig { name: "Dockerfile".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["Dockerfile".to_string()], + path_suffixes: vec!["Dockerfile".into()], ..Default::default() }) .into(), @@ -407,7 +407,7 @@ async fn test_reregistering_language_during_load_yields_current_language(cx: &mu let stale_config = LanguageConfig { name: LanguageName::new_static("TheLanguage"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["stale".to_string()], + path_suffixes: vec!["stale".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -446,7 +446,7 @@ async fn test_reregistering_language_during_load_yields_current_language(cx: &mu registry.register_test_language(LanguageConfig { name: LanguageName::new_static("TheLanguage"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["fresh".to_string()], + path_suffixes: vec!["fresh".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -473,7 +473,7 @@ async fn test_reregistering_language_during_failed_load_yields_current_language( LanguageName::new_static("TheLanguage"), None, Arc::new(LanguageMatcher { - path_suffixes: vec!["stale".to_string()], + path_suffixes: vec!["stale".into()], ..LanguageMatcher::default() }), false, @@ -499,7 +499,7 @@ async fn test_reregistering_language_during_failed_load_yields_current_language( registry.register_test_language(LanguageConfig { name: LanguageName::new_static("TheLanguage"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["fresh".to_string()], + path_suffixes: vec!["fresh".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -527,7 +527,7 @@ async fn test_extension_grammar_cannot_shadow_native_grammar(cx: &mut TestAppCon name: LanguageName::new_static("TheLanguage"), grammar: Some(Arc::from("rust")), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["the".to_string()], + path_suffixes: vec!["the".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -1374,7 +1374,7 @@ fn test_text_objects_with_has_parent_predicate(cx: &mut App) { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -1424,7 +1424,7 @@ fn test_text_objects_with_not_has_parent_predicate(cx: &mut App) { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -4990,7 +4990,7 @@ fn ruby_lang() -> Language { LanguageConfig { name: "Ruby".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rb".to_string()], + path_suffixes: vec!["rb".into()], ..Default::default() }) .into(), @@ -5047,7 +5047,7 @@ fn erb_lang() -> Language { LanguageConfig { name: "HTML+ERB".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["erb".to_string()], + path_suffixes: vec!["erb".into()], ..Default::default() }) .into(), diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index 3e6143efa5f..dd299c0381f 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -38,7 +38,7 @@ use collections::{HashMap, HashSet}; use futures::Future; use futures::future::LocalBoxFuture; use futures::lock::OwnedMutexGuard; -use gpui::{App, AsyncApp, Entity, EntityId}; +use gpui::{App, AsyncApp, Entity, EntityId, SharedString}; use http_client::HttpClient; pub use language_core::{ @@ -175,9 +175,12 @@ pub static PLAIN_TEXT: LazyLock> = LazyLock::new(|| { soft_wrap: Some(SoftWrap::EditorWidth), autoclose_before: ")]}".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["txt".to_owned()], + path_suffixes: vec![SharedString::new_static("txt")], first_line_pattern: None, - modeline_aliases: vec!["text".to_owned(), "txt".to_owned()], + modeline_aliases: vec![ + SharedString::new_static("text"), + SharedString::new_static("txt"), + ], }) .into(), brackets: BracketPairConfig { @@ -1222,7 +1225,7 @@ impl Language { } } - pub fn path_suffixes(&self) -> &[String] { + pub fn path_suffixes(&self) -> &[SharedString] { &self.config.matcher.path_suffixes } @@ -1277,7 +1280,7 @@ pub fn build_highlight_map(capture_names: &[&str], theme: &SyntaxTheme) -> Highl } impl LanguageScope { - pub fn path_suffixes(&self) -> &[String] { + pub fn path_suffixes(&self) -> &[SharedString] { self.language.path_suffixes() } diff --git a/crates/language/src/runnable.rs b/crates/language/src/runnable.rs index 0dbdd4ba489..ff030227f3e 100644 --- a/crates/language/src/runnable.rs +++ b/crates/language/src/runnable.rs @@ -386,7 +386,7 @@ mod tests { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs index 4c57b38e6ff..c86338e7bf0 100644 --- a/crates/language/src/syntax_map/syntax_map_tests.rs +++ b/crates/language/src/syntax_map/syntax_map_tests.rs @@ -950,7 +950,7 @@ fn test_combined_injection_with_leading_content_layer_ordering(cx: &mut App) { LanguageConfig { name: LanguageName::new_static("Elixir"), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec![String::from("ex")], + path_suffixes: vec!["ex".into()], ..Default::default() }), ..LanguageConfig::default() @@ -1625,7 +1625,7 @@ fn html_lang() -> Language { LanguageConfig { name: "HTML".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["html".to_string()], + path_suffixes: vec!["html".into()], ..Default::default() }) .into(), @@ -1648,7 +1648,7 @@ fn ruby_lang() -> Language { LanguageConfig { name: "Ruby".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rb".to_string()], + path_suffixes: vec!["rb".into()], ..Default::default() }) .into(), @@ -1671,7 +1671,7 @@ fn erb_lang() -> Language { LanguageConfig { name: "ERB".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["erb".to_string()], + path_suffixes: vec!["erb".into()], ..Default::default() }) .into(), @@ -1762,7 +1762,7 @@ fn python_lang() -> Language { LanguageConfig { name: "Python".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["py".to_string()], + path_suffixes: vec!["py".into()], ..Default::default() }) .into(), diff --git a/crates/language_core/src/language_config.rs b/crates/language_core/src/language_config.rs index 6a0059f6846..9d88afd1dc6 100644 --- a/crates/language_core/src/language_config.rs +++ b/crates/language_core/src/language_config.rs @@ -232,7 +232,7 @@ pub struct TaskListConfig { pub struct LanguageMatcher { /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`. #[serde(default)] - pub path_suffixes: Vec, + pub path_suffixes: Vec, /// A regex pattern that determines whether the language should be assigned to a file or not. #[serde( default, @@ -245,7 +245,7 @@ pub struct LanguageMatcher { /// These are matched case-insensitively against the `mode` (emacs) or /// `filetype`/`ft` (vim) specified in the modeline. #[serde(default)] - pub modeline_aliases: Vec, + pub modeline_aliases: Vec, } impl Ord for LanguageMatcher { diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs index aaefb685098..084a2ce71eb 100644 --- a/crates/language_selector/src/language_selector.rs +++ b/crates/language_selector/src/language_selector.rs @@ -188,7 +188,9 @@ impl LanguageSelectorDelegate { matcher .path_suffixes .iter() - .find_map(|extension| file_icons::FileIcons::get_icon(Path::new(extension), cx)) + .find_map(|extension| { + file_icons::FileIcons::get_icon(Path::new(extension.as_str()), cx) + }) .map(Icon::from_path) .map(|icon| icon.color(Color::Muted)) } @@ -367,7 +369,7 @@ mod tests { LanguageConfig { name: language_name.into(), matcher: (LanguageMatcher { - path_suffixes: vec![path_suffix.to_string()], + path_suffixes: vec![path_suffix.into()], ..Default::default() }) .into(), diff --git a/crates/language_tools/src/lsp_log_view_tests.rs b/crates/language_tools/src/lsp_log_view_tests.rs index e0bf15f2c3a..4792b8d79d2 100644 --- a/crates/language_tools/src/lsp_log_view_tests.rs +++ b/crates/language_tools/src/lsp_log_view_tests.rs @@ -812,7 +812,7 @@ async fn test_lsp_log_view(cx: &mut TestAppContext) { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs index a449ae34fe8..cd3d1f09e28 100644 --- a/crates/languages/src/lib.rs +++ b/crates/languages/src/lib.rs @@ -43,7 +43,7 @@ pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock> = name: "Git Commit".into(), soft_wrap: Some(language::SoftWrap::EditorWidth), matcher: (LanguageMatcher { - path_suffixes: vec!["COMMIT_EDITMSG".to_owned()], + path_suffixes: vec!["COMMIT_EDITMSG".into()], first_line_pattern: None, ..LanguageMatcher::default() }) diff --git a/crates/lsp_command_selector/src/lsp_command_selector.rs b/crates/lsp_command_selector/src/lsp_command_selector.rs index f1b053d442e..78d0a21d508 100644 --- a/crates/lsp_command_selector/src/lsp_command_selector.rs +++ b/crates/lsp_command_selector/src/lsp_command_selector.rs @@ -1052,7 +1052,7 @@ mod tests { LanguageConfig { name: "Markdown".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["md".to_string()], + path_suffixes: vec!["md".into()], ..LanguageMatcher::default() }) .into(), diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs index 2e57237610a..783f68d1b52 100644 --- a/crates/markdown/src/markdown.rs +++ b/crates/markdown/src/markdown.rs @@ -6910,7 +6910,7 @@ mod tests { LanguageConfig { name: "JavaScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["js".to_string()], + path_suffixes: vec!["js".into()], ..Default::default() }) .into(), diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs index 517151007a7..20064c0783f 100644 --- a/crates/markdown_preview/src/markdown_preview_view.rs +++ b/crates/markdown_preview/src/markdown_preview_view.rs @@ -4466,7 +4466,7 @@ mod tests { language::LanguageConfig { name: "Markdown".into(), matcher: Arc::new(language::LanguageMatcher { - path_suffixes: vec!["md".to_string(), "markdown".to_string()], + path_suffixes: vec!["md".into(), "markdown".into()], ..Default::default() }), ..Default::default() diff --git a/crates/prettier/src/prettier.rs b/crates/prettier/src/prettier.rs index be4b35a6450..525cd3f1bef 100644 --- a/crates/prettier/src/prettier.rs +++ b/crates/prettier/src/prettier.rs @@ -606,11 +606,13 @@ fn prettier_parser_name( parser } else if let (Some(buffer_language), Some(buffer_path)) = (buffer_language, buffer_path) && buffer_path.extension().is_some_and(|extension| { + let extension = extension.to_string_lossy(); !buffer_language .config() .matcher .path_suffixes - .contains(&extension.to_string_lossy().into_owned()) + .iter() + .any(|suffix| suffix.as_str() == extension) }) { buffer_language.prettier_parser_name() diff --git a/crates/project/tests/integration/project_tests.rs b/crates/project/tests/integration/project_tests.rs index 75d2b5ac904..c8bba3142d7 100644 --- a/crates/project/tests/integration/project_tests.rs +++ b/crates/project/tests/integration/project_tests.rs @@ -3478,7 +3478,7 @@ async fn test_registry_reload_detaches_buffers_from_language_servers( language_registry.register_test_language(LanguageConfig { name: "Rust".into(), matcher: Arc::new(LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..LanguageMatcher::default() }), ..LanguageConfig::default() @@ -19977,7 +19977,7 @@ fn json_lang() -> Arc { LanguageConfig { name: "JSON".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["json".to_string()], + path_suffixes: vec!["json".into()], ..Default::default() }) .into(), @@ -19992,7 +19992,7 @@ fn js_lang() -> Arc { LanguageConfig { name: "JavaScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["js".to_string()], + path_suffixes: vec!["js".into()], ..Default::default() }) .into(), @@ -20061,7 +20061,7 @@ fn python_lang(fs: Arc) -> Arc { LanguageConfig { name: "Python".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["py".to_string()], + path_suffixes: vec!["py".into()], ..Default::default() }) .into(), @@ -20081,7 +20081,7 @@ fn typescript_lang() -> Arc { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..Default::default() }) .into(), @@ -20096,7 +20096,7 @@ fn tsx_lang() -> Arc { LanguageConfig { name: "tsx".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["tsx".to_string()], + path_suffixes: vec!["tsx".into()], ..Default::default() }) .into(), diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs index 5f6b4e50dbc..9d5416c1b8c 100644 --- a/crates/project_symbols/src/project_symbols.rs +++ b/crates/project_symbols/src/project_symbols.rs @@ -366,7 +366,7 @@ mod tests { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), @@ -520,7 +520,7 @@ mod tests { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..Default::default() }) .into(), diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rs index 75c059d9524..70b41f1975f 100644 --- a/crates/repl/src/repl_sessions_ui.rs +++ b/crates/repl/src/repl_sessions_ui.rs @@ -399,7 +399,7 @@ mod tests { LanguageConfig { name: "Python".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["py".to_string()], + path_suffixes: vec!["py".into()], ..Default::default() }) .into(), diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs index fddfe7d89db..31715b5b5cb 100644 --- a/crates/snippets_ui/src/snippets_ui.rs +++ b/crates/snippets_ui/src/snippets_ui.rs @@ -189,7 +189,7 @@ impl ScopeSelectorDelegate { matcher .path_suffixes .iter() - .find_map(|extension| FileIcons::get_icon(Path::new(extension), cx)) + .find_map(|extension| FileIcons::get_icon(Path::new(extension.as_str()), cx)) .or(FileIcons::get(cx).get_icon_for_type("default", cx)) .map(Icon::from_path) .map(|icon| icon.color(Color::Muted)) diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs index a4f3c241a17..0b00224d3a0 100644 --- a/crates/tasks_ui/src/modal.rs +++ b/crates/tasks_ui/src/modal.rs @@ -1053,7 +1053,7 @@ mod tests { LanguageConfig { name: "Test".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["test".to_string()], + path_suffixes: vec!["test".into()], ..LanguageMatcher::default() }) .into(), @@ -1136,7 +1136,7 @@ mod tests { LanguageConfig { name: "TypeScript".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["ts".to_string()], + path_suffixes: vec!["ts".into()], ..LanguageMatcher::default() }) .into(), @@ -1169,7 +1169,7 @@ mod tests { LanguageConfig { name: "Rust".into(), matcher: (LanguageMatcher { - path_suffixes: vec!["rs".to_string()], + path_suffixes: vec!["rs".into()], ..LanguageMatcher::default() }) .into(),