Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions language-server-protocol.sha.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
lastSha: 1a69f1270d59cccd7b85e0697450950abd5a0221
lastSha: 202045f6546ba46b3c4fda08bbb91308f427902a

https://github.com/Microsoft/language-server-protocol/compare/<lastSha>..<newSha>
https://github.com/Microsoft/language-server-protocol/compare/<lastSha>..gh-pages
10 changes: 10 additions & 0 deletions src/Protocol/Models/ApplyWorkspaceEditResponse.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;

namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
{
Expand All @@ -9,5 +10,14 @@ public class ApplyWorkspaceEditResponse
/// Indicates whether the edit was applied or not.
/// </summary>
public bool Applied { get; set; }

/// <summary>
/// An optional textual description for why the edit was not applied.
/// This may be used may be used by the server for diagnostic
/// logging or to provide a suitable error for a request that
/// triggered the edit.
/// </summary>
[Optional]
public string FailureReason { get; set; }
}
}
12 changes: 11 additions & 1 deletion src/Protocol/Models/CompletionRegistrationOptions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Newtonsoft.Json;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;

Expand All @@ -18,5 +18,15 @@ public class CompletionRegistrationOptions : TextDocumentRegistrationOptions, IC
/// </summary>
[Optional]
public bool ResolveProvider { get; set; }

/// <summary>
/// The list of all possible characters that commit a completion. This field can be used
/// if clients don't support individual commit characters per completion item. See
/// `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
///
/// Since 3.2.0
/// </summary>
[Optional]
public Container<string> AllCommitCharacters { get; set; }
}
}
4 changes: 4 additions & 0 deletions src/Protocol/Models/IDeclarationOptions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
{
public interface IDeclarationOptions { }
}
12 changes: 12 additions & 0 deletions src/Protocol/Server/Capabilities/DeclarationOptions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using OmniSharp.Extensions.LanguageServer.Protocol.Models;

namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities
{
public class DeclarationOptions : StaticTextDocumentRegistrationOptions, IDeclarationOptions
{
public static DeclarationOptions Of(IDeclarationOptions options)
{
return new DeclarationOptions() { };
}
}
}
8 changes: 7 additions & 1 deletion src/Protocol/Server/Capabilities/ServerCapabilities.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
Expand Down Expand Up @@ -134,6 +134,12 @@ public class ServerCapabilities
/// </summary>
public BooleanOr<FoldingRangeOptions> FoldingRangeProvider { get; set; }
/// <summary>
/// The server provides folding provider support.
///
/// Since 3.14.0
/// </summary>
public BooleanOr<DeclarationOptions> DeclarationProvider { get; set; }
/// <summary>
/// Workspace specific server capabilities
/// </summary>
[Optional]
Expand Down
1 change: 1 addition & 0 deletions src/Server/LanguageServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
TypeDefinitionProvider = ccp.GetStaticOptions(textDocumentCapabilities.TypeDefinition).Get<ITypeDefinitionOptions, TypeDefinitionOptions>(TypeDefinitionOptions.Of),
ColorProvider = ccp.GetStaticOptions(textDocumentCapabilities.ColorProvider).Get<IColorOptions, ColorOptions>(ColorOptions.Of),
FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRange).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
DeclarationProvider = ccp.GetStaticOptions(textDocumentCapabilities.Declaration).Get<IDeclarationOptions, DeclarationOptions>(DeclarationOptions.Of),
};

if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))
Expand Down