From d6e045a0b73d5bab7fe688bd18ad3bfd21150a83 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Tue, 1 Dec 2020 17:04:36 -0500 Subject: [PATCH 1/2] OnTypeRename -> LinkedEditingRange --- .../TextDocumentClientCapabilities.cs | 4 ++-- .../Document/DocumentOnTypeFormattingFeature.cs | 2 +- ...meFeature.cs => LinkedEditingRangeFeature.cs} | 16 ++++++++-------- .../Server/Capabilities/ServerCapabilities.cs | 2 +- src/Protocol/TextDocumentNames.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/Protocol/Features/Document/{OnTypeRenameFeature.cs => LinkedEditingRangeFeature.cs} (70%) diff --git a/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs b/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs index 717631816..c21839946 100644 --- a/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs +++ b/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs @@ -117,11 +117,11 @@ public class TextDocumentClientCapabilities : CapabilitiesBase public Supports SelectionRange { get; set; } /// - /// Capabilities specific to the `textDocument/onTypeRename` request. + /// Capabilities specific to the `textDocument/linkedEditingRange` request. /// /// Since 3.16.0 /// - public Supports OnTypeRename { get; set; } + public Supports LinkedEditingRange { get; set; } /// /// Capabilities specific to `textDocument/publishDiagnostics`. diff --git a/src/Protocol/Features/Document/DocumentOnTypeFormattingFeature.cs b/src/Protocol/Features/Document/DocumentOnTypeFormattingFeature.cs index 79dcd652e..279646a4f 100644 --- a/src/Protocol/Features/Document/DocumentOnTypeFormattingFeature.cs +++ b/src/Protocol/Features/Document/DocumentOnTypeFormattingFeature.cs @@ -24,7 +24,7 @@ namespace Models GenerateHandlerMethods, GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient)) ] - [RegistrationOptions(typeof(OnTypeRenameRegistrationOptions)), Capability(typeof(DocumentOnTypeFormattingCapability))] + [RegistrationOptions(typeof(DocumentOnTypeFormattingRegistrationOptions)), Capability(typeof(DocumentOnTypeFormattingCapability))] public partial record DocumentOnTypeFormattingParams : ITextDocumentIdentifierParams, IRequest { /// diff --git a/src/Protocol/Features/Document/OnTypeRenameFeature.cs b/src/Protocol/Features/Document/LinkedEditingRangeFeature.cs similarity index 70% rename from src/Protocol/Features/Document/OnTypeRenameFeature.cs rename to src/Protocol/Features/Document/LinkedEditingRangeFeature.cs index 0eb053b71..c611e820c 100644 --- a/src/Protocol/Features/Document/OnTypeRenameFeature.cs +++ b/src/Protocol/Features/Document/LinkedEditingRangeFeature.cs @@ -19,19 +19,19 @@ namespace Models { [Parallel] [Obsolete(Constants.Proposal)] - [Method(TextDocumentNames.OnTypeRename, Direction.ClientToServer)] + [Method(TextDocumentNames.LinkedEditingRange, Direction.ClientToServer)] [ GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document"), GenerateHandlerMethods, GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient)) ] - [RegistrationOptions(typeof(OnTypeRenameRegistrationOptions)), Capability(typeof(OnTypeRenameClientCapabilities))] - public partial record OnTypeRenameParams : TextDocumentPositionParams, IWorkDoneProgressParams, IRequest + [RegistrationOptions(typeof(LinkedEditingRangeRegistrationOptions)), Capability(typeof(LinkedEditingRangeClientCapabilities))] + public partial record LinkedEditingRangeParams : TextDocumentPositionParams, IWorkDoneProgressParams, IRequest { } [Obsolete(Constants.Proposal)] - public partial record OnTypeRenameRanges + public partial record LinkedEditingRanges { /// /// A list of ranges that can be renamed together. The ranges must have @@ -49,16 +49,16 @@ public partial record OnTypeRenameRanges } [Obsolete(Constants.Proposal)] - [GenerateRegistrationOptions(nameof(ServerCapabilities.OnTypeRenameProvider))] - public partial class OnTypeRenameRegistrationOptions : ITextDocumentRegistrationOptions, IWorkDoneProgressOptions { } + [GenerateRegistrationOptions(nameof(ServerCapabilities.LinkedEditingRangeProvider))] + public partial class LinkedEditingRangeRegistrationOptions : ITextDocumentRegistrationOptions, IWorkDoneProgressOptions { } } namespace Client.Capabilities { [Obsolete(Constants.Proposal)] - [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.OnTypeRename))] - public partial class OnTypeRenameClientCapabilities : DynamicCapability, ConnectedCapability { } + [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.LinkedEditingRange))] + public partial class LinkedEditingRangeClientCapabilities : DynamicCapability, ConnectedCapability { } } namespace Document diff --git a/src/Protocol/Server/Capabilities/ServerCapabilities.cs b/src/Protocol/Server/Capabilities/ServerCapabilities.cs index 670a98aae..e40214b9c 100644 --- a/src/Protocol/Server/Capabilities/ServerCapabilities.cs +++ b/src/Protocol/Server/Capabilities/ServerCapabilities.cs @@ -191,7 +191,7 @@ public class ServerCapabilities : CapabilitiesBase /// [Optional] [Obsolete(Constants.Proposal)] - public BooleanOr? OnTypeRenameProvider { get; set; } + public BooleanOr? LinkedEditingRangeProvider { get; set; } /// /// The server provides folding provider support. diff --git a/src/Protocol/TextDocumentNames.cs b/src/Protocol/TextDocumentNames.cs index 34936542f..bc55214a3 100644 --- a/src/Protocol/TextDocumentNames.cs +++ b/src/Protocol/TextDocumentNames.cs @@ -45,6 +45,6 @@ public static class TextDocumentNames [Obsolete(Constants.Proposal)] public const string SemanticTokensFullDelta = "textDocument/semanticTokens/full/delta"; [Obsolete(Constants.Proposal)] public const string SemanticTokensRange = "textDocument/semanticTokens/range"; [Obsolete(Constants.Proposal)] public const string Moniker = "textDocument/moniker"; - [Obsolete(Constants.Proposal)] public const string OnTypeRename = "textDocument/onTypeRename"; + [Obsolete(Constants.Proposal)] public const string LinkedEditingRange = "textDocument/linkedEditingRange"; } } From 981585953f42c631857e760ca7c9cbd3eaf43526 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Tue, 1 Dec 2020 17:07:37 -0500 Subject: [PATCH 2/2] Updated shas --- debug-adapter-protocol.sha.txt | 4 ++-- language-server-protocol.sha.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debug-adapter-protocol.sha.txt b/debug-adapter-protocol.sha.txt index 38cf3d25f..b140a2ce0 100644 --- a/debug-adapter-protocol.sha.txt +++ b/debug-adapter-protocol.sha.txt @@ -1,4 +1,4 @@ -- This is the last commit we caught up with https://github.com/microsoft/debug-adapter-protocol/commits/gh-pages -lastSha: fd7d38013c9e13e92c0ca4dfa83048d355cb057d +lastSha: eded56aa372c7921205fad496e87f57d2adf176d -https://github.com/microsoft/debug-adapter-protocol/compare/fd7d38013c9e13e92c0ca4dfa83048d355cb057d..gh-pages +https://github.com/microsoft/debug-adapter-protocol/compare/eded56aa372c7921205fad496e87f57d2adf176d..gh-pages diff --git a/language-server-protocol.sha.txt b/language-server-protocol.sha.txt index 353255758..19ad6743d 100644 --- a/language-server-protocol.sha.txt +++ b/language-server-protocol.sha.txt @@ -1,4 +1,4 @@ -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages -lastSha: ed36538a180f15d33ffb03365fba4ace47b42d68 +lastSha: c485961250d0eb41e53b148b55262ec180b63273 -https://github.com/Microsoft/language-server-protocol/compare/ed36538a180f15d33ffb03365fba4ace47b42d68..gh-pages +https://github.com/Microsoft/language-server-protocol/compare/c485961250d0eb41e53b148b55262ec180b63273..gh-pages