emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert 438caf276 (#1943)

Browse source 
This was fixed upstream in emacs-lsp/lsp-mode#1135
This commit is contained in:
Henrik Lissner 2019-10-24 13:31:08 -04:00
parent 851094cdd3
commit 1030f66c24
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/tools/lsp/config.el
View file

@ -21,6 +21,11 @@ This can be a single company backend or a list thereof. It can be anything
;; project.
(setq lsp-keep-workspace-alive nil)
;; For `lsp-clients'
(setq lsp-fsharp-server-install-dir (concat doom-etc-dir "lsp-fsharp/")
lsp-groovy-server-install-dir (concat doom-etc-dir "lsp-groovy/")
lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
:config
(set-lookup-handlers! 'lsp-mode :async t
:documentation 'lsp-describe-thing-at-point
@ -141,19 +146,3 @@ Also logs the resolved project root, if found."
(remove-hook 'company-mode-hook #'+lsp-init-company-h t))))
:config
(setq company-lsp-cache-candidates 'auto)) ;; cache candidates for better performance
(after! lsp-clients
(setq lsp-fsharp-server-install-dir (concat doom-etc-dir "lsp-fsharp/")
lsp-groovy-server-install-dir (concat doom-etc-dir "lsp-groovy/")
lsp-intelephense-storage-path (concat doom-cache-dir "lsp-intelephense/"))
(defadvice! +lsp-activate-for-js-shell-scripts-a (filename &optional _)
:after-until #'lsp-typescript-javascript-tsx-jsx-activate-p
(when (file-readable-p filename)
(with-temp-buffer
(insert-file-contents filename nil 0 64)
(save-match-data
(goto-char (point-min))
(and (looking-at "#![ \t]?\\([^ \t\n]*/bin/env[ \t]\\)?\\([^ \t\n]+\\)")
(member (match-string 2) '("node" "rhino" "gjs" "nodejs"))))))))