mirror of
https://github.com/xHyroM/zed-discord-presence.git
synced 2024-11-09 16:08:06 +01:00
fix: dont panic if cant find language
This commit is contained in:
parent
458f93971f
commit
0810b2c79a
4 changed files with 8 additions and 8 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -124,7 +124,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "discord-presence-lsp"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
dependencies = [
|
||||
"discord-rich-presence",
|
||||
"git2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "discord-presence-lsp"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
|
|
@ -14,13 +14,13 @@ lazy_static! {
|
|||
};
|
||||
}
|
||||
|
||||
pub fn get_language(document: &Document) -> Option<String> {
|
||||
pub fn get_language(document: &Document) -> String {
|
||||
let map = LANGUAGE_MAP.lock().unwrap();
|
||||
let filename = document.get_filename().to_string();
|
||||
let extension = format!(".{}", document.get_extension());
|
||||
|
||||
if let Some(s) = map.get(&filename) {
|
||||
return Some(s.to_string());
|
||||
return s.to_string();
|
||||
}
|
||||
|
||||
for (pattern, language) in map.iter() {
|
||||
|
@ -31,14 +31,14 @@ pub fn get_language(document: &Document) -> Option<String> {
|
|||
|
||||
if let Ok(re) = Regex::new(pattern.unwrap()) {
|
||||
if re.is_match(&filename) || re.is_match(&extension) {
|
||||
return Some(language.to_string());
|
||||
return language.to_string();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(s) = map.get(&extension) {
|
||||
return Some(s.to_string());
|
||||
return s.to_string();
|
||||
}
|
||||
|
||||
map.get("text").map(|s| s.to_string())
|
||||
String::from("text")
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ impl<'a> Placeholders<'a> {
|
|||
Self {
|
||||
filename: doc.get_filename(),
|
||||
workspace,
|
||||
language: get_language(doc).unwrap(),
|
||||
language: get_language(doc),
|
||||
base_icons_url: &config.base_icons_url,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue