From 2e03d2dd1117dba67698e94f6d440cebc5d22add Mon Sep 17 00:00:00 2001
From: Jimmy Byrd <jimmy.byrd@motivity.net>
Date: Tue, 11 Nov 2025 22:47:56 -0500
Subject: [PATCH 1/2] Update FSharp.Compiler.Service to 43.10.100

---
 Directory.Packages.props                      |  4 +--
 .../GenerateModel.fs                          | 36 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0f6a9d08..9c98df14 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- locking the version of F# Core as FCS does this anyway and in practise all will be using the same version -->
-    <PackageVersion Include="FSharp.Core" Version="[9.0.100]" />
-    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.9.100]" />
+    <PackageVersion Include="FSharp.Core" Version="[10.0.100]" />
+    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.10.100]" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Microsoft.Build" Version="" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="" PrivateAssets="all" />
diff --git a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
index c1c7272f..a70f7f70 100644
--- a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
+++ b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
@@ -1385,12 +1385,12 @@ module internal SymbolReader =
 
     let readMemberOrVal (ctx: ReadingContext) (v: FSharpMemberOrFunctionOrValue) =
         let requireQualifiedAccess =
-            hasAttrib<RequireQualifiedAccessAttribute> v.ApparentEnclosingEntity.Attributes
-            // Hack for FSHarp.Core - `Option` module doesn't have RQA but really should have
-            || (v.ApparentEnclosingEntity.Namespace = Some "Microsoft.FSharp.Core"
-                && v.ApparentEnclosingEntity.DisplayName = "Option")
-            || (v.ApparentEnclosingEntity.Namespace = Some "Microsoft.FSharp.Core"
-                && v.ApparentEnclosingEntity.DisplayName = "ValueOption")
+            v.ApparentEnclosingEntity
+            |> Option.exists (fun aee ->
+                hasAttrib<RequireQualifiedAccessAttribute> aee.Attributes
+                // Hack for FSHarp.Core - `Option` module doesn't have RQA but really should have
+                || (aee.Namespace = Some "Microsoft.FSharp.Core" && aee.DisplayName = "Option")
+                || (aee.Namespace = Some "Microsoft.FSharp.Core" && aee.DisplayName = "ValueOption"))
 
         let customOpName =
             match tryFindAttrib<CustomOperationAttribute> v.Attributes with
@@ -1406,7 +1406,8 @@ module internal SymbolReader =
         // This module doesn't have RequireQualifiedAccessAttribute and anyway we want the name to show
         // usage of its members as Array.Parallel.map
         let specialCase1 =
-            v.ApparentEnclosingEntity.TryFullName = Some "Microsoft.FSharp.Collections.ArrayModule.Parallel"
+            v.ApparentEnclosingEntity
+            |> Option.exists (fun aee -> aee.TryFullName = Some "Microsoft.FSharp.Collections.ArrayModule.Parallel")
 
         let argInfos, retInfo = FSharpType.Prettify(v.CurriedParameterGroups, v.ReturnParameter)
 
@@ -1439,7 +1440,13 @@ module internal SymbolReader =
 
             match v.IsMember, v.IsInstanceMember, v.LogicalName, v.DisplayName, customOpName with
             // Constructors
-            | _, _, ".ctor", _, _ -> span [] [ !!v.ApparentEnclosingEntity.DisplayName; fullArgUsage ]
+            | _, _, ".ctor", _, _ ->
+                span
+                    []
+                    [ match v.ApparentEnclosingEntity with
+                      | None -> ()
+                      | Some aee -> !!aee.DisplayName
+                      fullArgUsage ]
 
             // Indexers
             | _, true, _, "Item", _ -> span [] [ !! "this["; fullArgUsage; !! "]" ]
@@ -1515,7 +1522,9 @@ module internal SymbolReader =
             | _, false, _, name, _ ->
                 span
                     []
-                    [ !!(v.ApparentEnclosingEntity.DisplayName + "." + name)
+                    [ match v.ApparentEnclosingEntity with
+                      | None -> !!name
+                      | Some aee -> !!(aee.DisplayName + "." + name)
                       if preferNoParens then
                           !! "&#32;"
                       fullArgUsage ]
@@ -1552,7 +1561,7 @@ module internal SymbolReader =
         // Hence getting the generic argument count if this is a little trickier
         let numGenericParamsOfApparentParent =
             let pty = v.ApparentEnclosingEntity
-            pty.GenericParameters.Count
+            pty |> Option.map _.GenericParameters.Count |> Option.defaultValue 0
 
         // Ensure that there is enough number of elements to skip
         let tps =
@@ -1586,10 +1595,9 @@ module internal SymbolReader =
         let extendedType =
             if v.IsExtensionMember then
                 try
-                    Some(
-                        v.ApparentEnclosingEntity,
-                        formatTyconRefAsHtml ctx.UrlMap v.ApparentEnclosingEntity |> codeHtml
-                    )
+                    match v.ApparentEnclosingEntity with
+                    | Some aee -> Some(aee, formatTyconRefAsHtml ctx.UrlMap aee |> codeHtml)
+                    | None -> None
                 with _ ->
                     None
             else

From 5ed3222caf343fe0988d18455cd118bc73943aa3 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Wed, 12 Nov 2025 08:29:53 +0100
Subject: [PATCH 2/2] Add release note entry

---
 RELEASE_NOTES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e25b0ab8..f08cd6a2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+* Update FCS to 43.10.100. [#935](https://github.com/fsprojects/FSharp.Formatting/pull/966)
+
 ## 21.0.0 - 2025-11-12
 
 Stable release