From 0f821f0e5a8e3f111d9dc5d912cae952bda008b2 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 5 Sep 2023 11:43:30 +0200 Subject: [PATCH] fix merge conflict --- src/Compiler/Service/ServiceParsedInputOps.fs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Compiler/Service/ServiceParsedInputOps.fs b/src/Compiler/Service/ServiceParsedInputOps.fs index c1d2d6e0c45..73c2a36b5bd 100644 --- a/src/Compiler/Service/ServiceParsedInputOps.fs +++ b/src/Compiler/Service/ServiceParsedInputOps.fs @@ -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