LSP Models 2.2

Author: david-driscoll

src/Protocol/Models/MessageActionItem.cs

@@ -8,7 +8,7 @@ public class MessageActionItem
         /// <summary>
         /// A short title like 'Retry', 'Open Log' etc.
         /// </summary>
-        public string Title { get; set; }
+        public string Title { get; set; } = null!;
 
         private string DebuggerDisplay => Title;
 

src/Protocol/Models/ParameterInformation.cs

@@ -14,14 +14,14 @@ public class ParameterInformation
         /// The label of this parameter. Will be shown in
         /// the UI.
         /// </summary>
-        public ParameterInformationLabel Label { get; set; }
+        public ParameterInformationLabel Label { get; set; } = null!;
 
         /// <summary>
         /// The human-readable doc-comment of this parameter. Will be shown
         /// in the UI but can be omitted.
         /// </summary>
         [Optional]
-        public StringOrMarkupContent Documentation { get; set; }
+        public StringOrMarkupContent? Documentation { get; set; }
 
         private string DebuggerDisplay => $"{Label}{( Documentation != null ? $" {Documentation}" : string.Empty )}";
 

src/Protocol/Models/ParameterInformationLabel.cs

@@ -14,14 +14,14 @@ public class ParameterInformationLabel
 
         public (int start, int end) Range { get; }
         public bool IsRange => Label == null;
-        public string Label { get; }
+        public string? Label { get; }
         public bool IsLabel => Label != null;
 
         public static implicit operator ParameterInformationLabel(string label) => new ParameterInformationLabel(label);
 
         public static implicit operator ParameterInformationLabel((int start, int end) range) => new ParameterInformationLabel(range);
 
-        private string DebuggerDisplay => IsRange ? $"(start: {Range.start}, end: {Range.end})" : IsLabel ? Label : string.Empty;
+        private string DebuggerDisplay => IsRange ? $"(start: {Range.start}, end: {Range.end})" : IsLabel ? Label! : string.Empty;
 
         /// <inheritdoc />
         public override string ToString() => DebuggerDisplay;

src/Protocol/Models/PlaceholderRange.cs

@@ -2,7 +2,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
     public class PlaceholderRange
     {
-        public Range Range { get; set; }
-        public string Placeholder { get; set; }
+        public Range Range { get; set; } = null!;
+        public string Placeholder { get; set; } = null!;
     }
 }

src/Protocol/Models/Position.cs

@@ -27,10 +27,10 @@ public Position(int line, int character)
         /// </summary>
         public int Character { get; set; }
 
-        public override bool Equals(object obj) => Equals(obj as Position);
+        public override bool Equals(object? obj) => Equals(obj as Position);
 
-        public bool Equals(Position other) =>
-            other != null &&
+        public bool Equals(Position? other) =>
+            other is not null &&
             Line == other.Line &&
             Character == other.Character;
 

src/Protocol/Models/PrepareRenameParams.cs

@@ -4,7 +4,7 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
     [Method(TextDocumentNames.PrepareRename, Direction.ClientToServer)]
-    public class PrepareRenameParams : TextDocumentPositionParams, IRequest<RangeOrPlaceholderRange>
+    public class PrepareRenameParams : TextDocumentPositionParams, IRequest<RangeOrPlaceholderRange?>
     {
     }
 }

src/Protocol/Models/ProgressParams.cs

@@ -17,11 +17,11 @@ public static ProgressParams Create<T>(ProgressToken token, T value, JsonSeriali
         /// <summary>
         /// The progress token provided by the client or server.
         /// </summary>
-        public ProgressToken Token { get; set; }
+        public ProgressToken Token { get; set; } = null!;
 
         /// <summary>
         /// The progress data.
         /// </summary>
-        public JToken Value { get; set; }
+        public JToken Value { get; set; } = null!;
     }
 }

src/Protocol/Models/ProgressToken.cs

@@ -11,7 +11,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
     public class ProgressToken : IEquatable<ProgressToken>, IEquatable<long>, IEquatable<string>
     {
         private long? _long;
-        private string _string;
+        private string? _string;
 
         public ProgressToken(long value)
         {
@@ -38,7 +38,7 @@ public long Long
 
         public bool IsString => _string != null;
 
-        public string String
+        public string? String
         {
             get => _string;
             set {
@@ -63,7 +63,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + IsLong.GetHashCode();
             hashCode = hashCode * -1521134295 + Long.GetHashCode();
             hashCode = hashCode * -1521134295 + IsString.GetHashCode();
-            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(String);
+            if (String != null) hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(String);
             return hashCode;
         }
 
@@ -77,7 +77,7 @@ public bool Equals(ProgressToken other) =>
 
         public bool Equals(string other) => IsString && String == other;
 
-        private string DebuggerDisplay => IsString ? String : IsLong ? Long.ToString() : "";
+        private string DebuggerDisplay => IsString ? String! : IsLong ? Long.ToString() : "";
 
         /// <inheritdoc />
         public override string ToString() => DebuggerDisplay;

src/Protocol/Models/Proposals/CallHierarchyIncomingCall.cs

@@ -13,12 +13,12 @@ public class CallHierarchyIncomingCall
         /// <summary>
         /// The item that makes the call.
         /// </summary>
-        public CallHierarchyItem From { get; set; }
+        public CallHierarchyItem From { get; set; } = null!;
 
         /// <summary>
         /// The range at which at which the calls appears. This is relative to the caller
         /// denoted by [`this.from`](#CallHierarchyIncomingCall.from).
         /// </summary>
-        public Container<Range> FromRanges { get; set; }
+        public Container<Range> FromRanges { get; set; } = null!;
     }
 }

src/Protocol/Models/Proposals/CallHierarchyIncomingCallsParams.cs

@@ -10,10 +10,10 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
     /// </summary>
     [Obsolete(Constants.Proposal)]
     [Method(TextDocumentNames.CallHierarchyIncoming, Direction.ClientToServer)]
-    public class CallHierarchyIncomingCallsParams : IWorkDoneProgressParams, IPartialItemsRequest<Container<CallHierarchyIncomingCall>, CallHierarchyIncomingCall>
+    public class CallHierarchyIncomingCallsParams : IWorkDoneProgressParams, IPartialItemsRequest<Container<CallHierarchyIncomingCall>?, CallHierarchyIncomingCall>
     {
-        public CallHierarchyItem Item { get; set; }
-        public ProgressToken WorkDoneToken { get; set; }
-        public ProgressToken PartialResultToken { get; set; }
+        public CallHierarchyItem Item { get; set; } = null!;
+        public ProgressToken? WorkDoneToken { get; set; }
+        public ProgressToken? PartialResultToken { get; set; }
     }
 }

src/Protocol/Models/Proposals/CallHierarchyItem.cs

@@ -15,7 +15,7 @@ public class CallHierarchyItem
         /// <summary>
         /// The name of this item.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = null!;
 
         /// <summary>
         /// The kind of this item.
@@ -26,28 +26,28 @@ public class CallHierarchyItem
         /// Tags for this item.
         /// </summary>
         [Optional]
-        public Container<SymbolTag> Tags { get; set; }
+        public Container<SymbolTag>? Tags { get; set; }
 
         /// <summary>
         /// More detail for this item, e.g. the signature of a function.
         /// </summary>
         [Optional]
-        public string Detail { get; set; }
+        public string? Detail { get; set; }
 
         /// <summary>
         /// The resource identifier of this item.
         /// </summary>
-        public DocumentUri Uri { get; set; }
+        public DocumentUri Uri { get; set; } = null!;
 
         /// <summary>
         /// The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
         /// </summary>
-        public Range Range { get; set; }
+        public Range Range { get; set; } = null!;
 
         /// <summary>
         /// The range that should be selected and revealed when this symbol is being picked, e.g. the name of a function.
         /// Must be contained by the [`range`](#CallHierarchyItem.range).
         /// </summary>
-        public Range SelectionRange { get; set; }
+        public Range SelectionRange { get; set; } = null!;
     }
 }

src/Protocol/Models/Proposals/CallHierarchyOutgoingCall.cs

@@ -13,13 +13,13 @@ public class CallHierarchyOutgoingCall
         /// <summary>
         /// The item that is called.
         /// </summary>
-        public CallHierarchyItem To { get; set; }
+        public CallHierarchyItem To { get; set; } = null!;
 
         /// <summary>
         /// The range at which this item is called. This is the range relative to the caller, e.g the item
         /// passed to [`provideCallHierarchyOutgoingCalls`](#CallHierarchyItemProvider.provideCallHierarchyOutgoingCalls)
         /// and not [`this.to`](#CallHierarchyOutgoingCall.to).
         /// </summary>
-        public Container<Range> FromRanges { get; set; }
+        public Container<Range> FromRanges { get; set; } = null!;
     }
 }

src/Protocol/Models/Proposals/CallHierarchyOutgoingCallsParams.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using OmniSharp.Extensions.JsonRpc;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
@@ -10,10 +10,10 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
     /// </summary>
     [Obsolete(Constants.Proposal)]
     [Method(TextDocumentNames.CallHierarchyOutgoing, Direction.ClientToServer)]
-    public class CallHierarchyOutgoingCallsParams : IWorkDoneProgressParams, IPartialItemsRequest<Container<CallHierarchyOutgoingCall>, CallHierarchyOutgoingCall>
+    public class CallHierarchyOutgoingCallsParams : IWorkDoneProgressParams, IPartialItemsRequest<Container<CallHierarchyOutgoingCall>?, CallHierarchyOutgoingCall>
     {
-        public CallHierarchyItem Item { get; set; }
-        public ProgressToken WorkDoneToken { get; set; }
-        public ProgressToken PartialResultToken { get; set; }
+        public CallHierarchyItem Item { get; set; } = null!;
+        public ProgressToken? WorkDoneToken { get; set; }
+        public ProgressToken? PartialResultToken { get; set; }
     }
 }

src/Protocol/Models/Proposals/CallHierarchyPrepareParams.cs

@@ -11,7 +11,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
     /// </summary>
     [Obsolete(Constants.Proposal)]
     [Method(TextDocumentNames.PrepareCallHierarchy, Direction.ClientToServer)]
-    public class CallHierarchyPrepareParams : WorkDoneTextDocumentPositionParams, IRequest<Container<CallHierarchyItem>>
+    public class CallHierarchyPrepareParams : WorkDoneTextDocumentPositionParams, IRequest<Container<CallHierarchyItem>?>
     {
     }
 }

src/Protocol/Models/Proposals/CallHierarchyRegistrationOptions.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using OmniSharp.Extensions.JsonRpc;
-using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals

src/Protocol/Models/Proposals/SemanticTokenFormat.cs

@@ -47,7 +47,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
 
         public override bool Equals(object obj) => obj is SemanticTokenFormat other && Equals(other);
 
-        public override int GetHashCode() => _value != null ? _value.GetHashCode() : 0;
+        public override int GetHashCode() => _value.GetHashCode();
 
         public static bool operator ==(SemanticTokenFormat left, SemanticTokenFormat right) => left.Equals(right);
 

src/Protocol/Models/Proposals/SemanticTokenModifiers.cs

@@ -57,7 +57,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
 
         public override bool Equals(object obj) => obj is SemanticTokenModifier other && Equals(other);
 
-        public override int GetHashCode() => _value != null ? _value.GetHashCode() : 0;
+        public override int GetHashCode() => _value.GetHashCode();
 
         public static bool operator ==(SemanticTokenModifier left, SemanticTokenModifier right) => left.Equals(right);
 

src/Protocol/Models/Proposals/SemanticTokenTypes.cs

@@ -70,7 +70,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models.Proposals
 
         public override bool Equals(object obj) => obj is SemanticTokenType other && Equals(other);
 
-        public override int GetHashCode() => _value != null ? _value.GetHashCode() : 0;
+        public override int GetHashCode() => _value.GetHashCode();
 
         public static bool operator ==(SemanticTokenType left, SemanticTokenType right) => left.Equals(right);
 

src/Protocol/Models/Proposals/SemanticTokens.cs

@@ -17,7 +17,7 @@ public class SemanticTokens
         /// send a delta.
         /// </summary>
         [Optional]
-        public string ResultId { get; set; }
+        public string? ResultId { get; set; }
 
         /// <summary>
         /// The actual tokens. For a detailed description about how the data is

src/Protocol/Models/Proposals/SemanticTokensDelta.cs

@@ -16,12 +16,12 @@ public class SemanticTokensDelta
         /// send a delta.
         /// </summary>
         [Optional]
-        public string ResultId { get; set; }
+        public string? ResultId { get; set; }
 
         /// <summary>
         /// For a detailed description how these edits are structured pls see
         /// https://github.com/microsoft/vscode-extension-samples/blob/5ae1f7787122812dcc84e37427ca90af5ee09f14/semantic-tokens-sample/vscode.proposed.d.ts#L131
         /// </summary>
-        public Container<SemanticTokensEdit> Edits { get; set; }
+        public Container<SemanticTokensEdit> Edits { get; set; } = null!;
     }
 }

src/Protocol/Models/Proposals/SemanticTokensDeltaParams.cs

@@ -14,14 +14,14 @@ public class SemanticTokensDeltaParams : IWorkDoneProgressParams, ITextDocumentI
         /// <summary>
         /// The text document.
         /// </summary>
-        public TextDocumentIdentifier TextDocument { get; set; }
+        public TextDocumentIdentifier TextDocument { get; set; } = null!;
 
         /// <summary>
         /// The previous result id.
         /// </summary>
-        public string PreviousResultId { get; set; }
+        public string PreviousResultId { get; set; } = null!;
 
-        public ProgressToken WorkDoneToken { get; set; }
-        public ProgressToken PartialResultToken { get; set; }
+        public ProgressToken? WorkDoneToken { get; set; }
+        public ProgressToken? PartialResultToken { get; set; }
     }
 }

src/Protocol/Models/Proposals/SemanticTokensDeltaPartialResult.cs

@@ -13,6 +13,6 @@ public class SemanticTokensDeltaPartialResult
         /// structured pls see
         /// https://github.com/microsoft/vscode-extension-samples/blob/5ae1f7787122812dcc84e37427ca90af5ee09f14/semantic-tokens-sample/vscode.proposed.d.ts#L71
         /// </summary>
-        public Container<SemanticTokensEdit> Edits { get; set; }
+        public Container<SemanticTokensEdit> Edits { get; set; } = null!;
     }
 }

src/Protocol/Models/Proposals/SemanticTokensEdit.cs

@@ -26,6 +26,6 @@ public class SemanticTokensEdit
         /// https://github.com/microsoft/vscode-extension-samples/blob/5ae1f7787122812dcc84e37427ca90af5ee09f14/semantic-tokens-sample/vscode.proposed.d.ts#L71
         /// </summary>
         [Optional]
-        public ImmutableArray<int> Data { get; set; } = ImmutableArray<int>.Empty;
+        public ImmutableArray<int>? Data { get; set; } = ImmutableArray<int>.Empty;
     }
 }

src/Protocol/Models/Proposals/SemanticTokensFullOrDelta.cs

@@ -21,10 +21,10 @@ public SemanticTokensFullOrDelta(SemanticTokens full)
         }
 
         public bool IsFull => Full != null;
-        public SemanticTokens Full { get; }
+        public SemanticTokens? Full { get; }
 
         public bool IsDelta => Delta != null;
-        public SemanticTokensDelta Delta { get; }
+        public SemanticTokensDelta? Delta { get; }
 
         public static implicit operator SemanticTokensFullOrDelta(SemanticTokensDelta semanticTokensDelta) => new SemanticTokensFullOrDelta(semanticTokensDelta);
 

src/Protocol/Models/Proposals/SemanticTokensFullOrDeltaPartialResult.cs

@@ -25,10 +25,10 @@ SemanticTokensDeltaPartialResult delta
         }
 
         public bool IsDelta => Delta != null;
-        public SemanticTokensDeltaPartialResult Delta { get; }
+        public SemanticTokensDeltaPartialResult? Delta { get; }
 
         public bool IsFull => Full != null;
-        public SemanticTokensPartialResult Full { get; }
+        public SemanticTokensPartialResult? Full { get; }
 
         public static implicit operator SemanticTokensFullOrDeltaPartialResult(SemanticTokensPartialResult semanticTokensPartialResult) =>
             new SemanticTokensFullOrDeltaPartialResult(semanticTokensPartialResult);