TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bind typescript-format to "==" or "=" depending on backend (#14049) 

* Bind typescript-format to "==" or "=" depending on backend

This fixes a problem when using 'lsp backend: the lsp layer binds its own
formatting functions under "=" as a prefix. The spacemacs/typescript-format
function which the typescript layer defines has advantages over these, mainly
it respects the typescript-fmt-tool variable (uses the formatting tool that
theuser specified).

This patch solves this by keybinding leader+"==" to the function when
typescript-backend is set to 'lsp and binding to leader+"=" in any other case.

* Fix an accidentally deleted keybinding in table in documentation

* use getter for backend variable

Co-authored-by: nanashi0x74 <rian.lindenberger@mpq.se>
This commit is contained in:
NANASHI0X74 2020-10-17 10:17:41 +02:00 committed by GitHub
parent ac3c3546a2
commit efcab8f61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layers/+lang/typescript/README.org
View File

@ -168,22 +168,22 @@ then set the variable =typescript-lsp-linter= to =nil=.
* Key bindings
** Typescript Major Mode
| Key binding | Description |
|-------------+--------------------------------------------------------------|
| ~SPC m =~ | reformat the buffer |
| ~SPC m E d~ | add =tslint:disable-next-line= at point |
| ~SPC m E e~ | fix thing at point |
| ~SPC m g b~ | jump back |
| ~SPC m g g~ | jump to entity's definition |
| ~SPC m g t~ | jump to entity's type definition |
| ~SPC m g r~ | references |
| ~SPC m h h~ | documentation at point |
| ~SPC m p~ | send selected region or current buffer to the web playground |
| ~SPC m r i~ | organize imports |
| ~SPC m r r~ | rename symbol |
| ~SPC m r f~ | rename file |
| ~SPC m S r~ | restart server |
| ~SPC m S j~ | create a barebone =jsconfig.json= at project root |
| Key binding | Description |
|-----------------------------------------------+--------------------------------------------------------------|
| ~SPC m =~ or ~SPC m = =~ if using lsp backend | reformat the buffer |
| ~SPC m E d~ | add =tslint:disable-next-line= at point |
| ~SPC m E e~ | fix thing at point |
| ~SPC m g b~ | jump back |
| ~SPC m g g~ | jump to entity's definition |
| ~SPC m g t~ | jump to entity's type definition |
| ~SPC m g r~ | references |
| ~SPC m h h~ | documentation at point |
| ~SPC m p~ | send selected region or current buffer to the web playground |
| ~SPC m r i~ | organize imports |
| ~SPC m r r~ | rename symbol |
| ~SPC m r f~ | rename file |
| ~SPC m S r~ | restart server |
| ~SPC m S j~ | create a barebone =jsconfig.json= at project root |
** Reference Major Mode

16
layers/+lang/typescript/packages.el
View File

@ -103,8 +103,12 @@
(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
"=" 'spacemacs/typescript-format
"p" 'spacemacs/typescript-open-region-in-playground))
"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
@ -123,8 +127,12 @@
(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
"=" 'spacemacs/typescript-format
"p" 'spacemacs/typescript-open-region-in-playground)))))
"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)