Skip to content

Commit ba5efa4

Browse files
committed
fix fmt
1 parent 167442b commit ba5efa4

File tree

12 files changed

+89
-90
lines changed

12 files changed

+89
-90
lines changed

LanguageServer.Framework/LSPCommunicationBase.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public IPerformanceMetricsCollector? MetricsCollector
5858
Writer.MetricsCollector = value;
5959
}
6060
}
61+
6162
private IPerformanceMetricsCollector? _metricsCollector;
6263

6364
protected CancellationTokenSource? ExitTokenSource { get; private set; }
@@ -277,10 +278,7 @@ public Task Run()
277278
var message = await Reader.ReadAsync(ExitTokenSource.Token);
278279
MetricsCollector?.RecordMessageReceived();
279280

280-
if (BaseHandle(message))
281-
{
282-
continue;
283-
}
281+
if (BaseHandle(message)) continue;
284282

285283
Scheduler.Schedule(OnDispatch, message);
286284
}
@@ -343,15 +341,9 @@ protected virtual void Dispose(bool disposing)
343341
ExitTokenSource?.Dispose();
344342
_exitTokenLock.Dispose();
345343

346-
if (Scheduler is IDisposable disposableScheduler)
347-
{
348-
disposableScheduler.Dispose();
349-
}
344+
if (Scheduler is IDisposable disposableScheduler) disposableScheduler.Dispose();
350345

351-
if (Writer is IDisposable disposableWriter)
352-
{
353-
disposableWriter.Dispose();
354-
}
346+
if (Writer is IDisposable disposableWriter) disposableWriter.Dispose();
355347
}
356348

357349
_disposed = true;

LanguageServer.Framework/Protocol/Capabilities/Server/Options/SemanticTokensOptions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class SemanticTokensOptions : WorkDoneProgressOptions
2222
/**
2323
* Server supports providing semantic tokens for a full document.
2424
*/
25-
[JsonPropertyName("full"), JsonConverter(typeof(BooleanOrConverter<SemanticTokensCapabilitiesFull>))]
25+
[JsonPropertyName("full")]
26+
[JsonConverter(typeof(BooleanOrConverter<SemanticTokensCapabilitiesFull>))]
2627
public BooleanOr<SemanticTokensCapabilitiesFull>? Full { get; init; }
2728
}

LanguageServer.Framework/Protocol/Capabilities/Server/Options/TextDocumentSyncOptions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public class TextDocumentSyncOptions
4141
* If present save notifications are sent to the server. If omitted
4242
* the notification should not be sent.
4343
*/
44-
[JsonPropertyName("save"), JsonConverter(typeof(BooleanOrConverter<SaveOptions>))]
44+
[JsonPropertyName("save")]
45+
[JsonConverter(typeof(BooleanOrConverter<SaveOptions>))]
4546
public BooleanOr<SaveOptions>? Save { get; set; }
4647
}
4748

LanguageServer.Framework/Protocol/Capabilities/Server/ServerCapabilities.cs

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public class ServerCapabilities
5252
/**
5353
* The server provides hover support.
5454
*/
55-
[JsonPropertyName("hoverProvider"), JsonConverter(typeof(BooleanOrConverter<HoverOptions>))]
55+
[JsonPropertyName("hoverProvider")]
56+
[JsonConverter(typeof(BooleanOrConverter<HoverOptions>))]
5657
public BooleanOr<HoverOptions>? HoverProvider { get; set; }
5758

5859
/**
@@ -66,55 +67,63 @@ public class ServerCapabilities
6667
*
6768
* @since 3.14.0
6869
*/
69-
[JsonPropertyName("declarationProvider"), JsonConverter(typeof(BooleanOrConverter<DeclarationOptions>))]
70+
[JsonPropertyName("declarationProvider")]
71+
[JsonConverter(typeof(BooleanOrConverter<DeclarationOptions>))]
7072
public BooleanOr<DeclarationOptions>? DeclarationProvider { get; set; }
7173

7274
/**
7375
* The server provides goto definition support.
7476
*/
75-
[JsonPropertyName("definitionProvider"), JsonConverter(typeof(BooleanOrConverter<DefinitionOptions>))]
77+
[JsonPropertyName("definitionProvider")]
78+
[JsonConverter(typeof(BooleanOrConverter<DefinitionOptions>))]
7679
public BooleanOr<DefinitionOptions>? DefinitionProvider { get; set; }
7780

7881
/**
7982
* The server provides goto type definition support.
8083
*
8184
* @since 3.6.0
8285
*/
83-
[JsonPropertyName("typeDefinitionProvider"), JsonConverter(typeof(BooleanOrConverter<TypeDefinitionOptions>))]
86+
[JsonPropertyName("typeDefinitionProvider")]
87+
[JsonConverter(typeof(BooleanOrConverter<TypeDefinitionOptions>))]
8488
public BooleanOr<TypeDefinitionOptions>? TypeDefinitionProvider { get; set; }
8589

8690
/**
8791
* The server provides goto implementation support.
8892
*
8993
* @since 3.6.0
9094
*/
91-
[JsonPropertyName("implementationProvider"), JsonConverter(typeof(BooleanOrConverter<ImplementationOptions>))]
95+
[JsonPropertyName("implementationProvider")]
96+
[JsonConverter(typeof(BooleanOrConverter<ImplementationOptions>))]
9297
public BooleanOr<ImplementationOptions>? ImplementationProvider { get; set; }
9398

9499
/**
95100
* The server provides find references support.
96101
*/
97-
[JsonPropertyName("referencesProvider"), JsonConverter(typeof(BooleanOrConverter<ReferencesOptions>))]
102+
[JsonPropertyName("referencesProvider")]
103+
[JsonConverter(typeof(BooleanOrConverter<ReferencesOptions>))]
98104
public BooleanOr<ReferencesOptions>? ReferencesProvider { get; set; }
99105

100106
/**
101107
* The server provides document highlight support.
102108
*/
103-
[JsonPropertyName("documentHighlightProvider"), JsonConverter(typeof(BooleanOrConverter<DocumentHighlightOptions>))]
109+
[JsonPropertyName("documentHighlightProvider")]
110+
[JsonConverter(typeof(BooleanOrConverter<DocumentHighlightOptions>))]
104111
public BooleanOr<DocumentHighlightOptions>? DocumentHighlightProvider { get; set; }
105112

106113
/**
107114
* The server provides document symbol support.
108115
*/
109-
[JsonPropertyName("documentSymbolProvider"), JsonConverter(typeof(BooleanOrConverter<DocumentSymbolOptions>))]
116+
[JsonPropertyName("documentSymbolProvider")]
117+
[JsonConverter(typeof(BooleanOrConverter<DocumentSymbolOptions>))]
110118
public BooleanOr<DocumentSymbolOptions>? DocumentSymbolProvider { get; set; }
111119

112120
/**
113121
* The server provides code actions. The `CodeActionOptions` return type is
114122
* only valid if the client signals code action literal support via the
115123
* property `textDocument.codeAction.codeActionLiteralSupport`.
116124
*/
117-
[JsonPropertyName("codeActionProvider"), JsonConverter(typeof(BooleanOrConverter<CodeActionOptions>))]
125+
[JsonPropertyName("codeActionProvider")]
126+
[JsonConverter(typeof(BooleanOrConverter<CodeActionOptions>))]
118127
public BooleanOr<CodeActionOptions>? CodeActionProvider { get; set; }
119128

120129
/**
@@ -134,21 +143,22 @@ public class ServerCapabilities
134143
*
135144
* @since 3.6.0
136145
*/
137-
[JsonPropertyName("colorProvider"), JsonConverter(typeof(BooleanOrConverter<DocumentColorOptions>))]
146+
[JsonPropertyName("colorProvider")]
147+
[JsonConverter(typeof(BooleanOrConverter<DocumentColorOptions>))]
138148
public BooleanOr<DocumentColorOptions>? ColorProvider { get; set; }
139149

140150
/**
141151
* The server provides document formatting.
142152
*/
143-
[JsonPropertyName("documentFormattingProvider"),
144-
JsonConverter(typeof(BooleanOrConverter<DocumentFormattingOptions>))]
153+
[JsonPropertyName("documentFormattingProvider")]
154+
[JsonConverter(typeof(BooleanOrConverter<DocumentFormattingOptions>))]
145155
public BooleanOr<DocumentFormattingOptions>? DocumentFormattingProvider { get; set; }
146156

147157
/**
148158
* The server provides document range formatting.
149159
*/
150-
[JsonPropertyName("documentRangeFormattingProvider"),
151-
JsonConverter(typeof(BooleanOrConverter<DocumentRangeFormattingOptions>))]
160+
[JsonPropertyName("documentRangeFormattingProvider")]
161+
[JsonConverter(typeof(BooleanOrConverter<DocumentRangeFormattingOptions>))]
152162
public BooleanOr<DocumentRangeFormattingOptions>? DocumentRangeFormattingProvider { get; set; }
153163

154164
/**
@@ -162,7 +172,8 @@ public class ServerCapabilities
162172
* specified if the client states that it supports
163173
* `prepareSupport` in its initial `initialize` request.
164174
*/
165-
[JsonPropertyName("renameProvider"), JsonConverter(typeof(BooleanOrConverter<RenameOptions>))]
175+
[JsonPropertyName("renameProvider")]
176+
[JsonConverter(typeof(BooleanOrConverter<RenameOptions>))]
166177
public BooleanOr<RenameOptions>? RenameProvider { get; set; }
167178

168179

@@ -171,7 +182,8 @@ public class ServerCapabilities
171182
*
172183
* @since 3.10.0
173184
*/
174-
[JsonPropertyName("foldingRangeProvider"), JsonConverter(typeof(BooleanOrConverter<FoldingRangeOptions>))]
185+
[JsonPropertyName("foldingRangeProvider")]
186+
[JsonConverter(typeof(BooleanOrConverter<FoldingRangeOptions>))]
175187
public BooleanOr<FoldingRangeOptions>? FoldingRangeProvider { get; set; }
176188

177189
/**
@@ -185,23 +197,26 @@ public class ServerCapabilities
185197
*
186198
* @since 3.15.0
187199
*/
188-
[JsonPropertyName("selectionRangeProvider"), JsonConverter(typeof(BooleanOrConverter<SelectionRangeOptions>))]
200+
[JsonPropertyName("selectionRangeProvider")]
201+
[JsonConverter(typeof(BooleanOrConverter<SelectionRangeOptions>))]
189202
public BooleanOr<SelectionRangeOptions>? SelectionRangeProvider { get; set; }
190203

191204
/**
192205
* The server provides linked editing range support.
193206
*
194207
* @since 3.16.0
195208
*/
196-
[JsonPropertyName("linkedEditingRangeProvider"), JsonConverter(typeof(BooleanOrConverter<LinkedEditingRangeOptions>))]
209+
[JsonPropertyName("linkedEditingRangeProvider")]
210+
[JsonConverter(typeof(BooleanOrConverter<LinkedEditingRangeOptions>))]
197211
public BooleanOr<LinkedEditingRangeOptions>? LinkedEditingRangeProvider { get; set; }
198212

199213
/**
200214
* The server provides call hierarchy support.
201215
*
202216
* @since 3.16.0
203217
*/
204-
[JsonPropertyName("callHierarchyProvider"), JsonConverter(typeof(BooleanOrConverter<CallHierarchyOptions>))]
218+
[JsonPropertyName("callHierarchyProvider")]
219+
[JsonConverter(typeof(BooleanOrConverter<CallHierarchyOptions>))]
205220
public BooleanOr<CallHierarchyOptions>? CallHierarchyProvider { get; set; }
206221

207222
/**
@@ -217,31 +232,35 @@ public class ServerCapabilities
217232
*
218233
* @since 3.16.0
219234
*/
220-
[JsonPropertyName("monikerProvider"), JsonConverter(typeof(BooleanOrConverter<MonikerOptions>))]
235+
[JsonPropertyName("monikerProvider")]
236+
[JsonConverter(typeof(BooleanOrConverter<MonikerOptions>))]
221237
public BooleanOr<MonikerOptions>? MonikerProvider { get; set; }
222238

223239
/**
224240
* The server provides type hierarchy support.
225241
*
226242
* @since 3.17.0
227243
*/
228-
[JsonPropertyName("typeHierarchyProvider"), JsonConverter(typeof(BooleanOrConverter<TypeHierarchyOptions>))]
244+
[JsonPropertyName("typeHierarchyProvider")]
245+
[JsonConverter(typeof(BooleanOrConverter<TypeHierarchyOptions>))]
229246
public BooleanOr<TypeHierarchyOptions>? TypeHierarchyProvider { get; set; }
230247

231248
/**
232249
* The server provides inline values.
233250
*
234251
* @since 3.17.0
235252
*/
236-
[JsonPropertyName("inlineValueProvider"), JsonConverter(typeof(BooleanOrConverter<InlineValuesOptions>))]
253+
[JsonPropertyName("inlineValueProvider")]
254+
[JsonConverter(typeof(BooleanOrConverter<InlineValuesOptions>))]
237255
public BooleanOr<InlineValuesOptions>? InlineValueProvider { get; set; }
238256

239257
/**
240258
* The server provides inlay hints.
241259
*
242260
* @since 3.17.0
243261
*/
244-
[JsonPropertyName("inlayHintProvider"), JsonConverter(typeof(BooleanOrConverter<InlayHintsOptions>))]
262+
[JsonPropertyName("inlayHintProvider")]
263+
[JsonConverter(typeof(BooleanOrConverter<InlayHintsOptions>))]
245264
public BooleanOr<InlayHintsOptions>? InlayHintProvider { get; set; }
246265

247266
/**
@@ -255,15 +274,17 @@ public class ServerCapabilities
255274
/**
256275
* The server provides workspace symbol support.
257276
*/
258-
[JsonPropertyName("workspaceSymbolProvider"), JsonConverter(typeof(BooleanOrConverter<WorkspaceSymbolOptions>))]
277+
[JsonPropertyName("workspaceSymbolProvider")]
278+
[JsonConverter(typeof(BooleanOrConverter<WorkspaceSymbolOptions>))]
259279
public BooleanOr<WorkspaceSymbolOptions>? WorkspaceSymbolProvider { get; set; }
260280

261281
/**
262282
* The server provides inline completions.
263283
*
264284
* @since 3.18.0
265285
*/
266-
[JsonPropertyName("inlineCompletionProvider"), JsonConverter(typeof(BooleanOrConverter<InlineCompletionsOptions>))]
286+
[JsonPropertyName("inlineCompletionProvider")]
287+
[JsonConverter(typeof(BooleanOrConverter<InlineCompletionsOptions>))]
267288
public BooleanOr<InlineCompletionsOptions>? InlineCompletionProvider { get; set; }
268289

269290
/**

LanguageServer.Framework/Protocol/Capabilities/Server/Union/TextDocumentSyncOptionsOrKind.cs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,36 @@ public TextDocumentSyncOptionsOrKind(TextDocumentSyncKind value)
2323
KindValue = value;
2424
}
2525

26-
public static implicit operator TextDocumentSyncOptionsOrKind(TextDocumentSyncOptions value) => new(value);
26+
public static implicit operator TextDocumentSyncOptionsOrKind(TextDocumentSyncOptions value)
27+
{
28+
return new TextDocumentSyncOptionsOrKind(value);
29+
}
2730

28-
public static implicit operator TextDocumentSyncOptionsOrKind(TextDocumentSyncKind value) => new(value);
31+
public static implicit operator TextDocumentSyncOptionsOrKind(TextDocumentSyncKind value)
32+
{
33+
return new TextDocumentSyncOptionsOrKind(value);
34+
}
2935
}
3036

3137
public class TextDocumentSyncOptionsOrKindConverter : JsonConverter<TextDocumentSyncOptionsOrKind>
3238
{
33-
public override TextDocumentSyncOptionsOrKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
39+
public override TextDocumentSyncOptionsOrKind Read(ref Utf8JsonReader reader, Type typeToConvert,
40+
JsonSerializerOptions options)
3441
{
3542
if (reader.TokenType == JsonTokenType.StartObject)
36-
{
37-
return new TextDocumentSyncOptionsOrKind(JsonSerializer.Deserialize<TextDocumentSyncOptions>(ref reader, options)!);
38-
}
43+
return new TextDocumentSyncOptionsOrKind(
44+
JsonSerializer.Deserialize<TextDocumentSyncOptions>(ref reader, options)!);
3945
else
40-
{
41-
return new TextDocumentSyncOptionsOrKind(JsonSerializer.Deserialize<TextDocumentSyncKind>(ref reader, options)!);
42-
}
46+
return new TextDocumentSyncOptionsOrKind(
47+
JsonSerializer.Deserialize<TextDocumentSyncKind>(ref reader, options)!);
4348
}
4449

45-
public override void Write(Utf8JsonWriter writer, TextDocumentSyncOptionsOrKind value, JsonSerializerOptions options)
50+
public override void Write(Utf8JsonWriter writer, TextDocumentSyncOptionsOrKind value,
51+
JsonSerializerOptions options)
4652
{
4753
if (value.Value != null)
48-
{
4954
JsonSerializer.Serialize(writer, value.Value, options);
50-
}
5155
else
52-
{
5356
JsonSerializer.Serialize(writer, value.KindValue, options);
54-
}
5557
}
5658
}

LanguageServer.Framework/Protocol/Message/SemanticToken/SemanticTokensDeltaResponse.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,17 @@ public static implicit operator SemanticTokensDeltaResponse(SemanticTokensDelta
3333

3434
public class SemanticTokensDeltaResponseJsonConverter : JsonConverter<SemanticTokensDeltaResponse>
3535
{
36-
public override SemanticTokensDeltaResponse Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
36+
public override SemanticTokensDeltaResponse Read(ref Utf8JsonReader reader, Type typeToConvert,
37+
JsonSerializerOptions options)
3738
{
3839
throw new NotImplementedException();
3940
}
4041

4142
public override void Write(Utf8JsonWriter writer, SemanticTokensDeltaResponse value, JsonSerializerOptions options)
4243
{
4344
if (value.SemanticTokens != null)
44-
{
4545
JsonSerializer.Serialize(writer, value.SemanticTokens, options);
46-
}
4746
else if (value.SemanticTokensDelta != null)
48-
{
4947
JsonSerializer.Serialize(writer, value.SemanticTokensDelta, options);
50-
}
5148
}
5249
}

LanguageServer.Framework/Protocol/Model/Markup/MarkupKind.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ public readonly record struct MarkupKind(string Value)
1616
/**
1717
* Plain text is supported as a content format
1818
*/
19-
public static MarkupKind PlainText { get; } = new MarkupKind("plaintext");
19+
public static MarkupKind PlainText { get; } = new("plaintext");
2020

2121
/**
2222
* Markdown is supported as a content format
2323
*/
24-
public static MarkupKind Markdown { get; } = new MarkupKind("markdown");
24+
public static MarkupKind Markdown { get; } = new("markdown");
2525

2626
public string Value { get; } = Value;
2727
}

0 commit comments

Comments
 (0)