add data, newtype, and typeclass instances to Haskell jumper

BrianHicks · Jun 14, 2021 · 4afb8dc · 4afb8dc
1 parent 777344f
commit 4afb8dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkgs/kak-tree-grepper/rc/kak-tree-grepper.kak b/pkgs/kak-tree-grepper/rc/kak-tree-grepper.kak
@@ -68,7 +68,7 @@ define-command -override -docstring "jump somewhere in an Haskell file's definit
         # do the magic!
         # note: tree-sitter-haskell doesn't distinguish between imports and
         # import-hidings, so we just show the entire import statements.
-        QUERY="(import)@import (signature)@signature (function name: (_)@function) (pat_name (_)@name)"
+        QUERY="(import)@import (signature)@signature (function name: (_)@function) (pat_name (_)@name) (adt (type)@data) (data_constructor)@constructor (newtype (type)@newtype) (newtype_constructor)@constructor (instance_head)@instance"
 
         EDIT_LOCATION="$("$TREE_GREPPER" --language haskell "$QUERY" "$FILE" | fzf --with-nth 4.. --nth 2,1 --delimiter=: --query "$FZF_QUERY" --select-1 | cut -d : -f 1-3 | tr : ' ')"
         printf "evaluate-commands -client %s edit %s\n" "$CLIENT" "$EDIT_LOCATION" | indiekak -p "$SESSION"

diff --git a/sample-projects/haskell/Main.hs b/sample-projects/haskell/Main.hs
@@ -52,3 +52,10 @@ functionWithArgs a b = a ++ b
 lambdaWithArgs :: String -> String -> String
 -- (function name: (variable) rhs: (exp_lambda (pat_name (variable)) (pat_name (variable)) (exp_infix (exp_name (variable)) (operator) (exp_name (variable))))))
 lambdaWithArgs = \a b -> a ++ b
+
+data Union = Ctor1 Int | Ctor2 String
+
+newtype Thing = Thing String
+
+instance Show Thing where
+  show (Thing inner) = inner