emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix block/jsdoc comment continuation in typescript

Browse source 
Also improves writing block comments in js2-mode and rjsx-mode.

Reported by @ar1a
This commit is contained in:
Henrik Lissner 2018-06-20 14:23:17 +02:00
parent 638ff6b0a2
commit 6fbd3407e0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/lang/javascript/config.el
View file

@ -17,6 +17,11 @@
;; Other ;; Other
:yield "import")) :yield "import"))
(after! smartparens
(sp-with-modes '(js2-mode typescript-mode rjsx-mode)
(sp-local-pair "/**" "" :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET")))
(sp-local-pair "/*" "*/" :post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET")))))
;; ;;
;; Major modes ;; Major modes
@ -25,6 +30,7 @@
(def-package! js2-mode (def-package! js2-mode
:mode "\\.js\\'" :mode "\\.js\\'"
:interpreter "node" :interpreter "node"
:commands js2-line-break
:config :config
(setq js2-skip-preprocessor-directives t (setq js2-skip-preprocessor-directives t
js2-highlight-external-variables nil js2-highlight-external-variables nil
@ -38,16 +44,12 @@
js2-strict-missing-semi-warning nil) js2-strict-missing-semi-warning nil)
(add-hook! 'js2-mode-hook #'(flycheck-mode rainbow-delimiters-mode)) (add-hook! 'js2-mode-hook #'(flycheck-mode rainbow-delimiters-mode))
;; Indent switch-case another step ;; Indent switch-case another step
(setq-hook! 'js2-mode-hook js-switch-indent-offset js2-basic-offset) (setq-hook! 'js2-mode-hook js-switch-indent-offset js2-basic-offset)
(set-electric! 'js2-mode :chars '(?\} ?\) ?. ?:)) (set-electric! 'js2-mode :chars '(?\} ?\) ?. ?:))
(set-repl-handler! 'js2-mode #'+javascript/repl) (set-repl-handler! 'js2-mode #'+javascript/repl)
(sp-with-modes '(js2-mode rjsx-mode)
(sp-local-pair "/*" "*/" :post-handlers '(("| " "SPC"))))
(map! :map js2-mode-map (map! :map js2-mode-map
:localleader :localleader
:n "S" #'+javascript/skewer-this-buffer)) :n "S" #'+javascript/skewer-this-buffer))
@ -83,6 +85,8 @@
(after! typescript-mode (after! typescript-mode
(add-hook! 'typescript-mode-hook #'(flycheck-mode rainbow-delimiters-mode)) (add-hook! 'typescript-mode-hook #'(flycheck-mode rainbow-delimiters-mode))
(setq-hook! 'typescript-mode-hook
comment-line-break-function #'js2-line-break)
(set-electric! 'typescript-mode (set-electric! 'typescript-mode
:chars '(?\} ?\)) :words '("||" "&&")) :chars '(?\} ?\)) :words '("||" "&&"))
(set-pretty-symbols! 'typescript-mode (set-pretty-symbols! 'typescript-mode