79ef39a · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

syntax: Don't force lower-case for filenames (#4346)

79ef39aChristian Speich4 years ago

helix-core/src/syntax.rs+15−11

compare with master

unifiedsplit

@@ -361,14 +361,12 @@ pub fn read_query(language: &str, filename: &str) -> String {

361

362impl LanguageConfiguration {

363 fn initialize_highlight(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {

364− let language = self.language_id.to_ascii_lowercase();

365−

366− let highlights_query = read_query(&language, "highlights.scm");

364+ let highlights_query = read_query(&self.language_id, "highlights.scm");

367 // always highlight syntax errors

365 // always highlight syntax errors

368 // highlights_query += "\n(ERROR) @error";

366 // highlights_query += "\n(ERROR) @error";

369

367

370− let injections_query = read_query(&language, "injections.scm");

368+ let injections_query = read_query(&self.language_id, "injections.scm");

371− let locals_query = read_query(&language, "locals.scm");

369+ let locals_query = read_query(&self.language_id, "locals.scm");

372

370

373 if highlights_query.is_empty() {

371 if highlights_query.is_empty() {

374 None

372 None

@@ -432,14 +430,20 @@ impl LanguageConfiguration {

432 }

430 }

433

431

434 fn load_query(&self, kind: &str) -> Option<Query> {

432 fn load_query(&self, kind: &str) -> Option<Query> {

435− let lang_name = self.language_id.to_ascii_lowercase();

436− let query_text = read_query(&lang_name, kind);

433+ let query_text = read_query(&self.language_id, kind);

437 if query_text.is_empty() {

434 if query_text.is_empty() {

438 return None;

435 return None;

439 }

436 }

440 let lang = self.highlight_config.get()?.as_ref()?.language;

437 let lang = self.highlight_config.get()?.as_ref()?.language;

441 Query::new(lang, &query_text)

438 Query::new(lang, &query_text)

439+ .map_err(|e| {

440+ log::error!(

442− .map_err(|e| log::error!("Failed to parse {} queries for {}: {}", kind, lang_name, e))

441+ "Failed to parse {} queries for {}: {}",

442+ kind,

443+ self.language_id,

444+ e

445+ )

446+ })

443 .ok()

447 .ok()

444 }

448 }

445}

449}

@@ -2119,7 +2123,7 @@ mod test {

2119 );

2123 );

2120

2124

2121 let loader = Loader::new(Configuration { language: vec![] });

2125 let loader = Loader::new(Configuration { language: vec![] });

2122− let language = get_language("Rust").unwrap();

2126+ let language = get_language("rust").unwrap();

2123

2127

2124 let query = Query::new(language, query_str).unwrap();

2128 let query = Query::new(language, query_str).unwrap();

2125 let textobject = TextObjectQuery { query };

2129 let textobject = TextObjectQuery { query };

@@ -2179,7 +2183,7 @@ mod test {

2179

2183

2180 let loader = Loader::new(Configuration { language: vec![] });

2184 let loader = Loader::new(Configuration { language: vec![] });

2181

2185

2182− let language = get_language("Rust").unwrap();

2186+ let language = get_language("rust").unwrap();

2183 let config = HighlightConfiguration::new(

2187 let config = HighlightConfiguration::new(

2184 language,

2188 language,

2185 &std::fs::read_to_string("../runtime/grammars/sources/rust/queries/highlights.scm")

2189 &std::fs::read_to_string("../runtime/grammars/sources/rust/queries/highlights.scm")

@@ -2275,7 +2279,7 @@ mod test {

2275 let source = Rope::from_str(source);

2279 let source = Rope::from_str(source);

2276

2280

2277 let loader = Loader::new(Configuration { language: vec![] });

2281 let loader = Loader::new(Configuration { language: vec![] });

2278− let language = get_language("Rust").unwrap();

2282+ let language = get_language("rust").unwrap();

2279

2283

2280 let config = HighlightConfiguration::new(language, "", "", "").unwrap();

2284 let config = HighlightConfiguration::new(language, "", "", "").unwrap();

2281 let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));

2285 let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));

xtask/src/querycheck.rs+2−2

@@ -14,8 +14,8 @@ pub fn query_check() -> Result<(), DynError> {

14 ];

16 for language in lang_config().language {

17− let language_name = language.language_id.to_ascii_lowercase();

17+ let language_name = &language.language_id;

18− let grammar_name = language.grammar.unwrap_or(language.language_id);

18+ let grammar_name = language.grammar.as_ref().unwrap_or(language_name);

19 for query_file in query_files {

20 let language = get_language(&grammar_name);

21 let query_text = read_query(&language_name, query_file);