From ac95e4b8896c14cb487fb022000b282c53e63c2f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 27 May 2023 16:52:29 -0400
Subject: [PATCH] Update typescript and tsx for emacs29.

---
 ansible/roles/emacs/files/init.el            |   2 +-
 ansible/roles/emacs/files/lang-javascript.el | 122 +++++++++++--------
 2 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/ansible/roles/emacs/files/init.el b/ansible/roles/emacs/files/init.el
index a73f181..51bda27 100644
--- a/ansible/roles/emacs/files/init.el
+++ b/ansible/roles/emacs/files/init.el
@@ -10,7 +10,7 @@
 
 (require 'lang-python)
 
-;; (require 'lang-javascript)
+(require 'lang-javascript)
 
 (require 'lang-rust)
 
diff --git a/ansible/roles/emacs/files/lang-javascript.el b/ansible/roles/emacs/files/lang-javascript.el
index ca9b527..3146127 100644
--- a/ansible/roles/emacs/files/lang-javascript.el
+++ b/ansible/roles/emacs/files/lang-javascript.el
@@ -1,61 +1,87 @@
 (require 'common-lsp)
 (require 'util-tree-sitter)
 
-(use-package js
-  :mode (
-         ("\\.js\\'" . js-mode)
-         ("\\.json\\'" . js-mode)
-         )
-  :commands js-mode
+(use-package tsx-ts-mode
+  :ensure nil
   :pin manual
-  :hook (
-         (find-file . (lambda () (when (string= (file-name-extension buffer-file-name) "json") (add-hook 'before-save-hook 'json-fmt-jq nil 'local))))
-         (js-mode . (lambda ()
-                      (tree-sitter-hl-mode +1)
-                      )
-                  )
-         )
-  :config
-  (setq js-indent-level 2)
-  )
-
-(use-package typescript-mode
   :mode (
-         ("\\.ts\\'" . typescript-mode)
-         ("\\.tsx\\'" . typescript-mode)
+         ("\\.tsx\\'" . tsx-ts-mode)
          )
-  :hook (
-         (typescript-mode . (lambda ()
-                              ;; (lsp-register-client
-                              ;;  (make-lsp-client :new-connection (lsp-stdio-connection '("deno" "lsp" --compat --unstable --allow-read))
-                              ;;                   :major-modes '(typescript-mode)
-                              ;;                   :server-id 'typescript-ls))
-                              (eglot-ensure)
-                              (tree-sitter-hl-mode +1)
-                              ))
-         ;; (before-save . lsp-format-buffer)
-         )
-)
-
-(defun json-fmt-jq ()
-  "Run jq."
-  (run-command-on-buffer "jq" "--monochrome-output" ".")
+  :commands (tsx-ts-mode)
+  :init
+  (add-to-list 'treesit-language-source-alist '(tsx . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src")))
+  (unless (treesit-ready-p 'tsx) (treesit-install-language-grammar 'tsx))
   )
 
-(use-package web-mode
-  :mode (("\\.dust\\'" . web-mode)
+
+(use-package typescript-ts-mode
+  :ensure nil
+  :pin manual
+  :mode (
+         ("\\.ts\\'" . typescript-ts-mode)
          )
-  :config
-  (setq web-mode-markup-indent-offset 2)
-  (setq web-mode-enable-current-element-highlight t)
+  :commands (typescript-ts-mode)
+  :init
+  (add-to-list 'treesit-language-source-alist '(typescript . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src")))
+  (unless (treesit-ready-p 'typescript) (treesit-install-language-grammar 'typescript))
   )
 
-;; Define a custom mode for dust so that org-mode handle #+BEGIN_SRC dust blocks
-(define-derived-mode dust-mode web-mode "WebDust"
-  "Major mode for editing dust templates in web-mode."
-  (web-mode)
-  (web-mode-set-engine "dust")
-  ;; (setq web-mode-content-type "html")
-  )
+
+;; (use-package js
+;;   :mode (
+;;          ("\\.js\\'" . js-mode)
+;;          ("\\.json\\'" . js-mode)
+;;          )
+;;   :commands js-mode
+;;   :pin manual
+;;   :hook (
+;;          (find-file . (lambda () (when (string= (file-name-extension buffer-file-name) "json") (add-hook 'before-save-hook 'json-fmt-jq nil 'local))))
+;;          (js-mode . (lambda ()
+;;                       (tree-sitter-hl-mode +1)
+;;                       )
+;;                   )
+;;          )
+;;   :config
+;;   (setq js-indent-level 2)
+;;   )
+
+;; (use-package typescript-mode
+;;   :mode (
+;;          ("\\.ts\\'" . typescript-mode)
+;;          ("\\.tsx\\'" . typescript-mode)
+;;          )
+;;   :hook (
+;;          (typescript-mode . (lambda ()
+;;                               ;; (lsp-register-client
+;;                               ;;  (make-lsp-client :new-connection (lsp-stdio-connection '("deno" "lsp" --compat --unstable --allow-read))
+;;                               ;;                   :major-modes '(typescript-mode)
+;;                               ;;                   :server-id 'typescript-ls))
+;;                               (eglot-ensure)
+;;                               (tree-sitter-hl-mode +1)
+;;                               ))
+;;          ;; (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)
+;;          )
+;;   :config
+;;   (setq web-mode-markup-indent-offset 2)
+;;   (setq web-mode-enable-current-element-highlight t)
+;;   )
+
+;; ;; Define a custom mode for dust so that org-mode handle #+BEGIN_SRC dust blocks
+;; (define-derived-mode dust-mode web-mode "WebDust"
+;;   "Major mode for editing dust templates in web-mode."
+;;   (web-mode)
+;;   (web-mode-set-engine "dust")
+;;   ;; (setq web-mode-content-type "html")
+;;   )
 
 (provide 'lang-javascript)