# HG changeset patch # User Luke Hoersten # Date 1759418570 18000 # Node ID 79cddb8296e687a70bcf3414934424cf1f3d4094 # Parent 21828209cc7347905ac298fe4557b75b298716f2 Upgraded JS modes. Changes: - Removed js2-mode package - Added treesit-auto package - Enabled global-treesit-auto-mode This will automatically: - Use js-ts-mode for JavaScript files - Install tree-sitter grammars on first use - Apply tree-sitter modes to other languages too (JSON, TypeScript, Python, etc.) diff -r 21828209cc73 -r 79cddb8296e6 elisp/javascript-init.el --- a/elisp/javascript-init.el Thu Oct 02 10:12:51 2025 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -;; ~/.emacs.d/elisp/javascript-init.el -;; Luke Hoersten - -;; Require packages -(require 'package-require) -(package-require '(auto-complete ac-js2 js2-mode json-mode)) - -(require 'auto-complete-config) - -;;; js2-mode -(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode)) -(add-hook 'js2-mode-hook 'ac-js2-mode) -(setq-default ac-js2-evaluate-calls t) - -(message "Loading javascript-init...done") -(provide 'javascript-init) diff -r 21828209cc73 -r 79cddb8296e6 init.el --- a/init.el Thu Oct 02 10:12:51 2025 -0500 +++ b/init.el Thu Oct 02 10:22:50 2025 -0500 @@ -66,7 +66,7 @@ (require 'package-require) (package-require '(rg company exec-path-from-shell expand-region vertico orderless consult marginalia magit markdown-mode hgignore-mode move-text paredit - rainbow-delimiters json-mode json-reformat flycheck + rainbow-delimiters json-mode json-reformat flycheck treesit-auto solarized-theme terraform-mode visual-regexp yasnippet yaml-mode emmet-mode)) @@ -79,7 +79,6 @@ ;;; custom requires -(require 'javascript-init) (require 'c-init) (require 'ansible-init) @@ -215,6 +214,10 @@ (setq-default markdown-command "pandoc -f gfm") +;;; treesit-auto (automatically use tree-sitter modes and install grammars) +(global-treesit-auto-mode) + + ;;; html-mode (add-to-list 'auto-mode-alist '("\\.tpl\\'" . html-mode)) (add-hook 'html-mode-hook 'emmet-mode) @@ -263,7 +266,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - '(magit-ido magit zencoding-mode yasnippet yaml-mode visual-regexp terraform-mode solarized-theme smex rg rainbow-delimiters paredit move-text markdown-mode json-reformat json-mode jinja2-mode hgignore-mode haskell-mode flycheck flx-ido expand-region exec-path-from-shell company-ansible auto-complete ansible-doc ac-js2))) + '(magit yasnippet yaml-mode visual-regexp terraform-mode solarized-theme rg rainbow-delimiters paredit move-text markdown-mode json-reformat json-mode jinja2-mode hgignore-mode haskell-mode flycheck expand-region exec-path-from-shell company-ansible ansible-doc emmet-mode vertico orderless consult marginalia))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.