diff options
Diffstat (limited to 'queries/haskell/highlights.scm')
| -rw-r--r-- | queries/haskell/highlights.scm | 148 |
1 files changed, 86 insertions, 62 deletions
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm index ecd267cc4..bf9692136 100644 --- a/queries/haskell/highlights.scm +++ b/queries/haskell/highlights.scm @@ -163,46 +163,6 @@ (signature name: (variable) @function) -((signature name: (variable) @variable) - . (function - name: (variable) @_name - rhs: [ - (exp_literal) - (exp_apply - (exp_name - [(constructor) - (variable) - ])) - (quasiquote) - ((exp_name) . (operator)) - ]) - (#eq? @variable @_name)) - -((signature name: (variable) @variable) - . (function - name: (variable) @_name - rhs: (exp_infix - [ - (exp_literal) - (exp_apply - (exp_name - [(constructor) - (variable) - ])) - (quasiquote) - ((exp_name) . (operator)) - ])) - (#eq? @variable @_name)) - -((signature name: (variable) @function) - . (function - name: (variable) @_name - patterns: (patterns)) - (#eq? @function @_name)) - -;; For some reason, `(signature name: (variable) type: (fun))` doesn't work here -(signature (variable) @function . (fun)) - (function name: (variable) @function) (function @@ -231,18 +191,40 @@ ((exp_name) . (operator)) ])) +;; Consider signatures (and accompanying functions) +;; with only one value on the rhs as variables +(signature . (variable) @variable . (_) . ) +((signature . (variable) @_name . (_) . ) + . (function name: (variable) @variable) + (#eq? @_name @variable)) +;; but consider a type that involves 'IO' a function +(signature name: (variable) @function + . (type_apply (type_name) @_type) + (#eq? @_type "IO")) +((signature name: (variable) @_name + . (type_apply (type_name) @_type) + (#eq? @_type "IO")) + . (function name: (variable) @function) + (#eq? @_name @function)) + +;; functions with parameters +;; + accompanying signatures (function name: (variable) @function patterns: (patterns)) +((signature) @function + . (function + name: (variable) @function + patterns: (patterns))) (function name: (variable) @function rhs: (exp_lambda)) -((signature (variable) @function (fun)) . (function (variable))) -((signature (variable) @_type (fun)) . (function (variable) @function) (#eq? @function @_type)) -((signature (variable) @function (context (fun))) . (function (variable))) -((signature (variable) @_type (context (fun))) . (function (variable) @function) (#eq? @function @_type)) -((signature (variable) @function (forall (context (fun)))) . (function (variable))) -((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type)) + +; view patterns +(pat_view (exp_name [ + ((variable) @function.call) + (qualified_variable (variable) @function.call) +])) ; consider infix functions as operators (exp_infix [ @@ -253,11 +235,11 @@ (exp_section_right [ ((variable) @operator) (qualified_variable (variable) @operator) - ]) +]) (exp_section_left [ ((variable) @operator) (qualified_variable (variable) @operator) - ]) +]) ; function calls with an infix operator ; e.g. func <$> a <*> b @@ -272,9 +254,15 @@ . (operator)) ; infix operators applied to variables ((exp_name (variable) @variable) . (operator)) -((operator) . (exp_name (variable) @variable)) +((operator) . (exp_name [ + ((variable) @variable) + (qualified_variable (variable) @variable) +])) ; function calls with infix operators -((exp_name (variable) @function.call) . (operator) @_op +((exp_name [ + ((variable) @function.call) + (qualified_variable (variable) @function.call) + ]) . (operator) @_op (#any-of? @_op "$" "<$>" ">>=" "=<<")) ; right hand side of infix operator ((exp_infix @@ -284,7 +272,7 @@ (qualified_variable (variable) @function.call) ])) . (operator) @_op (#any-of? @_op "$" "<$>" "=<<")) -; function composition, arrows, monadic composition (rhs) +; function composition, arrows, monadic composition (lhs) ((exp_name [ ((variable) @function) (qualified_variable (variable) @function) @@ -310,22 +298,57 @@ ((variable) @function.call) (qualified_variable (variable) @function.call) ])) -(exp_apply [ - (exp_name [ - (variable) - (qualified_variable (variable)) - (constructor) - (qualified_constructor (constructor)) - ]) - (exp_type_application) - (exp_parens) - (exp_record) - ] + +; function compositions, in parentheses, applied +; lhs +(exp_apply + . (exp_parens (exp_infix + (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)]) + . (operator)))) +; rhs +(exp_apply + . (exp_parens (exp_infix + (operator) + . (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)]))) + ) + +;; variables being passed to a function call +(exp_apply (_)+ . (exp_name [ ((variable) @variable) (qualified_variable (variable) @variable) ])) +;; Consider functions with only one value on the rhs +;; as variables, e.g. x = Rec {} or x = foo +(function + . (variable) @variable + . [ + (exp_record) + (exp_name (variable)) + (exp_list) + (exp_tuple) + (exp_cond) + ] . ) + +;; main is always a function +;; (this prevents `main = undefined` from being highlighted as a variable) +(function name: (variable) @function (#eq? @function "main")) + +;; scoped function types (func :: a -> b) +(pat_typed + pattern: (pat_name (variable) @function) + type: (fun)) + +;; signatures that have a function type +;; + functions that follow them +((signature (variable) @function (fun))) +((signature (variable) @_type (fun)) . (function (variable) @function) (#eq? @function @_type)) +((signature (variable) @function (context (fun)))) +((signature (variable) @_type (context (fun))) . (function (variable) @function) (#eq? @function @_type)) +((signature (variable) @function (forall (context (fun)))) . (function (variable))) +((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type)) + ;; ---------------------------------------------------------------------------- ;; Types @@ -417,6 +440,7 @@ (pat_field (variable) @field) (exp_projection field: (variable) @field) (import_item (type) . (import_con_names (variable) @field)) +(exp_field field: [((variable) @field) (qualified_variable (variable) @field)]) ;; ---------------------------------------------------------------------------- |