Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
9 changes: 7 additions & 2 deletions clojure-ts-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -1021,12 +1021,17 @@ See `clojure-ts--font-lock-settings' for usage of MARKDOWN-AVAILABLE."
'(((source (list_lit
:anchor (sym_lit name: (sym_name) @ns)
:anchor (sym_lit name: (sym_name) @ns-name)))
(:equal @ns "ns")))))
(:equal @ns "ns"))
((source (list_lit
:anchor (sym_lit name: (sym_name) @in-ns)
:anchor (quoting_lit
:anchor (sym_lit name: (sym_name) @ns-name))))
(:equal @in-ns "in-ns")))))

(defun clojure-ts-find-ns ()
"Return the name of the current namespace."
(let ((nodes (treesit-query-capture 'clojure clojure-ts--find-ns-query)))
(treesit-node-text (cdr (assoc 'ns-name nodes)))))
(treesit-node-text (cdr (assoc 'ns-name nodes)) t)))

(provide 'clojure-ts-mode)

Expand Down
50 changes: 50 additions & 0 deletions test/utils/test-helper.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
;;; test-helper.el --- Clojure TS Mode: Non-interactive unit-test setup -*- lexical-binding: t; -*-

;; Copyright © 2022-2024 Danny Freeman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be better to preserve the copyright attribution of the original code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will add them back.


;; This file is not part of GNU Emacs.

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <https://www.gnu.org/licenses/>.

;;; Commentary:

;; Non-interactive test suite setup.

;;; Code:

(defmacro with-clojure-ts-buffer (text &rest body)
"Create a temporary buffer, insert TEXT,switch to clojure-ts-mode.
And evaluate BODY."
(declare (indent 1))
`(with-temp-buffer
(erase-buffer)
(insert ,text)
(clojure-ts-mode)
,@body))

(defmacro with-clojure-ts-buffer-point (text &rest body)
"Run BODY in a temporary clojure buffer with TEXT.

TEXT is a string with a | indicating where point is. The | will be erased
and point left there."
(declare (indent 2))
`(progn
(with-clojure-ts-buffer ,text
(goto-char (point-min))
(re-search-forward "|")
(delete-char -1)
,@body)))

(provide 'test-helper)
;;; test-helper.el ends here