Add glob to match filetype

crates/language/src/language_registry.rs

@@ -14,6 +14,7 @@ use futures::{
  future::Shared,
  Future, FutureExt as _,
 };
+use globset::GlobSet;
 use gpui::{AppContext, BackgroundExecutor, Task};
 use lsp::LanguageServerId;
 use parking_lot::{Mutex, RwLock};
@@ -453,7 +454,7 @@ impl LanguageRegistry {
  self.language_for_file_internal(
  &file.full_path(cx),
  content,
- Some(&user_file_types.file_types),
+ user_file_types.file_types.as_ref(),
  )
  }
 
@@ -469,12 +470,11 @@ impl LanguageRegistry {
  self: &Arc<Self>,
  path: &Path,
  content: Option<&Rope>,
- user_file_types: Option<&HashMap<Arc<str>, Vec<String>>>,
+ user_file_types: Option<&HashMap<Arc<str>, GlobSet>>,
  ) -> impl Future<Output = Result<Arc<Language>>> {
  let filename = path.file_name().and_then(|name| name.to_str());
  let extension = path.extension_or_hidden_file_name();
  let path_suffixes = [extension, filename];
- let empty = Vec::new();
 
  let rx = self.get_or_load_language(move |language_name, config| {
  let path_matches_default_suffix = config
@@ -483,9 +483,11 @@ impl LanguageRegistry {
  .any(|suffix| path_suffixes.contains(&Some(suffix.as_str())));
  let path_matches_custom_suffix = user_file_types
  .and_then(|types| types.get(language_name))
- .unwrap_or(&empty)
- .iter()
- .any(|suffix| path_suffixes.contains(&Some(suffix.as_str())));
+ .map_or(false, |globset| {
+ path_suffixes
+ .iter()
+ .any(|&suffix| suffix.map_or(false, |suffix| globset.is_match(suffix)))
+ });
  let content_matches = content.zip(config.first_line_pattern.as_ref()).map_or(
  false,
  |(content, pattern)| {

crates/language/src/language_settings.rs

@@ -3,7 +3,7 @@
 use crate::{File, Language, LanguageServerName};
 use anyhow::Result;
 use collections::{HashMap, HashSet};
-use globset::GlobMatcher;
+use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
 use gpui::AppContext;
 use itertools::{Either, Itertools};
 use schemars::{
@@ -54,7 +54,7 @@ pub struct AllLanguageSettings {
  pub copilot: CopilotSettings,
  defaults: LanguageSettings,
  languages: HashMap<Arc<str>, LanguageSettings>,
- pub(crate) file_types: HashMap<Arc<str>, Vec<String>>,
+ pub(crate) file_types: Option<HashMap<Arc<str>, GlobSet>>,
 }
 
 /// The settings for a particular language.
@@ -563,7 +563,7 @@ impl settings::Settings for AllLanguageSettings {
  .and_then(|c| c.disabled_globs.as_ref())
  .ok_or_else(Self::missing_default)?;
 
- let mut file_types: HashMap<Arc<str>, Vec<String>> = HashMap::default();
+ let mut file_types: Option<HashMap<Arc<str>, GlobSet>> = Some(HashMap::default());
  for user_settings in sources.customizations() {
  if let Some(copilot) = user_settings.features.as_ref().and_then(|f| f.copilot) {
  copilot_enabled = copilot;
@@ -594,10 +594,14 @@ impl settings::Settings for AllLanguageSettings {
  }
 
  for (language, suffixes) in &user_settings.file_types {
+ let mut builder = GlobSetBuilder::new();
+ for suffix in suffixes {
+ builder.add(Glob::new(suffix)?);
+ }
  file_types
- .entry(language.clone())
- .or_default()
- .extend_from_slice(suffixes);
+ .as_mut()
+ .unwrap()
+ .insert(language.clone(), builder.build()?);
  }
  }