e3b6464649
* [core][keybinng] improve minor mode binding
This commit added add a new function defun spacemacs/declare-prefix-for-minor-mode
and improved spacemacs/set-leader-keys-for-minor-mode.
`which-key` package recently introduced a new api
which-key-add-keymap-based-replacements which improves perfomance and allows
prefix and namings to be stored directly in keymap. This is a great improvement.
With this new api we now make change to spacemacs/declare-prefix-for-minor-mode
to manage prefix also. For example:
(spacemacs/set-leader-keys-for-minor-mode 'lsp-mode
"=" "format"
"=b" #'lsp-format-buffer)
Before we had to use another api to bind prefix
spacemacs/declare-prefix-for-mode which only works on major-mode. As lsp-mode is
a minor mode this api causes a lot of problems to which-key performance. An
example is https://github.com/syl20bnr/spacemacs/issues/12455 which led to my
hack in https://github.com/syl20bnr/spacemacs/pull/12474.
The improved spacemacs/set-leader-keys-for-minor-mode will take care of both
prefix and key naming for the minor mode. This will allows us to have a better
set up for dynamic minor modes such as lsp-mode, tide-mode etc.
Also another api is created to make prefix for minor mode:
spacemacs/declare-prefix-for-minor-mode.
Usage:
(spacemacs/declare-prefix-for-minor-mode 'tide-mode "E" "errors")"
* [tide] improve prefix
* [lsp] improve prefix
141 lines
6.1 KiB
EmacsLisp
141 lines
6.1 KiB
EmacsLisp
;;; packages.el --- typescript Layer packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2020 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Chris Bowdon <c.bowdon@bath.edu>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq typescript-packages
|
|
'(
|
|
add-node-modules-path
|
|
company
|
|
eldoc
|
|
emmet-mode
|
|
flycheck
|
|
smartparens
|
|
typescript-mode
|
|
import-js
|
|
web-mode
|
|
yasnippet
|
|
))
|
|
|
|
(defun typescript/post-init-add-node-modules-path ()
|
|
(spacemacs/add-to-hooks #'add-node-modules-path '(typescript-mode-hook
|
|
typescript-tsx-mode-hook)))
|
|
|
|
(defun typescript/post-init-company ()
|
|
(spacemacs/add-to-hooks #'spacemacs//typescript-setup-company
|
|
'(typescript-mode-local-vars-hook
|
|
typescript-tsx-mode-local-vars-hook)))
|
|
|
|
(defun typescript/post-init-eldoc ()
|
|
(spacemacs/add-to-hooks #'spacemacs//typescript-setup-eldoc
|
|
'(typescript-mode-local-vars-hook
|
|
typescript-tsx-mode-local-vars-hook) t))
|
|
|
|
(defun typescript/post-init-emmet-mode ()
|
|
(add-hook 'typescript-tsx-mode-hook #'spacemacs/typescript-emmet-mode))
|
|
|
|
(defun typescript/set-tide-linter ()
|
|
(with-eval-after-load 'tide
|
|
(with-eval-after-load 'flycheck
|
|
(cond ((eq typescript-linter 'tslint)
|
|
(flycheck-add-mode 'typescript-tide 'typescript-tsx-mode)
|
|
(flycheck-add-mode 'typescript-tslint 'typescript-tsx-mode))
|
|
((eq typescript-linter 'eslint)
|
|
(flycheck-add-mode 'javascript-eslint 'typescript-tsx-mode)
|
|
(flycheck-add-mode 'javascript-eslint 'typescript-mode)
|
|
(add-to-list 'flycheck-disabled-checkers 'typescript-tslint)
|
|
(flycheck-disable-checker 'typescript-tslint)
|
|
(flycheck-add-mode 'tsx-tide 'typescript-tsx-mode)
|
|
(flycheck-add-next-checker 'typescript-tide 'javascript-eslint 'append)
|
|
(flycheck-add-next-checker 'tsx-tide 'javascript-eslint 'append))
|
|
(t
|
|
(message
|
|
"Invalid typescript-layer configuration, no such linter: %s" typescript-linter))))))
|
|
|
|
(defun typescript/set-lsp-linter ()
|
|
(with-eval-after-load 'lsp-ui
|
|
(with-eval-after-load 'lsp
|
|
(with-eval-after-load 'flycheck
|
|
(cond ((eq typescript-linter 'tslint)
|
|
(flycheck-add-mode 'typescript-tslint 'typescript-tsx-mode))
|
|
;; This sets tslint unconditionally for all lsp clients which is wrong
|
|
;; Must be set for respective modes only, see go layer for examples.
|
|
((eq typescript-linter 'eslint)
|
|
(flycheck-add-mode 'javascript-eslint 'typescript-tsx-mode)
|
|
(flycheck-add-mode 'javascript-eslint 'typescript-mode))
|
|
(t
|
|
(message
|
|
"Invalid typescript-layer configuration, no such linter: %s" typescript-linter)))))))
|
|
|
|
(defun typescript/post-init-flycheck ()
|
|
(spacemacs/enable-flycheck 'typescript-mode)
|
|
(spacemacs/enable-flycheck 'typescript-tsx-mode)
|
|
(cond ((eq (spacemacs//typescript-backend) 'tide)
|
|
(typescript/set-tide-linter))
|
|
((eq (spacemacs//typescript-backend) 'lsp)
|
|
(typescript/set-lsp-linter)))
|
|
|
|
(spacemacs/add-to-hooks #'spacemacs//typescript-setup-checkers
|
|
'(typescript-mode-hook typescript-tsx-mode-hook)
|
|
t))
|
|
|
|
(defun typescript/post-init-smartparens ()
|
|
(if dotspacemacs-smartparens-strict-mode
|
|
(spacemacs/add-to-hooks #'smartparens-strict-mode '(typescript-mode-hook
|
|
typescript-tsx-mode-hook))
|
|
(spacemacs/add-to-hooks #'smartparens-mode '(typescript-mode-hook
|
|
typescript-tsx-mode-hook))))
|
|
|
|
(defun typescript/post-init-web-mode ()
|
|
(define-derived-mode typescript-tsx-mode web-mode "TypeScript-tsx")
|
|
(add-to-list 'auto-mode-alist '("\\.tsx\\'" . typescript-tsx-mode))
|
|
|
|
;; setup typescript backend
|
|
(add-hook 'typescript-tsx-mode-local-vars-hook 'spacemacs//typescript-setup-backend)
|
|
(spacemacs/typescript-safe-local-variables '(lsp tide))
|
|
(when typescript-fmt-on-save
|
|
(add-hook 'typescript-tsx-mode-hook 'spacemacs/typescript-fmt-before-save-hook))
|
|
(spacemacs/set-leader-keys-for-major-mode 'typescript-tsx-mode
|
|
"p" 'spacemacs/typescript-open-region-in-playground)
|
|
(pcase (spacemacs//typescript-backend)
|
|
('lsp (spacemacs/set-leader-keys-for-major-mode 'typescript-mode
|
|
"==" 'spacemacs/typescript-format))
|
|
(_ (spacemacs/set-leader-keys-for-major-mode 'typescript-mode
|
|
"=" 'spacemacs/typescript-format))))
|
|
|
|
(defun typescript/post-init-yasnippet ()
|
|
(spacemacs/add-to-hooks #'spacemacs/typescript-yasnippet-setup '(typescript-mode-hook
|
|
typescript-tsx-mode-hook)))
|
|
|
|
(defun typescript/init-typescript-mode ()
|
|
(use-package typescript-mode
|
|
:defer t
|
|
:init
|
|
(progn
|
|
;; setup typescript backend
|
|
(add-hook 'typescript-mode-local-vars-hook 'spacemacs//typescript-setup-backend)
|
|
(spacemacs/typescript-safe-local-variables '(lsp tide))
|
|
:config
|
|
(progn
|
|
(when typescript-fmt-on-save
|
|
(add-hook 'typescript-mode-hook 'spacemacs/typescript-fmt-before-save-hook))
|
|
(spacemacs/set-leader-keys-for-major-mode 'typescript-mode
|
|
"p" 'spacemacs/typescript-open-region-in-playground)
|
|
(pcase (spacemacs//typescript-backend)
|
|
('lsp (spacemacs/set-leader-keys-for-major-mode 'typescript-mode
|
|
"==" 'spacemacs/typescript-format))
|
|
(_ (spacemacs/set-leader-keys-for-major-mode 'typescript-mode
|
|
"=" 'spacemacs/typescript-format)))))))
|
|
|
|
(defun typescript/pre-init-import-js ()
|
|
(if (eq javascript-import-tool 'import-js)
|
|
(progn
|
|
(add-to-list 'spacemacs--import-js-modes (cons 'typescript-mode 'typescript-mode-hook))
|
|
(add-to-list 'spacemacs--import-js-modes (cons 'typescript-tsx-mode 'typescript-tsx-mode-hook)))))
|