From c97d0fe9c9da18b87acd877a4b874bbfdc7124dd Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Wed, 15 Jul 2020 10:35:59 +0200 Subject: [PATCH] Add support for lua-langserver in lsp-mode --- modules/lang/lua/+lsp-mode.el | 18 ++++++++++++++++++ modules/lang/lua/config.el | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 modules/lang/lua/+lsp-mode.el diff --git a/modules/lang/lua/+lsp-mode.el b/modules/lang/lua/+lsp-mode.el new file mode 100644 index 000000000..b8c98e9b3 --- /dev/null +++ b/modules/lang/lua/+lsp-mode.el @@ -0,0 +1,18 @@ +;;; lang/lua/+lsp-mode.el -*- lexical-binding: t; -*- + +(defun lsp-lua-langserver--lsp-command () + "Generate LSP startup command." + (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"))) + +(after! lsp-mode + (lsp-register-client + (make-lsp-client :new-connection (lsp-stdio-connection 'lsp-lua-langserver--lsp-command) + :major-modes '(lua-mode) + :priority -1 + :server-id 'lua-langserver))) diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el index 5920ebfd3..34a026656 100644 --- a/modules/lang/lua/config.el +++ b/modules/lang/lua/config.el @@ -38,6 +38,8 @@ lua-language-server.") (doom-path lua-lsp-dir "main.lua"))) (when (featurep! +lsp) + (unless (featurep! :tools lsp +eglot) + (load! "+lsp-mode")) (add-hook 'lua-mode-local-vars-hook #'lsp!)))