Merge remote-tracking branch 'origin/master' into feature/source-generators

Author: david-driscoll

.azure-pipelines.yml

@@ -75,9 +75,9 @@ jobs:
       - template: support/install-dotnet.yml@rsg
         parameters:
           DotNetSdk:
-            - '2.x'
-            - '3.x'
-            - '5.0.100-rc.2.20479.15'
+            - '2.1.x'
+            - '3.1.x'
+            - '5.0.x'
 
       - task: DotNetCoreCLI@2
         displayName: 'dotnet tool restore'

.build/.build.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <RootNamespace></RootNamespace>
         <IsPackable>False</IsPackable>

.build/Solution.cs

@@ -67,6 +67,9 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
                 new SetupDotNetStep("Use .NET Core 3.1 SDK") {
                     DotNetVersion = "3.1.x"
                 },
+                new SetupDotNetStep("Use .NET Core 5.0 SDK") {
+                    DotNetVersion = "5.0.x"
+                },
             }
         );
 

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
       - name: 🔨 Use .NET Core 5.0 SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: '5.0.100-rc.2.20479.15'
+          dotnet-version: '5.0.x'
       - name: 🎁 dotnet tool restore
         run: |
           dotnet tool restore

.vscode/settings.json

@@ -1,11 +1,12 @@
 {
     "coverage-gutters.lcovname": "*.info",
     "coverage-gutters.showGutterCoverage": true,
+    "omnisharp.enableLspDriver": true,
     "cSpell.words": [
         "Unregisterations",
         "Unregistration",
         "Unregistrations",
         "deresult",
         "reciever"
     ]
-}
+}

Directory.Build.targets

@@ -2,16 +2,16 @@
 <Project>
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" PrivateAssets="All" />
+        <PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" PrivateAssets="All" />
+        <PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Update="GitVersion.Tool" Version="5.5.0" />
+        <PackageReference Update="GitVersion.Tool" Version="5.5.1" />
         <PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
         <PackageReference Update="ReportGenerator" Version="4.8.0" />
-        <PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.0-beta.10" />
+        <PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />

LSP.sln

@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-E
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{AE4D7807-6F78-428C-A0D9-914BA583A104}"
-	ProjectSection(SolutionItems) = preProject
+	ProjectSection(SolutionItems) = prePrlaoject
 		.appveyor.yml = .appveyor.yml
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes

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: 558f1e114a3dc53da7c3686a657ebef070275d63
+lastSha: 0e116448e3b3f4ce0b983768c045dba0a41b6a72
 
-https://github.com/Microsoft/language-server-protocol/compare/558f1e114a3dc53da7c3686a657ebef070275d63..gh-pages
+https://github.com/Microsoft/language-server-protocol/compare/0e116448e3b3f4ce0b983768c045dba0a41b6a72..gh-pages

sample/SampleServer/Program.cs

@@ -30,7 +30,7 @@ private static async Task MainAsync(string[] args)
 
             Log.Logger.Information("This only goes file...");
 
-            IObserver<WorkDoneProgressReport> workDone = null;
+            IObserver<WorkDoneProgressReport> workDone = null!;
 
             var server = await LanguageServer.From(
                 options =>

sample/SampleServer/SemanticTokensHandler.cs

@@ -30,15 +30,15 @@ public SemanticTokensHandler(ILogger<SemanticTokensHandler> logger) : base(
         ) =>
             _logger = logger;
 
-        public override async Task<SemanticTokens> Handle(
+        public override async Task<SemanticTokens?> Handle(
             SemanticTokensParams request, CancellationToken cancellationToken
         )
         {
             var result = await base.Handle(request, cancellationToken);
             return result;
         }
 
-        public override async Task<SemanticTokens> Handle(
+        public override async Task<SemanticTokens?> Handle(
             SemanticTokensRangeParams request, CancellationToken cancellationToken
         )
         {
@@ -66,7 +66,7 @@ CancellationToken cancellationToken
             var content = await File.ReadAllTextAsync(DocumentUri.GetFileSystemPath(identifier), cancellationToken);
             await Task.Yield();
 
-            foreach (var (line, text) in content.Split('\n').Select((text, line) => ( line, text )))
+            foreach (var (line, text) in content.Split('\n').Select((text, line) => (line, text)))
             {
                 var parts = text.TrimEnd().Split(';', ' ', '.', '"', '(', ')');
                 var index = 0;

sample/SampleServer/TextDocumentHandler.cs

@@ -164,7 +164,7 @@ public MyWorkspaceSymbolsHandler(IServerWorkDoneManager serverWorkDoneManager, I
         {
             _serverWorkDoneManager = serverWorkDoneManager;
             _progressManager = progressManager;
-            this._logger = logger;
+            _logger = logger;
         }
 
         public override async Task<Container<SymbolInformation>> Handle(

src/Dap.Client/Configuration/ChainedConfigurationProvider.cs

@@ -87,7 +87,7 @@ public void Dispose()
         {
             if (_shouldDisposeConfig)
             {
-                (_config as IDisposable)?.Dispose();
+                ( _config as IDisposable )?.Dispose();
             }
         }
     }

src/Protocol/Client/Capabilities/ClientCapabilities.cs

@@ -24,9 +24,48 @@ public class ClientCapabilities : CapabilitiesBase
         [Optional]
         public WindowClientCapabilities? Window { get; set; }
 
+        /// <summary>
+        /// General client capabilities.
+        /// </summary>
+        [Optional]
+        public GeneralClientCapabilities? General { get; set; }
+
         /// <summary>
         /// Experimental client capabilities.
         /// </summary>
         public IDictionary<string, JToken> Experimental { get; set; } = new Dictionary<string, JToken>();
     }
+
+    /// <summary>
+    /// General client capabilities.
+    /// </summary>
+    public class GeneralClientCapabilities
+    {
+        /// <summary>
+        /// Client capabilities specific to regular expressions.
+        ///
+        /// @since 3.16.0 - proposed state
+        /// </summary>
+        [Optional]
+        public RegularExpressionsClientCapabilities? RegularExpressions { get; set; }
+    }
+
+    /// <summary>
+    /// Client capabilities specific to regular expressions.
+    ///
+    /// @since 3.16.0 - proposed state
+    /// </summary>
+    public class RegularExpressionsClientCapabilities
+    {
+        /// <summary>
+        /// The engine's name.
+        /// </summary>
+        public string Engine { get; set; } = null!;
+
+        /// <summary>
+        /// The engine's version.
+        /// </summary>
+        [Optional]
+        public string? Version { get; set; }
+    }
 }

src/Protocol/Client/Capabilities/CompletionItemCapabilityOptions.cs

@@ -93,7 +93,7 @@ public class CompletionItemCapabilityOptions
 
     public class CompletionItemInsertTextModeSupportCapabilityOptions
     {
-        public Container<InsertTextMode> ValueSet { get; set; }
+        public Container<InsertTextMode> ValueSet { get; set; } = null!;
     }
 
 }

src/Protocol/Client/Capabilities/OnTypeRenameClientCapabilities.cs

@@ -0,0 +1,10 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.OnTypeRename))]
+    public class OnTypeRenameClientCapabilities : DynamicCapability, ConnectedCapability<IOnTypeRenameHandler>
+    {
+
+    }
+}

src/Protocol/Client/Capabilities/ShowDocumentClientCapabilities.cs

@@ -0,0 +1,21 @@
+using System;
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    /// <summary>
+    /// Capabilities specific to the showDocument request
+    ///
+    /// @since 3.16.0 - proposed state
+    /// </summary>
+    [Obsolete(Constants.Proposal)]
+    [CapabilityKey(nameof(ClientCapabilities.Window), nameof(WindowClientCapabilities.ShowDocument))]
+    public class ShowDocumentClientCapabilities
+    {
+        /// <summary>
+        /// Capabilities specific to the `MessageActionItem` type.
+        /// </summary>
+        [Optional]
+        public bool Support { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

@@ -116,6 +116,13 @@ public class TextDocumentClientCapabilities : CapabilitiesBase
         /// </summary>
         public Supports<SelectionRangeCapability?> SelectionRange { get; set; }
 
+        /// <summary>
+        /// Capabilities specific to the `textDocument/onTypeRename` request.
+        ///
+        /// Since 3.16.0
+        /// </summary>
+        public Supports<OnTypeRenameClientCapabilities?> OnTypeRename { get; set; }
+
         /// <summary>
         /// Capabilities specific to `textDocument/publishDiagnostics`.
         /// </summary>

src/Protocol/Client/Capabilities/WindowClientCapabilities.cs

@@ -16,5 +16,12 @@ public class WindowClientCapabilities : CapabilitiesBase
         /// @since 3.16.0 - proposed state
          /// </summary>
         public Supports<ShowMessageRequestClientCapabilities> ShowMessage { get; set; }
+
+        /// <summary>
+        /// Client capabilities for the show document request.
+        ///
+        /// @since 3.16.0 - proposed state
+        /// </summary>
+        public Supports<ShowDocumentClientCapabilities> ShowDocument { get; set; }
     }
 }

src/Protocol/Document/IOnTypeRenameHandler.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.JsonRpc.Generation;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Document
+{
+    [Parallel]
+    [Obsolete(Constants.Proposal)]
+    [Method(TextDocumentNames.OnTypeRename, Direction.ClientToServer)]
+    [GenerateHandlerMethods]
+    [GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))]
+    public interface IOnTypeRenameHandler : IJsonRpcRequestHandler<OnTypeRenameParams, OnTypeRenameRanges?>, IRegistration<OnTypeRenameRegistrationOptions>, ICapability<OnTypeRenameClientCapabilities>
+    {
+    }
+
+    public abstract class OnTypeRenameHandler : IOnTypeRenameHandler
+    {
+        private readonly OnTypeRenameRegistrationOptions _options;
+        public OnTypeRenameHandler(OnTypeRenameRegistrationOptions registrationOptions) => _options = registrationOptions;
+
+        public OnTypeRenameRegistrationOptions GetRegistrationOptions() => _options;
+        public abstract Task<OnTypeRenameRanges?> Handle(OnTypeRenameParams request, CancellationToken cancellationToken);
+        public virtual void SetCapability(OnTypeRenameClientCapabilities capability) => Capability = capability;
+        protected OnTypeRenameClientCapabilities Capability { get; private set; } = null!;
+    }
+}

src/Protocol/Models/ApplyWorkspaceEditResponse.cs

@@ -17,5 +17,14 @@ public class ApplyWorkspaceEditResponse
         /// </summary>
         [Optional]
         public string? FailureReason { get; set; }
+
+        /// <summary>
+        /// Depending on the client's failure handling strategy `failedChange`
+        /// might contain the index of the change that failed. This property is
+        /// only available if the client signals a `failureHandlingStrategy`
+        /// in its client capabilities.
+        /// </summary>
+        [Optional]
+        public int? FailedChange { get; set; }
     }
 }

src/Protocol/Models/DidSaveTextDocumentParams.cs

@@ -10,11 +10,14 @@ public class DidSaveTextDocumentParams : ITextDocumentIdentifierParams, IRequest
         /// <summary>
         /// The document that was saved.
         /// </summary>
+        /// <remarks>
+        /// TODO: Change to RequiredVersionedTextDocumentIdentifier (or in the future will be VersionedTextDocumentIdentifier)
+        /// </remarks>
         public TextDocumentIdentifier TextDocument { get; set; } = null!;
 
         /// <summary>
         /// Optional the content when saved. Depends on the includeText value
-        /// when the save notifcation was requested.
+        /// when the save notification was requested.
         /// </summary>
         [Optional]
         public string? Text { get; set; }

src/Protocol/Models/FoldingRangeRegistrationOptions.cs

@@ -13,7 +13,11 @@ class FoldingRangeRegistrationOptionsConverter : RegistrationOptionsConverterBas
             public FoldingRangeRegistrationOptionsConverter() : base(nameof(ServerCapabilities.FoldingRangeProvider))
             {
             }
-            public override StaticOptions Convert(FoldingRangeRegistrationOptions source) => new StaticOptions { WorkDoneProgress = source.WorkDoneProgress };
+
+            public override StaticOptions Convert(FoldingRangeRegistrationOptions source) => new StaticOptions {
+                WorkDoneProgress = source.WorkDoneProgress,
+                DocumentSelector = source.DocumentSelector
+            };
         }
     }
 }

src/Protocol/Models/InsertReplaceEdit.cs

@@ -13,17 +13,17 @@ public class InsertReplaceEdit
         /// <summary>
         /// The string to be inserted.
         /// </summary>
-        public string NewText { get; set; }
+        public string NewText { get; set; } = null!;
 
         /// <summary>
         /// The range if the insert is requested
         /// </summary>
-        public Range Insert { get; set; }
+        public Range Insert { get; set; } = null!;
 
         /// <summary>
         /// The range if the replace is requested.
         /// </summary>
-        public Range Replace { get; set; }
+        public Range Replace { get; set; } = null!;
 
         private string DebuggerDisplay => $"{Insert} / {Replace} {( string.IsNullOrWhiteSpace(NewText) ? string.Empty : NewText.Length > 30 ? NewText.Substring(0, 30) : NewText )}";
 

src/Protocol/Models/OnTypeRenameParams.cs

@@ -0,0 +1,11 @@
+using MediatR;
+using OmniSharp.Extensions.JsonRpc;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    [Parallel]
+    [Method(TextDocumentNames.OnTypeRename, Direction.ClientToServer)]
+    public class OnTypeRenameParams : WorkDoneTextDocumentPositionParams, IRequest<OnTypeRenameRanges>
+    {
+    }
+}

src/Protocol/Models/OnTypeRenameRanges.cs

@@ -0,0 +1,21 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    public class OnTypeRenameRanges
+    {
+        /// <summary>
+        /// A list of ranges that can be renamed together. The ranges must have
+        /// identical length and contain identical text content. The ranges cannot overlap.
+        /// </summary>
+        public Container<Range> Ranges { get; set; } = null!;
+
+        /// <summary>
+        /// An optional word pattern (regular expression) that describes valid contents for
+        /// the given ranges. If no pattern is provided, the client configuration's word
+        /// pattern will be used.
+        /// </summary>
+        [Optional]
+        public string? WordPattern { get; set; }
+    }
+}