Skip to content
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

Jump to bottom

support fsautocomplete dll and remove obsolete code #4006

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support fsautocomplete dll and remove obsolete code #4006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8fccaa
remove obsolete variable in fsharp client
augustfengd Mar 26, 2023
feced9d
support local fsautocomplete for server debugging
augustfengd Mar 26, 2023
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
21 changes: 9 additions & 12 deletions clients/lsp-fsharp.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@
:group 'lsp-mode
:package-version '(lsp-mode . "6.1"))

(defcustom lsp-fsharp-server-install-dir (f-join lsp-server-install-dir "fsautocomplete/")
"Install directory for fsautocomplete server.
The slash is expected at the end."
(defcustom lsp-fsharp-server-dll-path nil
"Path to a self-built fsautocomplete dll. Useful for debugging."
:group 'lsp-fsharp
:risky t
:type 'directory
:package-version '(lsp-mode . "6.1"))
:type 'file
:package-version '(lsp-mode . "8.0.1"))

(defcustom lsp-fsharp-server-args nil
"Extra arguments for the F# language server."
Expand Down Expand Up @@ -178,10 +176,7 @@ available, else the globally installed tool."

(defun lsp-fsharp--fsac-cmd ()
"The location of fsautocomplete executable."
(or (-let [maybe-local-executable (expand-file-name "fsautocomplete" lsp-fsharp-server-install-dir)]
(when (f-exists-p maybe-local-executable)
maybe-local-executable))
(executable-find "fsautocomplete")
(or (executable-find "fsautocomplete")
(f-join (or (getenv "USERPROFILE") (getenv "HOME"))
".dotnet" "tools" "fsautocomplete")))

Expand All @@ -207,9 +202,11 @@ available, else the globally installed tool."
(list "/bin/ksh" "-c"))

(t nil)))
(fsautocomplete-exec (lsp-fsharp--fsac-cmd)))
(fsautocomplete-cmd (if lsp-fsharp-server-dll-path
(list "dotnet" (expand-file-name lsp-fsharp-server-dll-path))
(list (lsp-fsharp--fsac-cmd)))))
(append startup-wrapper
(list fsautocomplete-exec)
fsautocomplete-cmd
lsp-fsharp-server-args)))

(defun lsp-fsharp--test-fsautocomplete-present ()
Expand Down