diff --git a/eng/Versions.props b/eng/Versions.props
index 935eaa1113fd8..8b8b2d3a2ebf7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,7 @@
     <VisualStudioEditorNewPackagesVersion>17.0.487</VisualStudioEditorNewPackagesVersion>
     <ILAsmPackageVersion>5.0.0-alpha1.19409.1</ILAsmPackageVersion>
     <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
-    <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.1.11</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
+    <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.2.3</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.0.31723.112</MicrosoftVisualStudioShellPackagesVersion>
     <RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>
     <!-- The version of Roslyn we build Source Generators against that are built in this
diff --git a/src/Features/LanguageServer/Protocol/DefaultCapabilitiesProvider.cs b/src/Features/LanguageServer/Protocol/DefaultCapabilitiesProvider.cs
index 5d453960a2dbc..1a49c0899535e 100644
--- a/src/Features/LanguageServer/Protocol/DefaultCapabilitiesProvider.cs
+++ b/src/Features/LanguageServer/Protocol/DefaultCapabilitiesProvider.cs
@@ -95,6 +95,7 @@ private static VSServerCapabilities GetVSServerCapabilities()
             vsServerCapabilities.OnAutoInsertProvider = new VSInternalDocumentOnAutoInsertOptions { TriggerCharacters = new[] { "'", "/", "\n" } };
             vsServerCapabilities.DocumentHighlightProvider = true;
             vsServerCapabilities.ProjectContextProvider = true;
+            vsServerCapabilities.BreakableRangeProvider = true;
 
             // Diagnostic requests are only supported from PullDiagnosticsInProcLanguageClient.
             vsServerCapabilities.SupportsDiagnosticRequests = false;
diff --git a/src/Features/LanguageServer/Protocol/Handler/Breakpoints/ValidateBreakableRangeHandler.cs b/src/Features/LanguageServer/Protocol/Handler/Breakpoints/ValidateBreakableRangeHandler.cs
new file mode 100644
index 0000000000000..e64452fd281ac
--- /dev/null
+++ b/src/Features/LanguageServer/Protocol/Handler/Breakpoints/ValidateBreakableRangeHandler.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host.Mef;
+using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
+using Microsoft.CodeAnalysis.Debugging;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.LanguageServer.Handler
+{
+    [ExportRoslynLanguagesLspRequestHandlerProvider(typeof(ValidateBreakableRangeHandler)), Shared]
+    [Method(LSP.VSInternalMethods.TextDocumentValidateBreakableRangeName)]
+    internal sealed class ValidateBreakableRangeHandler : AbstractStatelessRequestHandler<LSP.VSInternalValidateBreakableRangeParams, LSP.Range?>
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public ValidateBreakableRangeHandler()
+        {
+        }
+
+        public override bool MutatesSolutionState => false;
+        public override bool RequiresLSPSolution => true;
+
+        public override LSP.TextDocumentIdentifier? GetTextDocumentIdentifier(LSP.VSInternalValidateBreakableRangeParams request)
+            => request.TextDocument;
+
+        public override async Task<LSP.Range?> HandleRequestAsync(LSP.VSInternalValidateBreakableRangeParams request, RequestContext context, CancellationToken cancellationToken)
+        {
+            var document = context.Document;
+            Contract.ThrowIfNull(document);
+
+            var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+            var span = ProtocolConversions.RangeToTextSpan(request.Range, text);
+            var breakpointService = document.Project.LanguageServices.GetRequiredService<IBreakpointResolutionService>();
+
+            var result = await breakpointService.ResolveBreakpointAsync(document, span, cancellationToken).ConfigureAwait(false);
+            if (result == null)
+            {
+                return null;
+            }
+
+            // zero-width range means line breakpoint:
+            var breakpointSpan = result.IsLineBreakpoint ? new TextSpan(span.Start, length: 0) : result.TextSpan;
+
+            return ProtocolConversions.TextSpanToRange(breakpointSpan, text);
+        }
+    }
+}
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/ValidateBreakableRange/ValidateBreakableRangeTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/ValidateBreakableRange/ValidateBreakableRangeTests.cs
new file mode 100644
index 0000000000000..3c9f21ff26ea9
--- /dev/null
+++ b/src/Features/LanguageServer/ProtocolUnitTests/ValidateBreakableRange/ValidateBreakableRangeTests.cs
@@ -0,0 +1,101 @@
+// 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.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Roslyn.Test.Utilities;
+using Xunit;
+using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.LanguageServer.UnitTests.ValidateBreakableRange
+{
+    public class ValidateBreakableRange : AbstractLanguageServerProtocolTests
+    {
+        [Fact]
+        public async Task SimpleStatement()
+        {
+            var markup =
+@"class A
+{
+    void M()
+    {
+        {|caret:|}M();
+    }
+}";
+            using var testLspServer = await CreateTestLspServerAsync(markup);
+
+            var caret = testLspServer.GetLocations("caret").Single();
+
+            var expected = new LSP.Range()
+            {
+                Start = caret.Range.Start,
+                End = new LSP.Position(caret.Range.Start.Line, caret.Range.Start.Character + "M();".Length),
+            };
+
+            var result = await RunAsync(testLspServer, caret);
+            AssertJsonEquals(expected, result);
+        }
+
+        [Fact]
+        public async Task LineBreakpoint()
+        {
+            var markup =
+@"class A
+{
+    void M()
+    {
+#if FALSE
+        {|caret:|}M();
+#endif
+    }
+}";
+            using var testLspServer = await CreateTestLspServerAsync(markup);
+
+            var caret = testLspServer.GetLocations("caret").Single();
+
+            var expected = new LSP.Range()
+            {
+                Start = caret.Range.Start,
+                End = caret.Range.Start,
+            };
+
+            var result = await RunAsync(testLspServer, caret);
+            AssertJsonEquals(expected, result);
+        }
+
+        [Fact]
+        public async Task NoBreakpointSpan()
+        {
+            var markup =
+@"class A
+{
+    void M()
+    {
+        {|caret:|}const int a = 1;
+    }
+}";
+            using var testLspServer = await CreateTestLspServerAsync(markup);
+
+            var caret = testLspServer.GetLocations("caret").Single();
+
+            var result = await RunAsync(testLspServer, caret);
+            Assert.Null(result);
+        }
+
+        private static async Task<LSP.Range?> RunAsync(TestLspServer testLspServer, LSP.Location caret)
+        {
+            return await testLspServer.ExecuteRequestAsync<LSP.VSInternalValidateBreakableRangeParams, LSP.Range?>(
+                LSP.VSInternalMethods.TextDocumentValidateBreakableRangeName,
+                new LSP.VSInternalValidateBreakableRangeParams()
+                {
+                    TextDocument = new LSP.TextDocumentIdentifier { Uri = caret.Uri },
+                    Range = caret.Range
+                },
+                CancellationToken.None);
+        }
+    }
+}