Replace +lsp|init with lsp! autodef

modules/lang/go/config.el

@@ -21,7 +21,7 @@
               "goimports"))))
 
   (if (featurep! +lsp)
-      (add-hook 'go-mode-hook #'+lsp|init)
+      (add-hook 'go-mode-hook #'lsp!)
     (add-hook 'go-mode-hook #'go-eldoc-setup))
 
   (map! :map go-mode-map

modules/lang/haskell/+lsp.el

@@ -2,7 +2,7 @@
 
 (def-package! lsp-haskell
   :after haskell-mode
-  :init (add-hook 'haskell-mode-hook #'+lsp|init)
+  :init (add-hook 'haskell-mode-hook #'lsp!)
   :config
   ;; Does some strange indentation if it pastes in the snippet
   (setq-hook! 'haskell-mode-hook yas-indent-line 'fixed))

modules/lang/java/+lsp.el

@@ -3,7 +3,7 @@
 
 (def-package! lsp-java
   :after-call java-mode
-  :init (add-hook 'java-mode-hook #'+lsp|init)
+  :init (add-hook 'java-mode-hook #'lsp!)
   :config
   ;; TODO keybinds
   ;; TODO treemacs integration (?)

modules/lang/javascript/config.el

@@ -123,7 +123,7 @@
 ;; Tools
 
 (when (featurep! +lsp)
-  (add-hook! (js2-mode rjsx-mode typescript-mode) #'+lsp|init))
+  (add-hook! (js2-mode rjsx-mode typescript-mode) #'lsp!))
 
 
 (def-package! tide

modules/lang/ocaml/config.el

@@ -1,7 +1,7 @@
 ;;; lang/ocaml/config.el -*- lexical-binding: t; -*-
 
 (when (featurep! +lsp)
-  (add-hook! (tuareg-mode reason-mode) #'+lsp|init))
+  (add-hook! (tuareg-mode reason-mode) #'lsp!))
 
 
 (after! tuareg

modules/lang/php/config.el

@@ -13,7 +13,7 @@
   (set-formatter! 'php-mode #'php-cs-fixer-fix)
 
   (if (featurep! +lsp)
-      (add-hook 'php-mode-hook #'+lsp|init)
+      (add-hook 'php-mode-hook #'lsp!)
     ;; `+php-company-backend' uses `company-phpactor', `php-extras-company' or
     ;; `company-dabbrev-code', in that order.
     (set-company-backend! 'php-mode '+php-company-backend 'company-dabbrev-code))

modules/lang/python/config.el

@@ -44,7 +44,7 @@ called.")
     :return "return" :yield "yield")
 
   (when (featurep! +lsp)
-    (add-hook 'python-mode-hook #'+lsp|init))
+    (add-hook 'python-mode-hook #'lsp!))
 
   (define-key python-mode-map (kbd "DEL") nil) ; interferes with smartparens
   (sp-local-pair 'python-mode "'" nil
@@ -57,7 +57,7 @@ called.")
 
 (def-package! anaconda-mode
   :unless (featurep! +lsp)
-  :hook python-mode
+  :hook python-mode-local-vars
   :init
   (setq anaconda-mode-installation-directory (concat doom-etc-dir "anaconda/")
         anaconda-mode-eldoc-as-single-line t)

modules/lang/ruby/config.el

@@ -20,7 +20,7 @@
   (set-repl-handler! '(ruby-mode enh-ruby-mode) #'inf-ruby)
 
   (when (featurep! +lsp)
-    (add-hook 'enh-ruby-mode-hook #'+lsp|init))
+    (add-hook 'enh-ruby-mode-hook #'lsp!))
 
   (after! company-dabbrev-code
     (add-to-list 'company-dabbrev-code-modes 'enh-ruby-mode nil #'eq)

modules/lang/rust/config.el

@@ -6,7 +6,7 @@
   (setq rust-indent-method-chain t)
 
   (when (featurep! +lsp)
-    (add-hook 'rust-mode-hook #'+lsp|init))
+    (add-hook 'rust-mode-hook #'lsp!))
 
   (map! :map rust-mode-map
         :localleader

modules/lang/scala/config.el

@@ -31,4 +31,4 @@
 (def-package! lsp-scala
   :when (featurep! +lsp)
   :after scala-mode
-  :init (add-hook 'scala-mode-hook #'+lsp|init))
+  :init (add-hook 'scala-mode-hook #'lsp!))

modules/lang/swift/config.el

@@ -22,4 +22,4 @@
 (def-package! lsp-sourcekit
   :when (featurep! +lsp)
   :after swift-mode
-  :init (add-hook 'swift-mode-hook #'+lsp|init))
+  :init (add-hook 'swift-mode-hook #'lsp!))

modules/lang/web/+css.el

@@ -36,7 +36,7 @@
 ;; Tools
 
 (when (featurep! +lsp)
-  (add-hook! (css-mode sass-mode less-css-mode) #'+lsp|init))
+  (add-hook! (css-mode sass-mode less-css-mode) #'lsp!))
 
 
 (def-package! counsel-css

modules/lang/web/+html.el

@@ -142,4 +142,4 @@
 
 
 (when (featurep! +lsp)
-  (add-hook! (html-mode web-mode) #'+lsp|init))
+  (add-hook! (html-mode web-mode) #'lsp!))

modules/tools/lsp/autoload.el

@@ -1,7 +1,4 @@
 ;;; feature/lsp/autoload.el -*- lexical-binding: t; -*-
 
-;;;###autoload
-(defun +lsp|init ()
-  "Enable LSP as late as possible, to allow users to customize it via file or
-dir local variables."
-  (add-hook 'hack-local-variables-hook #'lsp nil t))
+;;;###autodef 
+(defalias 'lsp! #'lsp)