Updating Doom Emacs.

.emacs.d/modules/lang/lua/config.el

@@ -1,5 +1,11 @@
 ;;; lang/lua/config.el -*- lexical-binding: t; -*-
 
+(defvar +lua-lsp-dir (concat doom-etc-dir "lsp/lua-language-server/")
+  "Absolute path to the directory of sumneko's lua-language-server.
+
+This directory MUST contain the 'main.lua' file and be the in-source build of
+lua-language-server.")
+
 ;; sp's default rules are obnoxious, so disable them
 (provide 'smartparens-lua)
 
@@ -16,7 +22,23 @@
   (set-lookup-handlers! 'lua-mode :documentation 'lua-search-documentation)
   (set-electric! 'lua-mode :words '("else" "end"))
   (set-repl-handler! 'lua-mode #'+lua/open-repl)
-  (set-company-backend! 'lua-mode '(company-lua company-yasnippet)))
+  (set-company-backend! 'lua-mode '(company-lua company-yasnippet))
+
+  (set-eglot-client!
+   'lua-mode
+   ;; The absolute path to lua-language-server binary is necessary because the
+   ;; bundled dependencies aren't found otherwise. The only reason this is a
+   ;; function is to dynamically change when/if lua-lsp-dir variable changed
+   (list (doom-path lua-lsp-dir
+                    (cond (IS-MAC     "bin/macOS")
+                          (IS-LINUX   "bin/Linux")
+                          (IS-WINDOWS "bin/Windows"))
+                    "lua-language-server")
+         "-E" "-e" "LANG=en"
+         (doom-path lua-lsp-dir "main.lua")))
+
+  (when (featurep! +lsp)
+    (add-hook 'lua-mode-local-vars-hook #'lsp!)))
 
 
 (use-package! moonscript
@@ -28,7 +50,7 @@
   (add-hook! 'moonscript-mode-hook
              #'+lua-moonscript-fix-single-quotes-h
              #'+lua-moonscript-fontify-interpolation-h)
-  (when (featurep! :tools flycheck)
+  (when (featurep! :checkers syntax)
     (require 'flycheck-moonscript nil t)))
 
 

.emacs.d/modules/lang/lua/packages.el

@@ -1,14 +1,13 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/lua/packages.el
 
-(package! lua-mode)
+(package! lua-mode :pin "1f596a93b3")
 
 (when (featurep! +moonscript)
-  (package! moonscript)
-  (when (featurep! :tools flycheck)
+  (package! moonscript :pin "56f90471e2")
+  (when (featurep! :checkers syntax)
     (package! flycheck-moonscript
-      :recipe (:host github :repo "hlissner/emacs-flycheck-moonscript"))))
+      :recipe (:host github :repo "hlissner/emacs-flycheck-moonscript") :pin "fcb99e5efc")))
 
 (when (featurep! :completion company)
-  (package! company-lua))
-
+  (package! company-lua :pin "29f6819de4"))