Fix #1765: enabling tide when lsp is active

modules/lang/javascript/config.el

@@ -145,9 +145,7 @@ to tide."
             ;; necessary because `tide-setup' and `lsp' will error if not a
             ;; file-visiting buffer
             (add-hook 'after-save-hook #'+javascript-init-tide-or-lsp-maybe-h nil 'local)
-          (or (and (featurep! +lsp)
-                   (lsp!)
-                   (bound-and-true-p lsp-mode))
+          (or (and (featurep! +lsp) (lsp!))
               ;; fall back to tide
               (if (executable-find "node")
                   (and (require 'tide nil t)

modules/tools/lsp/autoload.el

@@ -10,8 +10,9 @@ been moved out to their respective modules, or these hooks:
 
 + `+lsp-init-company-h' (on `lsp-mode-hook')
 + `+lsp-init-ui-flycheck-or-flymake-h' (on `lsp-ui-mode-hook')"
-  (require 'lsp-mode)
-  (unless lsp-mode
+  (if (bound-and-true-p lsp-mode)
+      t
+    (require 'lsp-mode)
     (when lsp-auto-configure
       (require 'lsp-clients))
     (when (and (buffer-file-name)