Skip to content

Fix record completions in patterns #15945

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 1 commit into from
Sep 12, 2023
Merged

Fix record completions in patterns #15945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,6 @@ let BuildFieldMap (cenv: cenv) env isPartial ty (flds: ((Ident list * Ident) * '
let g = cenv.g
let ad = env.eAccessRights

if isNil flds then invalidArg "flds" "BuildFieldMap"

let allFields = flds |> List.map (fun ((_, ident), _) -> ident)
if allFields.Length > 1 then
// In the case of nested record fields on the same level in record copy-and-update.
Expand Down
13 changes: 7 additions & 6 deletions src/Compiler/Service/ServiceParsedInputOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ module ParsedInput =
| _ ->
pats
|> List.tryPick (fun pat -> TryGetCompletionContextInPattern false pat None pos)
| SynPat.Record (fieldPats = pats) ->
| SynPat.Record (fieldPats = pats; range = m) when rangeContainsPos m pos ->
pats
|> List.tryPick (fun ((_, fieldId), _, pat) ->
if rangeContainsPos fieldId.idRange pos then
Expand All @@ -1328,15 +1328,16 @@ module ParsedInput =
// That is, pos is after the last field and still within braces
if
pats
|> List.forall (fun (_, m, _) ->
match m with
| Some m -> rangeBeforePos m pos
| None -> false)
|> List.forall (fun (_, mEquals, pat) ->
match mEquals, pat with
| Some mEquals, SynPat.Wild mPat -> rangeBeforePos mEquals pos && mPat.StartColumn <> mPat.EndColumn
| Some mEquals, _ -> rangeBeforePos mEquals pos
| _ -> false)
then
let referencedFields = pats |> List.map (fun ((_, x), _, _) -> x.idText, x.idRange)
Some(CompletionContext.Pattern(PatternContext.RecordFieldIdentifier referencedFields))
else
None)
Some(CompletionContext.Pattern PatternContext.Other))
| SynPat.Ands (pats = pats)
| SynPat.ArrayOrList (elementPats = pats) ->
pats
Expand Down
19 changes: 18 additions & 1 deletion vsintegration/tests/FSharp.Editor.Tests/CompletionProviderTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1935,7 +1935,14 @@ type R1 = { A: int; B: int }
type R2 = { C: int; D: int }

match [] with
| [ { A = 2; l = 2 } ]
| [ { A = 2; l = 2 } ] -> ()

match { A = 1; B = 2 } with
| { A = 1; } -> ()
| { A = 2; s } -> ()
| { B = } -> ()
| { X = ; A = 3 } -> ()
| { } -> ()
"""

VerifyCompletionList(
Expand All @@ -1945,6 +1952,16 @@ match [] with
[ "A"; "C"; "D"; "DU"; "X"; "log"; "let"; "Lazy" ]
)

VerifyCompletionList(fileContents, "| { A = 1; ", [ "B"; "R1"; "R2" ], [ "C"; "D" ])
VerifyCompletionList(fileContents, "| { A = 2; s", [ "B"; "R1"; "R2" ], [ "C"; "D" ])
VerifyCompletionList(fileContents, "| { B =", [ "R1"; "R2"; "Some"; "None"; "System"; "DU" ], [ "A"; "B"; "C"; "D" ])
VerifyCompletionList(fileContents, "| { B = ", [ "R1"; "R2"; "Some"; "None"; "System"; "DU" ], [ "A"; "B"; "C"; "D" ])
VerifyCompletionList(fileContents, "| { X =", [ "R1"; "R2"; "Some"; "None"; "System"; "DU" ], [ "A"; "B"; "C"; "D" ])
VerifyCompletionList(fileContents, "| { X = ", [ "R1"; "R2"; "Some"; "None"; "System"; "DU" ], [ "A"; "B"; "C"; "D" ])

// Ideally C and D should not be present here, but right now we're not able to filter fields in an empty record pattern stub
VerifyCompletionList(fileContents, "| { ", [ "A"; "B"; "C"; "D"; "R1"; "R2" ], [])

[<Fact>]
let ``Completion list for record field identifier in a pattern contains fields of all records in scope when the record type is not known yet``
()
Expand Down