unwrap options of optional record fields when following typed path

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -1925,7 +1925,9 @@ let rec resolveNested typ ~env ~package ~nested =
         |> List.find_opt (fun (field : field) -> field.fname.txt = fieldName)
       with
       | None -> None
-      | Some {typ} -> typ |> resolveNested ~env ~package ~nested)
+      | Some {typ; optional} ->
+        let typ = if optional then Utils.unwrapIfOption typ else typ in
+        typ |> resolveNested ~env ~package ~nested)
     | NRecordBody {seenFields}, Some (Trecord {env; typeExpr}) ->
       Some (typeExpr, env, Some (Completable.RecordField {seenFields}))
     | ( NVariantPayload {constructorName = "Some"; itemNum = 0},

analysis/tests/src/CompletionExpressions.res

@@ -99,7 +99,7 @@ let fnTakingOtherRecord = (r: otherRecord) => {
 
 type recordWithOptionalField = {
   someField: int,
-  someOptField?: string,
+  someOptField?: bool,
 }
 
 let fnTakingRecordWithOptionalField = (r: recordWithOptionalField) => {

analysis/tests/src/expected/CompletionExpressions.res.txt

@@ -432,18 +432,16 @@ posCursor:[108:57] posNoWhite:[108:56] Found expr:[108:11->108:60]
 Pexp_apply ...[108:11->108:42] (...[108:43->108:60])
 Completable: Cexpression CArgument Value[fnTakingRecordWithOptionalField]($0)->recordField(someOptField)
 [{
-    "label": "None",
+    "label": "true",
     "kind": 4,
     "tags": [],
-    "detail": "string",
+    "detail": "bool",
     "documentation": null
   }, {
-    "label": "Some(_)",
+    "label": "false",
     "kind": 4,
     "tags": [],
-    "detail": "string",
-    "documentation": null,
-    "insertText": "Some(${1:_})",
-    "insertTextFormat": 2
+    "detail": "bool",
+    "documentation": null
   }]