4e877de · helix · git.iko.soy

on master help sign in

Fix Golang textobject queries (#2153)

4e877deMichael Davis5 years ago

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

@@ -413,7 +413,9 @@ impl LanguageConfiguration {

413 let lang_name = self.language_id.to_ascii_lowercase();

414 let query_text = read_query(&lang_name, "textobjects.scm");

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

416− let query = Query::new(lang, &query_text).ok()?;

416+ let query = Query::new(lang, &query_text)

417+ .map_err(|e| log::error!("Failed to parse textobjects.scm queries: {}", e))

418+ .ok()?;

417 Some(TextObjectQuery { query })

419 Some(TextObjectQuery { query })

418 })

420 })

419 .as_ref()

421 .as_ref()

runtime/queries/go/textobjects.scm+1−1

@@ -12,7 +12,7 @@

12 (type_spec (type_identifier) (struct_type (field_declaration_list (_)?) @class.inside))) @class.around

14(type_declaration

15− (type_spec (type_identifier) (interface_type (method_spec_list (_)?) @class.inside))) @class.around

15+ (type_spec (type_identifier) (interface_type (method_spec)+ @class.inside))) @class.around

17(parameter_list

18 (_) @parameter.inside)