diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
index 0770ee7b78628218f04695534036d64f852ddbb7..d6336e3af57ff9a67d5ed49cf9d5f98900539641 100644
--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -47,7 +47,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.ServiceHub" />
-    <InternalsVisibleTo Include="FSharp.Editor" Key="$(FSharpKey)" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
     <InternalsVisibleTo Include="Roslyn.Services.Test.Utilities" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.UnitTests" />
diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
index 700cc896f3cd1c679df034b01a4ddf97c8598001..acf4d8d5424e53dc53965878067313bca2fdbd5c 100644
--- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
@@ -39,6 +39,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" />
@@ -52,8 +53,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0" Key="$(RemoteLanguageServiceKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Xaml" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.VisualBasic.Repl" />
-    <InternalsVisibleTo Include="FSharp.Editor" Key="$(FSharpKey)" />
-    <InternalsVisibleTo Include="FSharp.LanguageService" Key="$(FSharpKey)" />
     <!-- BEGIN MONODEVELOP
     These MonoDevelop dependencies don't ship with Visual Studio, so can't break our
     binary insertions and are exempted from the ExternalAccess adapter assembly policies.
diff --git a/src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs b/src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs
index b5a3d33a9eca5f16d03e6e43d4472b44bdf9a86c..34710362235633df9c71781a85e4248b32a7fd12 100644
--- a/src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs
+++ b/src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs
@@ -4,6 +4,6 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Completion
 {
     public static class CompletionOptions
     {
-        public static readonly PerLanguageOption<bool> BlockForCompletionItems = Microsoft.CodeAnalysis.Completion.CompletionOptions.BlockForCompletionItems
+        public static readonly PerLanguageOption<bool> BlockForCompletionItems = Microsoft.CodeAnalysis.Completion.CompletionOptions.BlockForCompletionItems;
     }
 }
diff --git a/src/Tools/ExternalAccess/FSharp/Diagnostics/FSharpDiagnosticAnalyzerService.cs b/src/Tools/ExternalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
similarity index 76%
rename from src/Tools/ExternalAccess/FSharp/Diagnostics/FSharpDiagnosticAnalyzerService.cs
rename to src/Tools/ExternalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
index 220c5040f589c78717c55d6060aa7af47b65a893..adfb88fae0fbce9e7eed5c3a924fcb71dc90910b 100644
--- a/src/Tools/ExternalAccess/FSharp/Diagnostics/FSharpDiagnosticAnalyzerService.cs
+++ b/src/Tools/ExternalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
@@ -5,12 +5,12 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics
 {
     [Export(typeof(IDiagnosticAnalyzerService))]
     [Shared]
-    internal sealed class FSharpDiagnosticAnalyzerService : IDiagnosticAnalyzerService
+    internal class DiagnosticAnalyzerService : IDiagnosticAnalyzerService
     {
         private readonly Microsoft.CodeAnalysis.Diagnostics.IDiagnosticAnalyzerService _delegatee;
 
         [ImportingConstructor]
-        public FSharpDiagnosticAnalyzerService(Microsoft.CodeAnalysis.Diagnostics.IDiagnosticAnalyzerService delegatee)
+        public DiagnosticAnalyzerService(Microsoft.CodeAnalysis.Diagnostics.IDiagnosticAnalyzerService delegatee)
         {
             _delegatee = delegatee;
         }
diff --git a/src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs b/src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs
new file mode 100644
index 0000000000000000000000000000000000000000..81b06b35088e8528031ac4a548e7564062200c8c
--- /dev/null
+++ b/src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor
+{
+    [ExportBraceMatcher(LanguageNames.FSharp)]
+    internal class FSharpBraceMatcher : IBraceMatcher
+    {
+        private readonly IFSharpBraceMatcher _braceMatcher;
+
+        public FSharpBraceMatcher(IFSharpBraceMatcher braceMatcher)
+        {
+            _braceMatcher = braceMatcher;
+        }
+
+        public async Task<Microsoft.CodeAnalysis.Editor.BraceMatchingResult?> FindBracesAsync(Document document, int position, CancellationToken cancellationToken = default)
+        {
+            var result = await _braceMatcher.FindBracesAsync(document, position, cancellationToken).ConfigureAwait(false);
+            if (result.HasValue)
+            {
+                return new Microsoft.CodeAnalysis.Editor.BraceMatchingResult(result.Value.LeftSpan, result.Value.RightSpan);
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs b/src/Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b26bbd8d3c5024b001e8b92d018d3520916a1520
--- /dev/null
+++ b/src/Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs
@@ -0,0 +1,24 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor
+{
+    public struct BraceMatchingResult
+    {
+        public TextSpan LeftSpan { get; }
+        public TextSpan RightSpan { get; }
+
+        public BraceMatchingResult(TextSpan leftSpan, TextSpan rightSpan)
+            : this()
+        {
+            this.LeftSpan = leftSpan;
+            this.RightSpan = rightSpan;
+        }
+    }
+
+    public interface IFSharpBraceMatcher
+    {
+        Task<BraceMatchingResult?> FindBracesAsync(Document document, int position, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt b/src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
index 35ccfe2f221aa609a34daed1d001a88919659c12..3b8a77e313b60c703d369ad1ba9c629c28961743 100644
--- a/src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
+++ b/src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
@@ -3,6 +3,12 @@ Microsoft.CodeAnalysis.ExternalAccess.FSharp.Completion.CompletionOptions
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.DiagnosticCustomTags
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.IDiagnosticAnalyzerService
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.IDiagnosticAnalyzerService.Reanalyze(Microsoft.CodeAnalysis.Workspace workspace, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ProjectId> projectIds = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.DocumentId> documentIds = null, bool highPriority = false) -> void
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.BraceMatchingResult(Microsoft.CodeAnalysis.Text.TextSpan leftSpan, Microsoft.CodeAnalysis.Text.TextSpan rightSpan) -> void
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.LeftSpan.get -> Microsoft.CodeAnalysis.Text.TextSpan
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.RightSpan.get -> Microsoft.CodeAnalysis.Text.TextSpan
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.IFSharpBraceMatcher
+Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.IFSharpBraceMatcher.FindBracesAsync(Microsoft.CodeAnalysis.Document document, int position, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult?>
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap.ClassificationTypeMap(Microsoft.VisualStudio.Text.Classification.IClassificationTypeRegistryService registryService) -> void
 Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap.GetClassificationType(string name) -> Microsoft.VisualStudio.Text.Classification.IClassificationType
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 9e563a5224605d28d6e31e072d2a98dd7d5baba9..fd2d614851f8695cae56db925faedbef4c2de488 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -111,6 +111,7 @@
     <InternalsVisibleTo Include="RoslynTaoActions" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.ErrorList.UnitTests" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" />
@@ -126,8 +127,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.7" Key="$(RemoteLanguageServiceKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.8" Key="$(RemoteLanguageServiceKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0" Key="$(RemoteLanguageServiceKey)" />
-    <InternalsVisibleTo Include="FSharp.Editor" Key="$(FSharpKey)" />
-    <InternalsVisibleTo Include="FSharp.LanguageService" Key="$(FSharpKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Razor" Key="$(RazorKey)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
index b59a19a1658dce680781f7f309956de1e81b5cea..831e70d1c8fb0054112507306324d1b3ae0eaf5b 100644
--- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
+++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
@@ -25,6 +25,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote" Key="$(RemoteLanguageServiceKey)" />
@@ -35,8 +36,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.7" Key="$(RemoteLanguageServiceKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.8" Key="$(RemoteLanguageServiceKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0" Key="$(RemoteLanguageServiceKey)" />
-    <InternalsVisibleTo Include="FSharp.Editor" Key="$(FSharpKey)" />
-    <InternalsVisibleTo Include="FSharp.LanguageService" Key="$(FSharpKey)" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />