mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 03:47:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

perf(syntax): short-circuit if name matches language_id (#12407)

Browse source
This commit is contained in:
RoloEdits 2025-01-23 15:49:14 -08:00 • committed by GitHub
parent 151caeacc6
commit 4ded712dbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
helix-core/src/syntax.rs
View file

@ -994,16 +994,27 @@ impl Loader {
.cloned() .cloned()
} }
pub fn language_config_for_language_id(&self, id: &str) -> Option<Arc<LanguageConfiguration>> { pub fn language_config_for_language_id(
&self,
id: impl PartialEq<String>,
) -> Option<Arc<LanguageConfiguration>> {
self.language_configs self.language_configs
.iter() .iter()
.find(|config| config.language_id == id) .find(|config| id.eq(&config.language_id))
.cloned() .cloned()
} }
/// Unlike language_config_for_language_id, which only returns Some for an exact id, this /// Unlike `language_config_for_language_id`, which only returns Some for an exact id, this
/// function will perform a regex match on the given string to find the closest language match. /// function will perform a regex match on the given string to find the closest language match.
pub fn language_config_for_name(&self, slice: RopeSlice) -> Option<Arc<LanguageConfiguration>> { pub fn language_config_for_name(&self, slice: RopeSlice) -> Option<Arc<LanguageConfiguration>> {
// PERF: If the name matches up with the id, then this saves the need to do expensive regex.
let shortcircuit = self.language_config_for_language_id(slice);
if shortcircuit.is_some() {
return shortcircuit;
}
// If the name did not match up with a known id, then match on injection regex.
let mut best_match_length = 0; let mut best_match_length = 0;
let mut best_match_position = None; let mut best_match_position = None;
for (i, configuration) in self.language_configs.iter().enumerate() { for (i, configuration) in self.language_configs.iter().enumerate() {
@ -1026,7 +1037,7 @@ impl Loader {
capture: &InjectionLanguageMarker, capture: &InjectionLanguageMarker,
) -> Option<Arc<LanguageConfiguration>> { ) -> Option<Arc<LanguageConfiguration>> {
match capture { match capture {
InjectionLanguageMarker::LanguageId(id) => self.language_config_for_language_id(id), InjectionLanguageMarker::LanguageId(id) => self.language_config_for_language_id(*id),
InjectionLanguageMarker::Name(name) => self.language_config_for_name(*name), InjectionLanguageMarker::Name(name) => self.language_config_for_name(*name),
InjectionLanguageMarker::Filename(file) => { InjectionLanguageMarker::Filename(file) => {
let path_str: Cow<str> = (*file).into(); let path_str: Cow<str> = (*file).into();