From 7f814e5d99292598eb822397869f93de3b28ddda Mon Sep 17 00:00:00 2001 From: Jeetaditya Chatterjee Date: Sun, 3 Apr 2022 18:00:54 +0100 Subject: [PATCH] refactor(:lang): redo tree-sitter hooks - bind to major-mode-local-vars-hook instead of major mode hook - bind the autodef tree-sitter! instead of the functions. --- modules/lang/agda/config.el | 7 +++---- modules/lang/cc/config.el | 7 +++---- modules/lang/csharp/config.el | 4 +--- modules/lang/elm/config.el | 4 +--- modules/lang/go/config.el | 4 +--- modules/lang/java/config.el | 4 +--- modules/lang/javascript/config.el | 15 ++++++--------- modules/lang/json/config.el | 7 +++---- modules/lang/julia/config.el | 4 +--- modules/lang/ocaml/config.el | 4 +--- modules/lang/php/config.el | 4 +--- modules/lang/python/config.el | 4 +--- modules/lang/ruby/config.el | 4 +--- modules/lang/rust/config.el | 4 +--- modules/lang/scala/config.el | 4 +--- modules/lang/sh/config.el | 4 +--- modules/lang/swift/config.el | 4 +--- modules/lang/web/config.el | 9 ++++----- 18 files changed, 32 insertions(+), 65 deletions(-) diff --git a/modules/lang/agda/config.el b/modules/lang/agda/config.el index 5c543fb0b..2920abd54 100644 --- a/modules/lang/agda/config.el +++ b/modules/lang/agda/config.el @@ -41,7 +41,6 @@ ;; Tree Sitter (eval-when! (featurep! +tree-sitter) - (add-hook! '(agda-mode - agda2-mode) - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! '(agda-mode-local-vars-hook + agda2-mode-local-vars-hook) + #'tree-sitter!)) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 8a4ee6ff8..40fb8069e 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -307,7 +307,6 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! '(c-mode-hook - c++-mode-hook) - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! '(c-mode-local-vars-hook + c++-mode-local-vars-hook) + #'tree-sitter!)) diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index 83ffd232d..cdd4bb6fd 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -75,6 +75,4 @@ or terminating simple string." ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'csharp-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'csharp-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/elm/config.el b/modules/lang/elm/config.el index 803a553dd..df263a0d7 100644 --- a/modules/lang/elm/config.el +++ b/modules/lang/elm/config.el @@ -24,6 +24,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'elm-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'elm-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el index 33c025140..7231839b0 100644 --- a/modules/lang/go/config.el +++ b/modules/lang/go/config.el @@ -79,6 +79,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'go-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'go-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index 17e6f26f6..0b06a1e61 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -52,6 +52,4 @@ If the depth is 2, the first two directories are removed: net.lissner.game.") ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'java-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'java-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index cfbb25db1..280851cc5 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -324,12 +324,9 @@ to tide." ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! '(javascript-mode-hook - js-mode-hook - js2-mode-hook - js3-mode-hook - typescript-mode-hook - typescript-tsx-mode-hook - rjsx-mode-hook) - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! '(js-mode-local-vars-hook + js2-mode-local-vars-hook + typescript-mode-local-vars-hook + typescript-tsx-mode-local-vars-hook + rjsx-mode-local-vars-hook) + #'tree-sitter!)) diff --git a/modules/lang/json/config.el b/modules/lang/json/config.el index fe5faf134..a088c54d2 100644 --- a/modules/lang/json/config.el +++ b/modules/lang/json/config.el @@ -31,7 +31,6 @@ "s" #'counsel-jq)) (eval-when! (featurep! +tree-sitter) - (add-hook! '(json-mode - jsonc-mode) - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! '(json-mode-local-vars-hook + jsonc-mode-local-vars-hook) + #'tree-sitter!)) diff --git a/modules/lang/julia/config.el b/modules/lang/julia/config.el index cf765080e..bd4837c46 100644 --- a/modules/lang/julia/config.el +++ b/modules/lang/julia/config.el @@ -102,6 +102,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'julia-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'julia-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el index 3d33b8675..001428d3f 100644 --- a/modules/lang/ocaml/config.el +++ b/modules/lang/ocaml/config.el @@ -121,6 +121,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'tuareg-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'tuareg-mode-local-vars-hook #'tree-sitter)) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 5278d5e07..c6f435b24 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -179,6 +179,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! #'php-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'php-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index ad228a5ed..4f2b65f31 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -348,6 +348,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'python-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'python-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el index 57a31172e..3ffec7bc0 100644 --- a/modules/lang/ruby/config.el +++ b/modules/lang/ruby/config.el @@ -198,6 +198,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'ruby-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'ruby-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el index 320f526b8..3fcab041a 100644 --- a/modules/lang/rust/config.el +++ b/modules/lang/rust/config.el @@ -84,6 +84,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'rustic-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'rustic-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el index 234e7e99d..0e427e909 100644 --- a/modules/lang/scala/config.el +++ b/modules/lang/scala/config.el @@ -53,6 +53,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'scala-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'scala-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el index 0ad4919a7..684781bea 100755 --- a/modules/lang/sh/config.el +++ b/modules/lang/sh/config.el @@ -96,6 +96,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'sh-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'sh-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el index fbfad58b6..0de022376 100644 --- a/modules/lang/swift/config.el +++ b/modules/lang/swift/config.el @@ -34,6 +34,4 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! 'swift-mode-hook - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! 'swift-mode-local-vars-hook #'tree-sitter!)) diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el index 194a03e3e..34ad2d069 100644 --- a/modules/lang/web/config.el +++ b/modules/lang/web/config.el @@ -58,8 +58,7 @@ ;; Tree sitter (eval-when! (featurep! +tree-sitter) - (add-hook! '(html-mode-hook - mhtml-mode-hook - css-mode-hook) - #'turn-on-tree-sitter-mode - #'+tree-sitter-keys-mode)) + (add-hook! '(html-mode-local-vars-hook + mhtml-mode-local-vars-hook + css-mode-local-vars-hook) + #'tree-sitter!))