dotnet · sharwell · Feb 16, 2021 · Jan 23, 2021 · Jan 28, 2021 · Jan 28, 2021
diff --git a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.Lines.cs b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.Lines.cs
diff --git a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.Statements.cs b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.Statements.cs
diff --git a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs
@@ -62,7 +62,7 @@ static void Main(string[] args)
         }
     }
 }");
-            var terms = CSharpProximityExpressionsService.TestAccessor.Do(tree, 245);
+            var terms = CSharpProximityExpressionsService.GetProximityExpressions(tree, 245, cancellationToken: default);
             Assert.NotNull(terms);
             AssertEx.Equal(new[] { "yy", "xx" }, terms);
         }

diff --git a/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs b/src/Features/CSharp/Portable/Debugging/CSharpProximityExpressionsService.cs
@@ -92,14 +92,18 @@ public async Task<IList<string>> GetProximityExpressionsAsync(
             try
             {
                 var tree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
-                return Do(tree, position, cancellationToken);
+                return GetProximityExpressions(tree, position, cancellationToken);
             }
             catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e))
             {
                 return null;
             }
         }
 
+        public static IList<string> GetProximityExpressions(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+            => new Worker(syntaxTree, position).Do(cancellationToken);
+
+        [Obsolete($"Use {nameof(GetProximityExpressions)}.")]
         private static IList<string> Do(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
             => new Worker(syntaxTree, position).Do(cancellationToken);
 
@@ -110,11 +114,5 @@ private static void AddRelevantExpressions(
         {
             new RelevantExpressionsCollector(includeDeclarations, expressions).Visit(statement);
         }
-
-        internal static class TestAccessor
-        {
-            public static IList<string> Do(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken = default)
-                => CSharpProximityExpressionsService.Do(syntaxTree, position, cancellationToken);
-        }
     }
 }
diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
@@ -26,6 +26,9 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.Wpf" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Workspaces" />
+    <!-- BEGIN External Access -->
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
+    <!-- END External Access -->
     <!-- 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/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj b/src/Tools/ExternalAccess/Razor/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj
@@ -30,6 +30,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
+    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>

diff --git a/src/Tools/ExternalAccess/Razor/RazorCSharpBreakpointResolver.cs b/src/Tools/ExternalAccess/Razor/RazorCSharpBreakpointResolver.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.EditAndContinue;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.Razor
+{
+    internal static class RazorBreakpointSpans
+    {
+        public static bool TryGetBreakpointSpan(SyntaxTree tree, int position, CancellationToken cancellationToken, out TextSpan breakpointSpan)
+            => BreakpointSpans.TryGetBreakpointSpan(tree, position, cancellationToken, out breakpointSpan);
+    }
+}
diff --git a/src/Tools/ExternalAccess/Razor/RazorCSharpProximityExpressionResolver.cs b/src/Tools/ExternalAccess/Razor/RazorCSharpProximityExpressionResolver.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Debugging;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.Razor
+{
+    internal static class RazorCSharpProximityExpressionResolverService
+    {
+        public static IList<string> GetProximityExpressions(SyntaxTree syntaxTree, int absoluteIndex, CancellationToken cancellationToken)
+            => CSharpProximityExpressionsService.GetProximityExpressions(syntaxTree, absoluteIndex, cancellationToken);
+    }
+}