Skip to content

LSP F# Fixes #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2019
Merged

LSP F# Fixes #946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43b200e
Fix F# autoinstall for emacs <= 25
Jul 17, 2019
15deccc
Fix native json mode for emacs >= 27
Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lsp-fsharp.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ To use the mono/.Net framework version, set this to \"https://ci.appveyor.com/ap
(defun lsp-fsharp--fsac-install ()
"Downloads the latest version of fsautocomplete, and set `lsp-fsharp-server-path'."
(let* ((temp-file (make-temp-file "fsautocomplete" nil ".zip"))
(unzip-script (cond ((executable-find "unzip") "bash -c 'mkdir -p %2$s && unzip -qq %1$s -d %2$s'")
((executable-find "powershell") "powershell -noprofile -noninteractive -nologo -ex bypass Expand-Archive -path '%s' -dest '%s'")
(t (user-error "Unable to unzip server - file %s cannot be extracted, please extract it manually" temp-file)))))
(install-dir-full (expand-file-name lsp-fsharp-server-install-dir))
(unzip-script (cond ((executable-find "unzip") (format "bash -c 'mkdir -p %s && unzip -qq %s -d %s'") install-dir-full temp-file install-dir-full)
((executable-find "powershell") (format "powershell -noprofile -noninteractive -nologo -ex bypass Expand-Archive -path '%s' -dest '%s'" temp-file install-dir-full))
(t (user-error (format "Unable to unzip server - file %s cannot be extracted, please extract it manually") temp-file)))))
(url-copy-file lsp-fsharp-server-download-url temp-file t)
(shell-command (format unzip-script temp-file (expand-file-name lsp-fsharp-server-install-dir)))
(shell-command unzip-script)
(shell-command (format "%s %s --version" (lsp-fsharp--fsac-runtime-cmd) (lsp-fsharp--fsac-cmd)))))

(defun lsp-fsharp--make-launch-cmd ()
Expand All @@ -103,7 +104,7 @@ To use the mono/.Net framework version, set this to \"https://ci.appveyor.com/ap

(defun lsp-fsharp--make-init-options ()
"Init options for F#."
`(:automaticWorkspaceInit true))
`(:automaticWorkspaceInit t))

(lsp-register-client
(make-lsp-client :new-connection (lsp-stdio-connection 'lsp-fsharp--make-launch-cmd)
Expand Down