Use js-mode for JSON

1 files changed, 8 insertions, 10 deletions

diff --git a/lisp/init-javascript.el b/lisp/init-javascript.el
index 1611ed4..c83ff9a 100644
--- a/lisp/init-javascript.el
+++ b/lisp/init-javascript.el
@@ -1,22 +1,20 @@
-;; install packages
+;; install package
 (require-package 'js2-mode)
-(require-package 'json-mode)
 
-;; load js2-mode
 (require 'js2-mode)
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 
-;; load json-mode
-(require 'json-mode)
-(add-to-list 'auto-mode-alist '("\\.json\\'" . json-mode))
+;; js2-mode can't handle json
+(require 'js)
+(add-to-list 'auto-mode-alist '("\\.json\\'" . js-mode))
 
-;; prefer jq for reformatting json
+;; use jq for reformatting json
 (defun jq-reformat-region (begin end)
   (interactive "r")
   (if (executable-find "jq")
       (shell-command-on-region
        begin end "jq --monochrome-output --ascii-output ." (current-buffer) t)
-    (json-reformat-region begin end)))
+    (message "Could not find jq in PATH.")))
 
 (defun jq-reformat ()
   (interactive)
@@ -24,8 +22,8 @@
       (jq-reformat-region (region-beginning) (region-end))
     (jq-reformat-region (point-min) (point-max))))
 
-(add-hook 'json-mode-hook
+(add-hook 'js-mode-hook
           (lambda ()
-            (define-key json-mode-map (kbd "C-c C-f") 'jq-reformat)))
+            (define-key js-mode-map (kbd "C-c C-f") 'jq-reformat)))
 
 (provide 'init-javascript)