Skip to content

Commit 39c31a0

Browse files
moved more tests to verify
1 parent 48865d8 commit 39c31a0

File tree

88 files changed

+2025
-3903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2025
-3903
lines changed

src/Protocol/Features/Document/CallHierarchyFeature.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ public abstract record CallHierarchyBaseCallParams : ICanBeResolved
112112

113113
JToken? ICanBeResolved.Data
114114
{
115-
get => Item.GetRawData();
116-
init => Item.SetRawData(value);
115+
get => Item?.GetRawData();
116+
init => Item?.SetRawData(value);
117117
}
118118
}
119119

@@ -124,8 +124,8 @@ public abstract record CallHierarchyBaseCallParams<T> : ICanBeResolved
124124

125125
JToken? ICanBeResolved.Data
126126
{
127-
get => Item.GetRawData();
128-
init => Item.SetRawData(value);
127+
get => Item?.GetRawData();
128+
init => Item?.SetRawData(value);
129129
}
130130
}
131131

src/Protocol/Features/Document/DiagnosticsFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ public static RelatedDocumentDiagnosticReport From(RelatedDocumentDiagnosticRepo
121121

122122
internal class Converter : JsonConverter<RelatedDocumentDiagnosticReport>
123123
{
124-
public override void WriteJson(JsonWriter writer, RelatedDocumentDiagnosticReport value, JsonSerializer serializer)
124+
public override void WriteJson(JsonWriter writer, RelatedDocumentDiagnosticReport? value, JsonSerializer serializer)
125125
{
126126
throw new NotImplementedException();
127127
}
128128

129129
public override RelatedDocumentDiagnosticReport ReadJson(
130-
JsonReader reader, Type objectType, RelatedDocumentDiagnosticReport existingValue, bool hasExistingValue, JsonSerializer serializer
130+
JsonReader reader, Type objectType, RelatedDocumentDiagnosticReport? existingValue, bool hasExistingValue, JsonSerializer serializer
131131
)
132132
{
133133
throw new NotImplementedException();

src/Protocol/Features/Document/InlineValueFeature.cs

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public partial record InlineValueContext
6363
/// </summary>
6464
public Range StoppedLocation { get; set; }
6565
}
66-
66+
6767
[Parallel]
6868
[Method(WorkspaceNames.InlineValueRefresh, Direction.ServerToClient)]
6969
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
@@ -94,22 +94,30 @@ public override InlineValueBase ReadJson(
9494
)
9595
{
9696
var result = JObject.Load(reader);
97-
if (result["text"] is { Type: JTokenType.String })
97+
if (result.ContainsKey("text"))
9898
{
99-
return result.ToObject<InlineValueText>();
99+
return new InlineValueText()
100+
{
101+
Range = result["range"]!.ToObject<Range?>()!,
102+
Text = result["text"]!.Value<string>()!
103+
};
100104
}
101105

102-
if (result["variableName"] is { Type: JTokenType.String })
106+
if (result.ContainsKey("variableName") || result.ContainsKey("caseSensitiveLookup"))
103107
{
104-
return result.ToObject<InlineValueVariableLookup>();
108+
return new InlineValueVariableLookup()
109+
{
110+
Range = result["range"].ToObject<Range>()!,
111+
VariableName = result["variableName"]!.Value<string>()!,
112+
CaseSensitiveLookup = result["caseSensitiveLookup"]?.Value<bool?>() ?? false,
113+
};
105114
}
106115

107-
if (result["expression"] is { Type: JTokenType.String })
116+
return new InlineValueEvaluatableExpression()
108117
{
109-
return result.ToObject<InlineValueEvaluatableExpression>();
110-
}
111-
112-
return null!;
118+
Range = result["range"].ToObject<Range>()!,
119+
Expression = result["expression"]?.Value<string>()
120+
};
113121
}
114122
}
115123
}
@@ -119,7 +127,6 @@ public override InlineValueBase ReadJson(
119127
///
120128
/// @since 3.17.0
121129
/// </summary>
122-
[JsonConverter(typeof(Converter))]
123130
public partial record InlineValueText : InlineValueBase
124131
{
125132
/// <summary>
@@ -138,7 +145,6 @@ public partial record InlineValueText : InlineValueBase
138145
///
139146
/// @since 3.17.0
140147
/// </summary>
141-
[JsonConverter(typeof(Converter))]
142148
public partial record InlineValueVariableLookup : InlineValueBase
143149
{
144150
/// <summary>
@@ -163,7 +169,6 @@ public partial record InlineValueVariableLookup : InlineValueBase
163169
///
164170
/// @since 3.17.0
165171
/// </summary>
166-
[JsonConverter(typeof(Converter))]
167172
public partial record InlineValueEvaluatableExpression : InlineValueBase
168173
{
169174
/// <summary>

src/Protocol/Features/Document/MonikerFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Models
2323
/// </summary>
2424
[Parallel]
2525
[Method(TextDocumentNames.Moniker, Direction.ClientToServer)]
26-
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document")]
26+
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document", Name = "Monikers")]
2727
[GenerateHandlerMethods]
2828
[GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))]
2929
[RegistrationOptions(typeof(MonikerRegistrationOptions))]

0 commit comments

Comments
 (0)