git.iko.soy/helix
on master help sign in
syntax: Add go & rust locals, improve tree-sitter error message
4ac2943Blaž Hrastnik
helix-core/src/syntax.rs+6−2
compare with master
unifiedsplit
@@ -144,8 +144,12 @@ impl LanguageConfiguration {
144 &highlights_query,
144 &highlights_query,
145 &injections_query,
145 &injections_query,
146 &locals_query,
146 &locals_query,
147− )
147+ );
148− .unwrap(); // TODO: no unwrap
148+
149+ let config = match config {
150+ Ok(config) => config,
151+ Err(err) => panic!("{}", err),
152+ }; // TODO: avoid panic
149 config.configure(scopes);
153 config.configure(scopes);
150 Some(Arc::new(config))
154 Some(Arc::new(config))
151 }
155 }
runtime/queries/go/highlights.scm+3−3
@@ -21,14 +21,14 @@
21(const_spec
21(const_spec
22 name: (identifier) @constant)
22 name: (identifier) @constant)
23
23
24+(parameter_declaration (identifier) @variable.parameter)
25+(variadic_parameter_declaration (identifier) @variable.parameter)
26+
24(type_identifier) @type
27(type_identifier) @type
25(field_identifier) @property
28(field_identifier) @property
26(identifier) @variable
29(identifier) @variable
27(package_identifier) @variable
30(package_identifier) @variable
28
31
29−(parameter_declaration (identifier) @variable.parameter)
30−(variadic_parameter_declaration (identifier) @variable.parameter)
31−
32
32
33; Operators
33; Operators
34
34
runtime/queries/go/locals.scmnew file+30
@@ -0,0 +1,30 @@
1+; Scopes
2+
3+(block) @local.scope
4+
5+; Definitions
6+
7+(parameter_declaration (identifier) @local.definition)
8+(variadic_parameter_declaration (identifier) @local.definition)
9+
10+(short_var_declaration
11+ left: (expression_list
12+ (identifier) @local.definition))
13+
14+(var_spec
15+ name: (identifier) @local.definition)
16+
17+(for_statement
18+ (range_clause
19+ left: (expression_list
20+ (identifier) @local.definition)))
21+
22+(const_declaration
23+ (const_spec
24+ name: (identifier) @local.definition))
25+
26+; References
27+
28+(identifier) @local.reference
29+(field_identifier) @local.reference
30+
runtime/queries/rust/locals.scmnew file+17
@@ -0,0 +1,17 @@
1+; Scopes
2+
3+(block) @local.scope
4+
5+; Definitions
6+
7+(parameter
8+ (identifier) @local.definition)
9+
10+(let_declaration
11+ pattern: (identifier) @local.definition)
12+
13+(closure_parameters (identifier)) @local.definition
14+
15+; References
16+(identifier) @local.reference
17+
theme.toml+1−1
@@ -9,7 +9,7 @@ special = "honey"
9property = "white"
9property = "white"
10variable = "lavender"
10variable = "lavender"
11# variable = "almond" # TODO: metavariables only
11# variable = "almond" # TODO: metavariables only
12−"variable.parameter" = "lavender"
12+"variable.parameter" = { fg = "lavender", modifiers = ["underlined"] }
13"variable.builtin" = "mint"
13"variable.builtin" = "mint"
14type = "white"
14type = "white"
15"type.builtin" = "white" # TODO: distinguish?
15"type.builtin" = "white" # TODO: distinguish?