aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Jakobi <marc.jakobi@tiko.energy>2023-11-19 01:02:29 +0100
committerGitHub <noreply@github.com>2023-11-18 19:02:29 -0500
commit5240574bcbd5e3ad793b96b3766693c2bc5c86a9 (patch)
tree4b9bb8f4cfb2c061ef14d2761be9e5f47c5eb707
parentUpdate parsers: hcl, terraform, wing (diff)
downloadnvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar.gz
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar.bz2
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar.lz
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar.xz
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.tar.zst
nvim-treesitter-5240574bcbd5e3ad793b96b3766693c2bc5c86a9.zip
feat(haskell): tweak highlights
* add cases for `qualified_variable` * add function defined in terms of composition
-rw-r--r--queries/haskell/highlights.scm10
-rw-r--r--tests/query/highlights/haskell/test.hs5
2 files changed, 14 insertions, 1 deletions
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index bf9692136..1fea39b08 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -173,6 +173,7 @@
(exp_name
[(constructor)
(variable)
+ (qualified_variable)
]))
(quasiquote)
((exp_name) . (operator))
@@ -186,6 +187,7 @@
(exp_name
[(constructor)
(variable)
+ (qualified_variable)
]))
(quasiquote)
((exp_name) . (operator))
@@ -293,6 +295,12 @@
])
(#any-of? @_op "." ">>>" "***" ">=>" "<=<" ))
+; function defined in terms of a function composition
+(function
+ name: (variable) @function
+ rhs: (exp_infix (_) . (operator) @_op . (_)
+ (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+
(exp_apply (exp_name
[
((variable) @function.call)
@@ -325,7 +333,7 @@
. (variable) @variable
. [
(exp_record)
- (exp_name (variable))
+ (exp_name [(variable) (qualified_variable)])
(exp_list)
(exp_tuple)
(exp_cond)
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index cd5db435e..bf7e939a0 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -171,6 +171,8 @@ someIOaction = do
gunc x y = func x $ y + 7
-- ^ @variable
-- ^ @variable
+ valueFromList = HashSet.fromList []
+ -- ^ @variable
when foo $ putStrLn $ T.showt =<< bar
-- ^ @function.call
-- ^ @variable
@@ -325,3 +327,6 @@ lambdaAlias _ _ _ = undefined
spec :: Spec
spec = describe "test ns" $ it "test case" pending
-- ^ @variable
+
+composed = f . g
+-- ^ @function