fiddlerwoaroof/dotfiles - Change 7Y3XBGQLPUDJFP2NXN53AOUHR5W2NJRK2F66BUNT4BAWIKSHXC3QC

refactor(emacs,js): move javascript to its own configuration file

Created by Edward Langley on May 3, 2021

7Y3XBGQLPUDJFP2NXN53AOUHR5W2NJRK2F66BUNT4BAWIKSHXC3QC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

File addition: javascript-conf.el (----------)

[5.4163]

(use-package js2-mode
  :ensure t
  :defer t
  :commands js2-mode
  :config
  (define-key js-mode-map (kbd "M-.") nil)
  (define-key js2-mode-map (kbd "M-.") nil)
  (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
  (add-to-list 'interpreter-mode-alist (cons "node" 'js2-mode))
  (setq-default js2-basic-offset 4)
  (setq-default js-indent-level 4)
  (define-key js2-mode-map (kbd "<leader>t") 'fwoar/trigger-jest)
  (add-hook 'js2-mode-hook 'flycheck-mode)
  (customize-set-variable 'js2-mode-show-parse-errors nil)
  (customize-set-variable 'js2-strict-missing-semi-warning nil)
  (customize-set-variable 'js2-strict-trailing-comma-warning nil)
  (customize-set-variable 'js2-strict-inconsistent-return-warning nil))
(use-package js
  :ensure t
  :config
  (modify-syntax-entry ?_ "w" js-mode-syntax-table)
  ;;; indent ternaries with arrow function correctly---
  (defun js--looking-at-operator-p ()
    "Return non-nil if point is on a JavaScript operator, other than a comma."
    (save-match-data
      (and (looking-at js--indent-operator-re)
           (or (not (eq (char-after) ?:))
               (save-excursion
                 (js--backward-syntactic-ws)
                 (when (memq (char-before) '(?\) ?})) (backward-list))
                 (and (js--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                      (eq (char-after) ??))))
           (not (and
                 (eq (char-after) ?/)
                 (save-excursion
                   (eq (nth 3 (syntax-ppss)) ?/))))
           (not (and
                 (eq (char-after) ?*)
                 ;; Generator method (possibly using computed property).
                 (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)"))
                 (save-excursion
                   (js--backward-syntactic-ws)
                   ;; We might misindent some expressions that would
                   ;; return NaN anyway.  Shouldn't be a problem.
                   (memq (char-before) '(?, ?} ?{)))))))))
(defun fwoar/typescript-mode-hook ()
  (tree-sitter-require 'typescript)
  (when (s-suffix-p ".tsx" buffer-file-name)
    (setq-local tree-sitter-language (tree-sitter-require 'tsx)))
  (flycheck-mode 1)
  (lsp)
  (prettier-js-mode 1)
  (tree-sitter-mode 1)
  (tree-sitter-hl-mode 1)
  (comment
   (tide-setup)
   (tide-hl-identifier-mode 1))
  )
(use-package typescript-mode
  :ensure t
  :config
  (define-key typescript-mode-map (kbd "<leader>t") 'fwoar/trigger-jest)
  (add-hook 'typescript-mode-hook 'fwoar/typescript-mode-hook)
  (add-to-list 'auto-mode-alist
               '("\\.tsx$" . typescript-mode)))
(use-package tree-sitter
  :ensure t)
(use-package tree-sitter-langs
  :after tree-sitter
  :ensure t)
(comment
 (use-package tide
   :ensure t
   :config
   (add-hook 'js2-mode-hook 'tide-setup)
   (add-hook 'typescript-mode-hook 'fwoar/typescript-mode-hook)
   (add-hook 'js2-mode-hook 'tide-hl-identifier-mode)
   (comment
    (flycheck-add-next-checker 'javascript-eslint
                               'javascript-tide
                               'append))))
(use-package rjsx-mode
  :ensure t
  :config
  (add-hook 'js2-mode-hook 'lsp)
  (define-key rjsx-mode-map (kbd "M-.") nil)
  (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode)))
(comment
 (use-package tern
   :config
   (add-hook 'js-mode-hook (lambda () (tern-mode t)))
   (add-hook 'js2-mode-hook (lambda () (tern-mode t))))
 (use-package company-tern
   :ensure t
   :config
   (add-to-list 'company-backends 'company-tern)
   (setq company-tooltip-align-annotations t)))
(use-package jest
  :ensure t
  :config
  (defun jest--project-root ()
    "Find the project root directory."
    (let ((closest-package-json (fwoar--find-package-json))
          (projectile-root (projectile-project-root)))
      (message "%s <-> %s" closest-package-json projectile-root)
      (if (s-prefix-p projectile-root closest-package-json)
          closest-package-json
        projectile-root))))
(comment
 (use-package vue-mode
   :ensure t
   :config
   (add-hook 'vue-mode
             'prettier-js-mode)
   (add-hook 'vue-mode
             'flycheck-mode)))
(use-package prettier-js
  :ensure t
  :delight " p"
  :init
  (add-hook 'js2-mode-hook 'prettier-js-mode)
  (add-hook 'css-mode 'prettier-js-mode))
(cl-defgeneric fwoar/test-on-save ()
  (:method ()))
(defvar-local fwoar/*test-file-name* nil)
(defun fwoar/trigger-jest ()
  (interactive)
  (when-let ((test-name (if fwoar/*test-file-name*
                            fwoar/*test-file-name*
                          (setq-local fwoar/*test-file-name*
                                      (if (projectile-test-file-p buffer-file-name)
                                          buffer-file-name
                                        (projectile-find-implementation-or-test buffer-file-name))))))
    (let ((proc (make-network-process
                 :name "jest-comm"
                 :buffer "*jest-comm*"
                 :family 'local
                 :service "/tmp/jest.sock")))
      (unwind-protect
          (process-send-string proc test-name)
        (delete-process proc)))))
(cl-defmethod fwoar/test-on-save (&context (major-mode (derived-mode typescript-mode)))
  (fwoar/trigger-jest))
(cl-defmethod fwoar/test-on-save (&context (major-mode (derived-mode js-mode)))
  (fwoar/trigger-jest))
(defvar *tos-hook*
  (add-hook 'after-save-hook 'fwoar/test-on-save))

Replacement in emacs.d/init.el at line 383 [8.136]

∅:D[6.3282] → [7.170:236]

B:BD[9.174] → [7.170:236]

B:BD[7.236] → [10.1807:1817]

B:BD[10.1817] → [11.217:304]

∅:D[11.304] → [10.1817:2005]

B:BD[10.1817] → [10.1817:2005]

B:BD[10.2005] → [11.305:338]

∅:D[11.338] → [10.2005:3582]

B:BD[10.2005] → [10.2005:3582]

(use-package js2-mode
  :ensure t
  :defer t
  :commands js2-mode
  :config
  (define-key js-mode-map (kbd "M-.") nil)
  (define-key js2-mode-map (kbd "M-.") nil)
  (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
  (add-to-list 'interpreter-mode-alist (cons "node" 'js2-mode))
  (setq-default js2-basic-offset 4)
  (setq-default js-indent-level 4)
  (add-hook 'js2-mode-hook 'lsp)
  (add-hook 'js2-mode-hook 'flycheck-mode)
  (customize-set-variable 'js2-mode-show-parse-errors nil)
  (customize-set-variable 'js2-strict-missing-semi-warning nil)
  (customize-set-variable 'js2-strict-trailing-comma-warning nil)
  (customize-set-variable 'js2-strict-inconsistent-return-warning nil))
(use-package js
  :ensure t
  :config
  (modify-syntax-entry ?_ "w" js-mode-syntax-table)
  ;;; indent ternaries with arrow function correctly---
  (defun js--looking-at-operator-p ()
    "Return non-nil if point is on a JavaScript operator, other than a comma."
    (save-match-data
      (and (looking-at js--indent-operator-re)
           (or (not (eq (char-after) ?:))
               (save-excursion
                 (js--backward-syntactic-ws)
                 (when (memq (char-before) '(?\) ?})) (backward-list))
                 (and (js--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                      (eq (char-after) ??))))
           (not (and
                 (eq (char-after) ?/)
                 (save-excursion
                   (eq (nth 3 (syntax-ppss)) ?/))))
           (not (and
                 (eq (char-after) ?*)
                 ;; Generator method (possibly using computed property).
                 (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)"))
                 (save-excursion
                   (js--backward-syntactic-ws)
                   ;; We might misindent some expressions that would
                   ;; return NaN anyway.  Shouldn't be a problem.
                   (memq (char-before) '(?, ?} ?{)))))))))

[6.3282]

[7.709]

(load-package-configuration 'javascript)

Deletion in emacs.d/init.el at line 385 [8.136]

B:BD[7.710] → [7.710:732]

B:BD[7.732] → [12.229:241]

∅:D[12.241] → [7.732:892]

B:BD[7.732] → [7.732:892]

B:BD[7.892] → [13.1312:1400]

B:BD[13.1400] → [14.210:342]

∅:D[14.342] → [7.939:940]

∅:D[13.1400] → [7.939:940]

B:BD[7.939] → [7.939:940]

(use-package vue-mode
  :ensure t
  :config
  (add-hook 'vue-mode
            'prettier-js-mode)
  (add-hook 'vue-mode
            'flycheck-mode))
(use-package prettier-js
  :ensure t
  :init
  (add-hook 'js2-mode-hook 'prettier-js-mode)
  (add-hook 'css-mode 'prettier-js-mode))
(use-package typescript-mode
  :ensure t
  :config
  (add-to-list 'auto-mode-alist
               '("\\.tsx$" . typescript-mode)))

Deletion in emacs.d/init.el at line 391 [8.136]

∅:D[15.342] → [7.1095:1141]

B:BD[7.1095] → [7.1095:1141]

B:BD[7.1141] → [11.358:403]

∅:D[11.403] → [7.1141:1293]

B:BD[7.1141] → [7.1141:1293]

B:BD[7.1293] → [13.1401:1457]

∅:D[16.492] → [7.1349:1350]

∅:D[13.1457] → [7.1349:1350]

B:BD[7.1349] → [7.1349:1350]

B:BD[7.1350] → [13.1458:1606]

∅:D[16.635] → [10.3583:3993]

∅:D[13.1606] → [10.3583:3993]

B:BD[7.1498] → [10.3583:3993]

∅:D[10.3993] → [7.1498:1499]

B:BD[7.1498] → [7.1498:1499]


(use-package rjsx-mode
  :ensure t
  :config
  (define-key rjsx-mode-map (kbd "M-.") nil)
  (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode)))
(comment
 (use-package tern
   :config
   (add-hook 'js-mode-hook (lambda () (tern-mode t)))
   (add-hook 'js2-mode-hook (lambda () (tern-mode t))))
 (use-package company-tern
   :ensure t
   :config
   (add-to-list 'company-backends 'company-tern)
   (setq company-tooltip-align-annotations t)))
(use-package jest
  :ensure t
  :config
  (defun jest--project-root ()
    "Find the project root directory."
    (let ((closest-package-json (fwoar--find-package-json))
          (projectile-root (projectile-project-root)))
      (message "%s <-> %s" closest-package-json projectile-root)
      (if (s-prefix-p projectile-root closest-package-json)
          closest-package-json
        projectile-root))))

File addition: javascript-conf.el (----------)

[5.4163]

(use-package js2-mode
  :ensure t
  :defer t
  :commands js2-mode
  :config
  (define-key js-mode-map (kbd "M-.") nil)
  (define-key js2-mode-map (kbd "M-.") nil)
  (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
  (add-to-list 'interpreter-mode-alist (cons "node" 'js2-mode))
  (setq-default js2-basic-offset 4)
  (setq-default js-indent-level 4)
  (define-key js2-mode-map (kbd "<leader>t") 'fwoar/trigger-jest)
  (add-hook 'js2-mode-hook 'flycheck-mode)
  (customize-set-variable 'js2-mode-show-parse-errors nil)
  (customize-set-variable 'js2-strict-missing-semi-warning nil)
  (customize-set-variable 'js2-strict-trailing-comma-warning nil)
  (customize-set-variable 'js2-strict-inconsistent-return-warning nil))
(use-package js
  :ensure t
  :config
  (modify-syntax-entry ?_ "w" js-mode-syntax-table)
  ;;; indent ternaries with arrow function correctly---
  (defun js--looking-at-operator-p ()
    "Return non-nil if point is on a JavaScript operator, other than a comma."
    (save-match-data
      (and (looking-at js--indent-operator-re)
           (or (not (eq (char-after) ?:))
               (save-excursion
                 (js--backward-syntactic-ws)
                 (when (memq (char-before) '(?\) ?})) (backward-list))
                 (and (js--re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
                      (eq (char-after) ??))))
           (not (and
                 (eq (char-after) ?/)
                 (save-excursion
                   (eq (nth 3 (syntax-ppss)) ?/))))
           (not (and
                 (eq (char-after) ?*)
                 ;; Generator method (possibly using computed property).
                 (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)"))
                 (save-excursion
                   (js--backward-syntactic-ws)
                   ;; We might misindent some expressions that would
                   ;; return NaN anyway.  Shouldn't be a problem.
                   (memq (char-before) '(?, ?} ?{)))))))))
(defun fwoar/typescript-mode-hook ()
  (tree-sitter-require 'typescript)
  (when (s-suffix-p ".tsx" buffer-file-name)
    (setq-local tree-sitter-language (tree-sitter-require 'tsx)))
  (flycheck-mode 1)
  (lsp)
  (prettier-js-mode 1)
  (tree-sitter-mode 1)
  (tree-sitter-hl-mode 1)
  (comment
   (tide-setup)
   (tide-hl-identifier-mode 1))
  )
(use-package typescript-mode
  :ensure t
  :config
  (define-key typescript-mode-map (kbd "<leader>t") 'fwoar/trigger-jest)
  (add-hook 'typescript-mode-hook 'fwoar/typescript-mode-hook)
  (add-to-list 'auto-mode-alist
               '("\\.tsx$" . typescript-mode)))
(use-package tree-sitter
  :ensure t)
(use-package tree-sitter-langs
  :after tree-sitter
  :ensure t)
(comment
 (use-package tide
   :ensure t
   :config
   (add-hook 'js2-mode-hook 'tide-setup)
   (add-hook 'typescript-mode-hook 'fwoar/typescript-mode-hook)
   (add-hook 'js2-mode-hook 'tide-hl-identifier-mode)
   (comment
    (flycheck-add-next-checker 'javascript-eslint
                               'javascript-tide
                               'append))))
(use-package rjsx-mode
  :ensure t
  :config
  (add-hook 'js2-mode-hook 'lsp)
  (define-key rjsx-mode-map (kbd "M-.") nil)
  (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode)))
(comment
 (use-package tern
   :config
   (add-hook 'js-mode-hook (lambda () (tern-mode t)))
   (add-hook 'js2-mode-hook (lambda () (tern-mode t))))
 (use-package company-tern
   :ensure t
   :config
   (add-to-list 'company-backends 'company-tern)
   (setq company-tooltip-align-annotations t)))
(use-package jest
  :ensure t
  :config
  (defun jest--project-root ()
    "Find the project root directory."
    (let ((closest-package-json (fwoar--find-package-json))
          (projectile-root (projectile-project-root)))
      (message "%s <-> %s" closest-package-json projectile-root)
      (if (s-prefix-p projectile-root closest-package-json)
          closest-package-json
        projectile-root))))
(comment
 (use-package vue-mode
   :ensure t
   :config
   (add-hook 'vue-mode
             'prettier-js-mode)
   (add-hook 'vue-mode
             'flycheck-mode)))
(use-package prettier-js
  :ensure t
  :delight " p"
  :init
  (add-hook 'js2-mode-hook 'prettier-js-mode)
  (add-hook 'css-mode 'prettier-js-mode))
(cl-defgeneric fwoar/test-on-save ()
  (:method ()))
(defvar-local fwoar/*test-file-name* nil)
(defun fwoar/trigger-jest ()
  (interactive)
  (when-let ((test-name (if fwoar/*test-file-name*
                            fwoar/*test-file-name*
                          (setq-local fwoar/*test-file-name*
                                      (if (projectile-test-file-p buffer-file-name)
                                          buffer-file-name
                                        (projectile-find-implementation-or-test buffer-file-name))))))
    (let ((proc (make-network-process
                 :name "jest-comm"
                 :buffer "*jest-comm*"
                 :family 'local
                 :service "/tmp/jest.sock")))
      (unwind-protect
          (process-send-string proc test-name)
        (delete-process proc)))))
(cl-defmethod fwoar/test-on-save (&context (major-mode (derived-mode typescript-mode)))
  (fwoar/trigger-jest))
(cl-defmethod fwoar/test-on-save (&context (major-mode (derived-mode js-mode)))
  (fwoar/trigger-jest))
(defvar *tos-hook*
  (add-hook 'after-save-hook 'fwoar/test-on-save))

refactor(emacs,js): move javascript to its own configuration file

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

File addition: javascript-conf.el (----------)

Replacement in emacs.d/init.el at line 383 [8.136]

Deletion in emacs.d/init.el at line 385 [8.136]

Deletion in emacs.d/init.el at line 391 [8.136]

File addition: javascript-conf.el (----------)