dd0b15e · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

syntax: Properly handle injection-regex for language injections

dd0b15eBlaž Hrastnik5 years ago

helix-core/src/syntax.rs+35−1

compare with master

unifiedsplit

@@ -21,6 +21,15 @@ use std::{

21use once_cell::sync::{Lazy, OnceCell};

22use serde::{Deserialize, Serialize};

24+fn deserialize_regex<'de, D>(deserializer: D) -> Result<Option<Regex>, D::Error>

25+where

26+ D: serde::Deserializer<'de>,

27+{

28+ Option::<String>::deserialize(deserializer)?

29+ .map(|buf| Regex::new(&buf).map_err(serde::de::Error::custom))

30+ .transpose()

31+}

32+

24#[derive(Debug, Serialize, Deserialize)]

33#[derive(Debug, Serialize, Deserialize)]

25pub struct Configuration {

34pub struct Configuration {

26 pub language: Vec<LanguageConfiguration>,

35 pub language: Vec<LanguageConfiguration>,

@@ -42,7 +51,8 @@ pub struct LanguageConfiguration {

42 pub auto_format: bool,

51 pub auto_format: bool,

44 // content_regex

53 // content_regex

54+ #[serde(default, skip_serializing, deserialize_with = "deserialize_regex")]

45− // injection_regex

55+ injection_regex: Option<Regex>,

46 // first_line_regex

56 // first_line_regex

47 //

57 //

48 #[serde(skip)]

58 #[serde(skip)]

@@ -243,6 +253,30 @@ impl Loader {

243 .cloned()

253 .cloned()

244 }

254 }

245

255

256+ pub fn language_configuration_for_injection_string(

257+ &self,

258+ string: &str,

259+ ) -> Option<Arc<LanguageConfiguration>> {

260+ let mut best_match_length = 0;

261+ let mut best_match_position = None;

262+ for (i, configuration) in self.language_configs.iter().enumerate() {

263+ if let Some(injection_regex) = &configuration.injection_regex {

264+ if let Some(mat) = injection_regex.find(string) {

265+ let length = mat.end() - mat.start();

266+ if length > best_match_length {

267+ best_match_position = Some(i);

268+ best_match_length = length;

269+ }

270+ }

271+ }

272+ }

273+

274+ if let Some(i) = best_match_position {

275+ let configuration = &self.language_configs[i];

276+ return Some(configuration.clone());

277+ }

278+ None

279+ }

246 pub fn language_configs_iter(&self) -> impl Iterator<Item = &Arc<LanguageConfiguration>> {

280 pub fn language_configs_iter(&self) -> impl Iterator<Item = &Arc<LanguageConfiguration>> {

247 self.language_configs.iter()

281 self.language_configs.iter()

248 }

282 }

helix-term/src/ui/editor.rs+1−2

@@ -147,8 +147,7 @@ impl EditorView {

147 let scopes = theme.scopes();

148 syntax

149 .highlight_iter(text.slice(..), Some(range), None, |language| {

150− loader

150+ loader.language_configuration_for_injection_string(language)

151− .language_config_for_scope(&format!("source.{}", language))

152 .and_then(|language_config| {

151 .and_then(|language_config| {

153 let config = language_config.highlight_config(scopes)?;

152 let config = language_config.highlight_config(scopes)?;

154 let config_ref = config.as_ref();

153 let config_ref = config.as_ref();

helix-term/src/ui/markdown.rs+1−1

@@ -88,7 +88,7 @@ fn parse<'a>(

88 if let Some(theme) = theme {

89 let rope = Rope::from(text.as_ref());

90 let syntax = loader

91− .language_config_for_scope(&format!("source.{}", language))

91+ .language_configuration_for_injection_string(language)

92 .and_then(|config| config.highlight_config(theme.scopes()))

93 .map(|config| Syntax::new(&rope, config));