Skip to content

Enable completions in enum case value expression #15568

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 19, 2023
Merged

Enable completions in enum case value expression #15568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c57fe98
Enable completions in enum case value expression
kerams Jul 6, 2023
9b71362
Why, Fantomas, why?
kerams Jul 6, 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
12 changes: 9 additions & 3 deletions src/Compiler/Service/ServiceParsedInputOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,9 +1520,15 @@ module ParsedInput =
None)
| _ -> None)

member _.VisitEnumDefn(_, _, _) =
// No completions anywhere in an enum, except in attributes, which is established earlier in VisitAttributeApplication
Some CompletionContext.Invalid
member _.VisitEnumDefn(_, cases, _) =
cases
|> List.tryPick (fun (SynEnumCase(ident = SynIdent (ident = id))) ->
if rangeContainsPos id.idRange pos then
// No completions in an enum case identifier
Some CompletionContext.Invalid
else
// The value expression should still get completions
None)

member _.VisitTypeAbbrev(_, _, range) =
if rangeContainsPos range pos then
Expand Down
4 changes: 4 additions & 0 deletions vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,11 +1281,15 @@ type A = l
let ``No completion on enum case identifier at declaration site`` () =
let fileContents =
"""
let [<Literal>] lit = 1

type A =
| C = 0
| D = l
"""

VerifyNoCompletionList(fileContents, "| C")
VerifyCompletionList(fileContents, "| D = l", [ "lit" ], [])

[<Fact>]
let ``Completion list in generic function body contains type parameter`` () =
Expand Down