Skip to content

Fix merge conflict #15927

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

Fix merge conflict #15927

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
8 changes: 7 additions & 1 deletion src/Compiler/Service/ServiceParsedInputOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,13 @@ module ParsedInput =
|> Option.orElseWith (fun () ->
// Last resort - check for fun { Field1 = a; F| } ->
// That is, pos is after the last field and still within braces
if pats |> List.forall (fun (_, m, _) -> rangeBeforePos m pos) then
if
pats
|> List.forall (fun (_, m, _) ->
match m with
| Some m -> rangeBeforePos m pos
| None -> false)
then
let referencedFields = pats |> List.map (fun ((_, x), _, _) -> x.idText, x.idRange)
Some(CompletionContext.Pattern(PatternContext.RecordFieldIdentifier referencedFields))
else
Expand Down