Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for various treesitter based modes #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for various treesitter based modes #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions electric-operator.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ Any better ideas would be welcomed."

)

(apply #'electric-operator-add-rules-for-mode 'c-ts-mode (electric-operator-get-rules-for-mode 'c-mode))

;; Use the same rules for c++
(apply #'electric-operator-add-rules-for-mode 'c++-mode (electric-operator-get-rules-for-mode 'c-mode))
Expand Down Expand Up @@ -650,6 +651,26 @@ could be added here.")
;; Check for any user-defined types
(electric-operator-looking-back-locally electric-operator-c-user-types-regex)))

(defun electric-operator-c-ts-is-function-parameter? ()
"Try to guess if we are in function definition/declaration

Using `c-ts-mode''s treesitter analysis."
(let ((node nil)
(value nil))
(if (and (fboundp 'treesit-node-at)
(fboundp 'treesit-node-top-level)
(fboundp 'treesit-node-start)
(fboundp 'treesit-node-end))
(progn
(setq node (treesit-node-at (point)))
(when (and (treesit-node-top-level node "^parameter_list$")
(treesit-node-top-level node "^function_declarator$"))
(setq node (treesit-node-top-level node "^parameter_list$"))
(setq value (list (treesit-node-start node) (treesit-node-end node)))
(and (> (point) (nth 0 value))
(<= (point) (nth 1 value)))))
nil)))

(defvar electric-operator-c-function-definition-syntax-list
'(topmost-intro
topmost-intro-cont
Expand All @@ -666,9 +687,11 @@ Using `cc-mode''s syntactic analysis."
;; There are similar but different symbols for objective-C, but I'm not
;; going to try to support that now.

(--> (c-guess-basic-syntax)
(-map #'car it)
(-intersection electric-operator-c-function-definition-syntax-list it)))
(if (derived-mode-p 'c-ts-mode 'c++-ts-mode)
(electric-operator-c-ts-is-function-parameter?)
(--> (c-guess-basic-syntax)
(-map #'car it)
(-intersection electric-operator-c-function-definition-syntax-list it))))

(defun electric-operator-c-mode-include-line-opening-quote? ()
(electric-operator-looking-back-locally "#\\s-*include\\s-*"))
Expand Down Expand Up @@ -859,6 +882,7 @@ Also handles C++ lambda capture by reference."
)

(apply #'electric-operator-add-rules-for-mode 'inferior-python-mode (electric-operator-get-rules-for-mode 'python-mode))
(apply #'electric-operator-add-rules-for-mode 'python-ts-mode (electric-operator-get-rules-for-mode 'python-mode))

(defun electric-operator-python-mode-in-lambda-args? ()
"Are we inside the arguments statement of a lambda?"
Expand Down Expand Up @@ -990,6 +1014,9 @@ Also handles C++ lambda capture by reference."
;; pointer deref vs multiplication
(cons "*" nil)

(cons ":" ": ")
(cons "::" "::")

(cons "/" #'electric-operator-prog-mode-/)
(cons "/*" " /* ")
(cons "//" " // ")
Expand All @@ -1003,6 +1030,8 @@ Also handles C++ lambda capture by reference."
;; Bar is used for lambdas as well as or
(cons "|" nil))

(apply #'electric-operator-add-rules-for-mode 'rust-ts-mode (electric-operator-get-rules-for-mode 'rust-mode))



;; R tweaks (ess mode)
Expand Down