aboutsummaryrefslogtreecommitdiff
path: root/runtime/queries/julia
diff options
context:
space:
mode:
authorChristoph Horn2022-08-24 08:32:08 +0000
committerMichael Davis2022-08-24 16:55:47 +0000
commit26b2f0a1b5a1bb6cd83f16f6019d903312999bb9 (patch)
treee0a6ca3d54c9d563a404d82626e8138e1f5ab130 /runtime/queries/julia
parent5806db1e5cd52897bf0cda4421629eec207a621c (diff)
Julia queries: prevent constructors to be highlighted as functions
Also improves the captures of the remaining identifiers.
Diffstat (limited to 'runtime/queries/julia')
-rw-r--r--runtime/queries/julia/highlights.scm56
1 files changed, 37 insertions, 19 deletions
diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
index c4f6999a..9271615f 100644
--- a/runtime/queries/julia/highlights.scm
+++ b/runtime/queries/julia/highlights.scm
@@ -85,8 +85,11 @@
; Function definition
; -------------------
-(function_definition
- name: (identifier) @function)
+(
+ (function_definition
+ name: (identifier) @function)
+ ; prevent constructors (PascalCase) to be highlighted as functions
+ (#match? @function "^[^A-Z]"))
(parameter_list
(identifier) @variable.parameter)
@@ -108,17 +111,26 @@
; Functions calls
; ---------------
-(call_expression
- (identifier) @function)
+(
+ (call_expression
+ (identifier) @function)
+ ; prevent constructors (PascalCase) to be highlighted as functions
+ (#match? @function "^[^A-Z]"))
-(broadcast_call_expression
- (identifier) @function)
+(
+ (broadcast_call_expression
+ (identifier) @function)
+ (#match? @function "^[^A-Z]"))
-(call_expression
- (field_expression (identifier) @function .))
+(
+ (call_expression
+ (field_expression (identifier) @function .))
+ (#match? @function "^[^A-Z]"))
-(broadcast_call_expression
- (field_expression (identifier) @function .))
+(
+ (broadcast_call_expression
+ (field_expression (identifier) @function .))
+ (#match? @function "^[^A-Z]"))
; ------
; Macros
@@ -228,19 +240,25 @@
; Remaining identifiers
; ---------------------
-; could also be namespace but this should cover the majority
-(field_expression
- . (_)
- (identifier) @variable.other.member)
-
(const_statement
(variable_declaration
. (identifier) @constant))
-((identifier) @type
- (match? @type "([A-Z][a-z0-9]+)+$"))
+; SCREAMING_SNAKE_CASE
+(
+ (identifier) @constant
+ (match? @constant "^[A-Z][A-Z0-9_]*$"))
-((identifier) @constant
- (match? @constant "^[A-Z][A-Z0-9_]+$"))
+; remaining identifiers that start with capital letters should be types (PascalCase)
+(
+ (identifier) @type
+ (match? @type "^[A-Z]"))
+
+; Field expressions are either module content or struct fields.
+; Module types and constants should already be captured, so this
+; assumes the remaining identifiers to be struct fields.
+(field_expression
+ (_)
+ (identifier) @variable.other.member)
(identifier) @variable