Merge pull request #126 from OmniSharp/upgrade/latest-lsp

Upgrade/latest lsp

language-server-protocol.sha.txt

@@ -1,2 +1,4 @@
 -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
-9e2713d5f1618b8d5e05a91a4e2c637aa51e1ee0
+lastSha: 1a69f1270d59cccd7b85e0697450950abd5a0221
+
+https://github.com/Microsoft/language-server-protocol/compare/<lastSha>..<newSha>

src/Client/LspErrorCodes.cs

@@ -44,5 +44,10 @@ public static class LspErrorCodes
         ///     Request was cancelled.
         /// </summary>
         public const int RequestCancelled = -32800;
+
+        /// <summary>
+        ///     Request was cancelled.
+        /// </summary>
+        public const int ContentModified = -32801;
     }
 }

src/Protocol/Client/Capabilities/DeclarationCapability.cs

@@ -0,0 +1,6 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Server;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public class DeclarationCapability : LinkSupportCapability, ConnectedCapability<IDeclarationHandler> { }
+}

src/Protocol/Client/Capabilities/DefinitionCapability.cs

@@ -2,5 +2,5 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class DefinitionCapability : DynamicCapability, ConnectedCapability<IDefinitionHandler> { }
+    public class DefinitionCapability : LinkSupportCapability, ConnectedCapability<IDefinitionHandler> { }
 }

src/Protocol/Client/Capabilities/ImplementationCapability.cs

@@ -2,5 +2,5 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class ImplementationCapability : DynamicCapability, ConnectedCapability<IImplementationHandler> {}
+    public class ImplementationCapability : LinkSupportCapability, ConnectedCapability<IImplementationHandler> {}
 }

src/Protocol/Client/Capabilities/LinkSupportCapability.cs

@@ -0,0 +1,10 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public abstract class LinkSupportCapability : DynamicCapability
+    {
+        [Optional]
+        public bool LinkSupport { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/SignatureInformationCapability.cs

@@ -10,6 +10,9 @@ public class SignatureInformationCapability
         /// Client supports the follow content formats for the content property. The order describes the preferred format of the client.
         /// </summary>
         [Optional]
-        public Container<MarkupKind> ContentFormat { get; set; }
+        public Container<MarkupKind> DocumentationFormat { get; set; }
+
+        [Optional]
+        public SignatureParameterInformationCapability ParameterInformation { get; set; }
     }
 }

src/Protocol/Client/Capabilities/SignatureParameterInformationCapability.cs

@@ -0,0 +1,14 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
+{
+    public class SignatureParameterInformationCapability
+    {
+        /// <summary>
+        /// The client supports processing label offsets instead of a
+        /// simple label string.
+        /// </summary>
+        [Optional]
+        public bool LabelOffsetSupport { get; set; }
+    }
+}

src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

@@ -58,6 +58,11 @@ public class TextDocumentClientCapabilities
         /// </summary>
         public Supports<DefinitionCapability> Definition { get; set; }
 
+        /// <summary>
+        /// Capabilities specific to the `textDocument/declaration`
+        /// </summary>
+        public Supports<DeclarationCapability> Declaration { get; set; }
+
         /// <summary>
         /// Capabilities specific to the `textDocument/codeAction`
         /// </summary>

src/Protocol/Client/Capabilities/TypeDefinitionCapability.cs

@@ -2,5 +2,5 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class TypeDefinitionCapability : DynamicCapability, ConnectedCapability<ITypeDefinitionHandler> {}
+    public class TypeDefinitionCapability : LinkSupportCapability, ConnectedCapability<ITypeDefinitionHandler> {}
 }

src/Protocol/Client/Capabilities/WorkspaceEditCapability.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
@@ -11,5 +12,17 @@ public class WorkspaceEditCapability
         /// </summary>
         [Optional]
         public bool DocumentChanges { get; set; }
+        /// <summary>
+		/// The resource operations the client supports. Clients should at least
+		/// support 'create', 'rename' and 'delete' files and folders.
+        /// </summary>
+        [Optional]
+        public ResourceOperationKind[] ResourceOperations { get; set; }
+        /// <summary>
+		/// The failure handling strategy of a client if applying the workspace edit
+		/// fails.
+        /// </summary>
+        [Optional]
+        public FailureHandlingKind? FailureHandling { get; set; }
     }
 }

src/Protocol/Document/Client/DeclarationExtensions.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+// ReSharper disable CheckNamespace
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
+{
+    public static class DeclarationExtensions
+    {
+        public static Task<LocationOrLocationLinks> Declaration(this ILanguageClientDocument mediator, DeclarationParams @params)
+        {
+            return mediator.SendRequest<DeclarationParams, LocationOrLocationLinks>(DocumentNames.Declaration, @params);
+        }
+    }
+}

src/Protocol/Document/Client/DefinitionExtensions.cs

@@ -9,9 +9,9 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
 {
     public static class DefinitionExtensions
     {
-        public static Task<LocationOrLocations> Definition(this ILanguageClientDocument mediator, DefinitionParams @params)
+        public static Task<LocationOrLocationLinks> Definition(this ILanguageClientDocument mediator, DefinitionParams @params)
         {
-            return mediator.SendRequest<DefinitionParams, LocationOrLocations>(DocumentNames.Definition, @params);
+            return mediator.SendRequest<DefinitionParams, LocationOrLocationLinks>(DocumentNames.Definition, @params);
         }
     }
 }

src/Protocol/Document/Client/DocumentSymbolExtensions.cs

@@ -9,9 +9,9 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
 {
     public static class DocumentSymbolExtensions
     {
-        public static Task<DocumentSymbolInformationOrDocumentSymbolContainer> DocumentSymbol(this ILanguageClientDocument mediator, DocumentSymbolParams @params)
+        public static Task<SymbolInformationOrDocumentSymbolContainer> DocumentSymbol(this ILanguageClientDocument mediator, DocumentSymbolParams @params)
         {
-            return mediator.SendRequest<DocumentSymbolParams, DocumentSymbolInformationOrDocumentSymbolContainer>(DocumentNames.DocumentSymbol, @params);
+            return mediator.SendRequest<DocumentSymbolParams, SymbolInformationOrDocumentSymbolContainer>(DocumentNames.DocumentSymbol, @params);
         }
     }
 }

src/Protocol/Document/Client/ImplementationExtensions.cs

@@ -9,9 +9,9 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
 {
     public static class ImplementationExtensions
     {
-        public static Task<LocationOrLocations> Implementation(this ILanguageClientDocument mediator, ImplementationParams @params)
+        public static Task<LocationOrLocationLinks> Implementation(this ILanguageClientDocument mediator, ImplementationParams @params)
         {
-            return mediator.SendRequest<ImplementationParams, LocationOrLocations>(DocumentNames.Implementation, @params);
+            return mediator.SendRequest<ImplementationParams, LocationOrLocationLinks>(DocumentNames.Implementation, @params);
         }
     }
 }

src/Protocol/Document/Client/TypeDefinitionExtensions.cs

@@ -9,9 +9,9 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
 {
     public static class TypeDefinitionExtensions
     {
-        public static Task<LocationOrLocations> TypeDefinition(this ILanguageClientDocument mediator, TypeDefinitionParams @params)
+        public static Task<LocationOrLocationLinks> TypeDefinition(this ILanguageClientDocument mediator, TypeDefinitionParams @params)
         {
-            return mediator.SendRequest<TypeDefinitionParams, LocationOrLocations>(DocumentNames.TypeDefinition, @params);
+            return mediator.SendRequest<TypeDefinitionParams, LocationOrLocationLinks>(DocumentNames.TypeDefinition, @params);
         }
     }
 }

src/Protocol/Document/Server/IDeclarationHandler.cs

@@ -0,0 +1,12 @@
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+// ReSharper disable CheckNamespace
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
+{
+    using static DocumentNames;
+    [Parallel, Method(Declaration)]
+    public interface IDeclarationHandler : IJsonRpcRequestHandler<DeclarationParams, LocationOrLocationLinks>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DeclarationCapability> { }
+}

src/Protocol/Document/Server/IDefinitionHandler.cs

@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
     [Parallel, Method(Definition)]
-    public interface IDefinitionHandler : IJsonRpcRequestHandler<DefinitionParams, LocationOrLocations>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DefinitionCapability> { }
+    public interface IDefinitionHandler : IJsonRpcRequestHandler<DefinitionParams, LocationOrLocationLinks>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DefinitionCapability> { }
 }

src/Protocol/Document/Server/IDocumentSymbolHandler.cs

@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
     [Parallel, Method(DocumentSymbol)]
-    public interface IDocumentSymbolHandler : IJsonRpcRequestHandler<DocumentSymbolParams, DocumentSymbolInformationOrDocumentSymbolContainer>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DocumentSymbolCapability> { }
+    public interface IDocumentSymbolHandler : IJsonRpcRequestHandler<DocumentSymbolParams, SymbolInformationOrDocumentSymbolContainer>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DocumentSymbolCapability> { }
 }

src/Protocol/Document/Server/IImplementationDefinitionHandler.cs → src/Protocol/Document/Server/IImplementationHandler.cs

@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
     [Parallel, Method(Implementation)]
-    public interface IImplementationHandler : IJsonRpcRequestHandler<ImplementationParams, LocationOrLocations>, IRegistration<TextDocumentRegistrationOptions>, ICapability<ImplementationCapability> { }
+    public interface IImplementationHandler : IJsonRpcRequestHandler<ImplementationParams, LocationOrLocationLinks>, IRegistration<TextDocumentRegistrationOptions>, ICapability<ImplementationCapability> { }
 }

src/Protocol/Document/Server/ITypeDefinitionHandler.cs

@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
     [Parallel, Method(TypeDefinition)]
-    public interface ITypeDefinitionHandler : IJsonRpcRequestHandler<TypeDefinitionParams, LocationOrLocations>, IRegistration<TextDocumentRegistrationOptions>, ICapability<TypeDefinitionCapability> { }
+    public interface ITypeDefinitionHandler : IJsonRpcRequestHandler<TypeDefinitionParams, LocationOrLocationLinks>, IRegistration<TextDocumentRegistrationOptions>, ICapability<TypeDefinitionCapability> { }
 }

src/Protocol/DocumentNames.cs

@@ -9,6 +9,7 @@ public static class DocumentNames
         public const string Completion = "textDocument/completion";
         public const string CompletionResolve = "completionItem/resolve";
         public const string Definition = "textDocument/definition";
+        public const string Declaration = "textDocument/declaration";
         public const string DidChange = "textDocument/didChange";
         public const string DidClose = "textDocument/didClose";
         public const string DidOpen = "textDocument/didOpen";

src/Protocol/Models/BooleanNumberString.cs

@@ -27,49 +27,39 @@ public BooleanNumberString(bool value)
             _bool = value;
         }
 
-        public bool IsLong => this._long.HasValue;
+        public bool IsLong => _long.HasValue;
         public long Long
         {
-            get { return _long ?? 0; }
+            get => _long ?? 0;
             set
             {
-                this.String = null;
-                this._long = value;
-                this._bool = null;
+                String = null;
+                _long = value;
+                _bool = null;
             }
         }
 
-        public bool IsString => this._string != null;
+        public bool IsString => _string != null;
         public string String
         {
-            get { return this._string; }
+            get => _string;
             set
             {
-                this._string = value;
-                this._long = null;
-                this._bool = null;
+                _string = value;
+                _long = null;
+                _bool = null;
             }
         }
 
-        public bool IsBool => this._bool.HasValue;
+        public bool IsBool => _bool.HasValue;
         public bool Bool
         {
-            get { return this._bool.HasValue && this._bool.Value; }
+            get => _bool.HasValue && _bool.Value;
             set
             {
-                this.String = null;
-                this._long = null;
-                this._bool = value;
-            }
-        }
-        public object Value
-        {
-            get
-            {
-                if (IsBool) return Bool;
-                if (IsLong) return Long;
-                if (IsString) return String;
-                return null;
+                String = null;
+                _long = null;
+                _bool = value;
             }
         }
 

src/Protocol/Models/BooleanString.cs

@@ -15,34 +15,25 @@ public BooleanString(bool value)
             _bool = value;
         }
 
-        public bool IsString => this._string != null;
+        public bool IsString => _string != null;
         public string String
         {
-            get { return this._string; }
+            get => _string;
             set
             {
-                this._string = value;
-                this._bool = null;
+                _string = value;
+                _bool = null;
             }
         }
 
-        public bool IsBool => this._bool.HasValue;
+        public bool IsBool => _bool.HasValue;
         public bool Bool
         {
-            get { return this._bool.HasValue && this._bool.Value; }
+            get => _bool.HasValue && _bool.Value;
             set
             {
-                this.String = null;
-                this._bool = value;
-            }
-        }
-        public object Value
-        {
-            get
-            {
-                if (IsBool) return Bool;
-                if (IsString) return String;
-                return null;
+                String = null;
+                _bool = value;
             }
         }
 

src/Protocol/Models/CodeActionKind.cs

@@ -76,6 +76,5 @@ public CodeActionKind(string kind)
         }
 
         public string Kind { get; }
-
     }
 }

src/Protocol/Models/CreateFile.cs

@@ -0,0 +1,24 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    /// <summary>
+    /// Create file operation
+    /// </summary>
+    public class CreateFile : IFile
+    {
+        /// <summary>
+        /// A create
+        /// </summary>
+        public ResourceOperationKind Kind { get; } = ResourceOperationKind.Create;
+        /// <summary>
+        /// The resource to create.
+        /// </summary>
+        public string Uri { get; set; }
+        /// <summary>
+        /// Additional Options
+        /// </summary>
+        [Optional]
+        public CreateFileOptions Options { get; set; }
+    }
+}

src/Protocol/Models/CreateFileOptions.cs

@@ -0,0 +1,21 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    /// <summary>
+    /// Options to create a file.
+    /// </summary>
+    public class CreateFileOptions
+    {
+        /// <summary>
+        /// Overwrite existing file. Overwrite wins over `ignoreIfExists`
+        /// </summary>
+        [Optional]
+        public bool Overwrite { get; set; }
+        /// <summary>
+        /// Ignore if exists.
+        /// </summary>
+        [Optional]
+        public bool IgnoreIfExists { get; set; }
+    }
+}