From d67d50d764c108fbc3e5b8be47a5a9b08e776c31 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 8 Apr 2017 03:43:36 -0400 Subject: [PATCH] lang/javascript: improve electric indentation for js2-mode & rjsx-mode --- modules/lang/javascript/config.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index a6f6e9884..b7a996705 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -25,7 +25,7 @@ (setq-local flycheck-javascript-eslint-executable eslint)))) (set! :repl 'js2-mode '+javascript/repl) - (set! :electric 'js2-mode :chars '(?\} ?\) ?.) :words '("||" "&&")) + (set! :electric 'js2-mode :chars '(?\} ?\) ?.)) (set! :xref-backend 'js2-mode 'xref-js2-xref-backend) (sp-with-modes '(js2-mode rjsx-mode) @@ -118,6 +118,8 @@ magic-mode-alist) :config + (set! :electric 'rjsx-mode :chars '(?\} ?\) ?. ?>)) + ;; disable electric keys (I use snippets and `emmet-mode' instead) (define-key rjsx-mode-map "<" nil) (define-key rjsx-mode-map (kbd "C-d") nil)