Merge branch 'develop' of github.com:hlissner/doom-emacs into develop

modules/config/default/+evil-bindings.el

@@ -42,13 +42,24 @@
                            (bound-and-true-p yas-minor-mode)
                            (yas-maybe-expand-abbrev-key-filter 'yas-expand))
                       #'yas-expand
-                      (and (featurep! :completion company +tng)
-                           (+company-has-completion-p))
-                      #'company-complete-common)
-      :v [tab] (cmds! (and (bound-and-true-p yas-minor-mode)
+                      (featurep! :completion company +tng)
+                      #'company-indent-or-complete-common)
+      :m [tab] (cmds! (and (bound-and-true-p yas-minor-mode)
+                           (evil-visual-state-p)
                            (or (eq evil-visual-selection 'line)
                                (not (memq (char-after) (list ?\( ?\[ ?\{ ?\} ?\] ?\))))))
-                      #'yas-insert-snippet)
+                      #'yas-insert-snippet
+                      (and (featurep! :editor fold)
+                           (save-excursion (end-of-line) (invisible-p (point))))
+                      #'+fold/toggle
+                      ;; Fixes #4548: without this, this tab keybind overrides
+                      ;; mode-local ones for modes that don't have an evil
+                      ;; keybinding scheme or users who don't have :editor (evil
+                      ;; +everywhere) enabled.
+                      (doom-lookup-key [tab] (list (current-local-map)))
+                      it
+                      (fboundp 'evil-jump-item)
+                      #'evil-jump-item)
 
       (:after help :map help-mode-map
        :n "o"       #'link-hint-open-link)

modules/editor/evil/config.el

@@ -420,7 +420,6 @@ directives. By default, this only recognizes C directives.")
 
 (map! :v  "@"     #'+evil:apply-macro
       :m  [C-i]   #'evil-jump-forward
-      :m  [tab]   #'evil-jump-item
 
       ;; implement dictionary keybinds
       ;; evil already defines 'z=' to `ispell-word' = correct word at point

modules/lang/javascript/config.el

@@ -33,6 +33,7 @@
 
 (use-package! js2-mode
   :mode "\\.m?js\\'"
+  :mode "\\.es6\\'"
   :interpreter "node"
   :commands js2-line-break
   :config

modules/tools/debugger/packages.el

@@ -6,5 +6,5 @@
     (package! realgud-trepan-ni :pin "6e38cf838c7b47b5f1353d00901b939ffa36d707")))
 
 (when (featurep! +lsp)
-  (package! dap-mode :pin "612388d0b85e77972a9c28391bac6224a63408c7")
-  (package! posframe :pin "efd7ea490defc53a5b78e7469a3a35d225b766cc"))
+  (package! dap-mode :pin "c52c1a530dab420b24640a4b4710cf1e6a0177e0")
+  (package! posframe :pin "8097276022676f73fc14d5311cba94aa9b3ac444"))

modules/tools/lsp/+lsp.el

@@ -4,6 +4,9 @@
   "The backends to prepend to `company-backends' in `lsp-mode' buffers.
 Can be a list of backends; accepts any value `company-backends' accepts.")
 
+(defvar +lsp-prompt-to-install-server t
+  "If non-nil, prompt to install a server if no server is present.")
+
 
 ;;
 ;;; Packages
@@ -108,7 +111,18 @@ server getting expensively restarted when reverting buffers."
                        (let ((lsp-restart 'ignore))
                          (funcall orig-fn))
                        (+lsp-optimization-mode -1))))
-             lsp--cur-workspace)))))
+             lsp--cur-workspace))))
+
+  (defadvice! +lsp-dont-prompt-to-install-servers-maybe-a (orig-fn &rest args)
+    :around #'lsp
+    (lsp--require-packages)
+    (when (buffer-file-name)
+      (if (or (lsp--filter-clients
+               (-andfn #'lsp--matching-clients?
+                       #'lsp--server-binary-present?))
+              +lsp-prompt-to-install-server)
+          (apply orig-fn args)
+        (lsp--info "No language server available for %S" major-mode)))))
 
 
 (use-package! lsp-ui

modules/tools/lsp/packages.el

@@ -3,10 +3,10 @@
 
 (if (featurep! +eglot)
     (progn
-      (package! eglot :pin "4c85df2b04e467b8ed0eca68bd202fd0e7b671f4")
-      (package! project :pin "a1997af9a6de5b10cebe8c06875508249ad559ea"))
-  (package! lsp-mode :pin "dbfbe1a221de78e5d42e93ab2833d68c7f27f1b7")
-  (package! lsp-ui :pin "94673cd08c35acc3b6c34301f74f1852487a5558")
+      (package! eglot :pin "398b81eeec44b35b39480a38f1b1357bc8550a1c")
+      (package! project :pin "f743ca2e5c3343c71b85040aac6a94f1b123f832"))
+  (package! lsp-mode :pin "62cd1b2e569c72638ba4bd42a0290192c224c28d")
+  (package! lsp-ui :pin "732992aa41bb78b7341e28c980817de488b7a317")
   (when (featurep! :completion ivy)
     (package! lsp-ivy :pin "c70ee8b54357c56d1b972393ee53e57a2e545fbb"))
   (when (featurep! :completion helm)