From 8e76c38f231bbc371195166b0fa22db5a9b1d318 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 27 May 2023 17:11:58 -0400 Subject: [PATCH] Update json for emacs29. --- ansible/roles/emacs/files/lang-javascript.el | 28 +++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/ansible/roles/emacs/files/lang-javascript.el b/ansible/roles/emacs/files/lang-javascript.el index 3146127..9e3575e 100644 --- a/ansible/roles/emacs/files/lang-javascript.el +++ b/ansible/roles/emacs/files/lang-javascript.el @@ -1,6 +1,28 @@ (require 'common-lsp) (require 'util-tree-sitter) +(use-package json-ts-mode + :ensure nil + :pin manual + :mode ( + ("\\.json\\'" . json-ts-mode) + ) + :commands (json-ts-mode) + :hook ( + (json-ts-mode . (lambda () + (add-hook 'before-save-hook 'json-fmt-jq nil 'local) + )) + ) + :init + (add-to-list 'treesit-language-source-alist '(json "https://github.com/tree-sitter/tree-sitter-json")) + (unless (treesit-ready-p 'json) (treesit-install-language-grammar 'json)) + ) + +(defun json-fmt-jq () + "Run jq." + (run-command-on-buffer "jq" "--monochrome-output" ".") + ) + (use-package tsx-ts-mode :ensure nil :pin manual @@ -62,12 +84,6 @@ ;; ;; (before-save . lsp-format-buffer) ;; ) ;; ) - -;; (defun json-fmt-jq () -;; "Run jq." -;; (run-command-on-buffer "jq" "--monochrome-output" ".") -;; ) - ;; (use-package web-mode ;; :mode (("\\.dust\\'" . web-mode) ;; )