Skip to content

Commit 6e3fd91

Browse files
Merge pull request #327 from amcguier/init-parameters
Additional FsAutoComplete Parameters
2 parents cfd3f88 + ff035ca commit 6e3fd91

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
os: [ubuntu-latest, macos-latest]
1515
dotnet: [6.0.200]
1616
emacs_version:
17-
- 27.1
1817
- 27.2
1918
- 28.1
19+
- 28.2
2020
- snapshot
2121
steps:
2222
- uses: purcell/setup-emacs@master

README.org

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ This project is maintained by the
183183
[[http://fsharp.org/][F# Software Foundation]], with the repository hosted
184184
on [[https://github.com/fsharp/emacs-fsharp-mode][GitHub]].
185185

186-
Pull requests are welcome. Please run the test-suite with =make
187-
test= before submitting a pull request.
186+
Pull requests are welcome. Please run the test-suite with [Eldev](https://doublep.github.io/eldev/) =eldev -dtT test=
187+
before submitting a pull request.
188188

189189
*** Maintainers
190190

eglot-fsharp.el

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,26 @@
5555
"Arguments for the fsautocomplete command when using `eglot-fsharp'."
5656
:type '(repeat string))
5757

58+
(defcustom eglot-fsharp-fsautocomplete-args '(
59+
:automaticWorkspaceInit t
60+
:keywordsAutocomplete t
61+
:externalAutocomplete nil
62+
:linter t
63+
:unionCaseStubGeneration t
64+
:recordStubGeneration t
65+
:interfaceStubGeneration t
66+
:interfaceStubGenerationObjectIdentifier "this"
67+
:unusedOpensAnalyzer t
68+
:unusedDeclarationsAnalyzer t
69+
:useSdkScripts t
70+
:simplifyNameAnalyzer nil
71+
:resolveNamespaces t
72+
:enableReferenceCodeLens t)
73+
"Arguments for the fsautocomplete initialization."
74+
:group 'eglot-fsharp
75+
:risky t
76+
)
77+
5878
(defun eglot-fsharp--path-to-server ()
5979
"Return FsAutoComplete path."
6080
(file-truename (concat eglot-fsharp-server-install-dir "netcore/fsautocomplete" (if (eq system-type 'windows-nt) ".exe" ""))))
@@ -133,7 +153,7 @@ Ensure FsAutoComplete is installed (when called INTERACTIVE)."
133153

134154
(cl-defmethod eglot-initialization-options ((_server eglot-fsautocomplete))
135155
"Passes through required FsAutoComplete initialization options."
136-
'(:automaticWorkspaceInit t))
156+
`(:fSharp ,eglot-fsharp-fsautocomplete-args))
137157

138158
;; FIXME: this should be fixed in FsAutocomplete
139159
(cl-defmethod xref-backend-definitions :around ((_type symbol) _identifier)

test/integration-tests.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
(with-current-buffer (eglot-fsharp--find-file-noselect "test/Test1/Error.fs")
6262
(flymake-mode t)
6363
(flymake-start)
64+
(eglot-fsharp--sniff-diagnostics "test/Test1/Error.fs")
6465
(goto-char (point-min))
6566
(search-forward "nonexisting")
6667
(insert "x")
6768
(eglot--signal-textDocument/didChange)
68-
(eglot-fsharp--sniff-diagnostics "test/Test1/Error.fs")
6969
(flymake-goto-next-error 1 '() t)
7070
(expect (face-at-point) :to-be 'flymake-error )))
7171
(it "provides completion"

0 commit comments

Comments
 (0)