Skip to content

Commit 2eb0987

Browse files
Use Extension as data type for Extension Message Handlers errors and remove DocumentLinePosition (#78121)
2 parents 23264d2 + 2343ed3 commit 2eb0987

File tree

8 files changed

+8
-123
lines changed

8 files changed

+8
-123
lines changed

src/LanguageServer/Protocol/Handler/Extensions/ExtensionDocumentMessageHandler.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ public async Task<ExtensionMessageResponse> HandleRequestAsync(ExtensionDocument
3838
if (exception is not null)
3939
context.Logger.LogException(exception);
4040

41-
return new ExtensionMessageResponse(
42-
response,
43-
extensionWasUnloaded,
44-
ExtensionException.FromException(exception));
41+
return new ExtensionMessageResponse(response, extensionWasUnloaded, exception);
4542
}
4643
}

src/LanguageServer/Protocol/Handler/Extensions/ExtensionException.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/LanguageServer/Protocol/Handler/Extensions/ExtensionMessageResponse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Text.Json.Serialization;
67

78
namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions;
@@ -15,5 +16,4 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions;
1516
internal readonly record struct ExtensionMessageResponse(
1617
[property: JsonPropertyName("response"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] string? Response,
1718
[property: JsonPropertyName("extensionWasUnloaded"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)] bool ExtensionWasUnloaded,
18-
[property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
19-
ExtensionException? ExtensionException);
19+
[property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] Exception? ExtensionException);

src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public async Task<ExtensionRegisterResponse> HandleRequestAsync(ExtensionRegiste
3737
return new(
3838
handlerNames.WorkspaceMessageHandlers,
3939
handlerNames.DocumentMessageHandlers,
40-
ExtensionException.FromException(handlerNames.ExtensionException));
40+
handlerNames.ExtensionException);
4141
}
4242
}

src/LanguageServer/Protocol/Handler/Extensions/ExtensionRegisterResponse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Collections.Immutable;
67
using System.Text.Json.Serialization;
78

@@ -16,5 +17,4 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Extensions;
1617
internal sealed record class ExtensionRegisterResponse(
1718
[property: JsonPropertyName("workspaceMessageHandlers")] ImmutableArray<string> WorkspaceMessageHandlers,
1819
[property: JsonPropertyName("documentMessageHandlers")] ImmutableArray<string> DocumentMessageHandlers,
19-
[property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
20-
ExtensionException? ExtensionException);
20+
[property: JsonPropertyName("extensionException"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] Exception? ExtensionException);

src/LanguageServer/Protocol/Handler/Extensions/ExtensionWorkspaceMessageHandler.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ public async Task<ExtensionMessageResponse> HandleRequestAsync(ExtensionWorkspac
3434
if (exception is not null)
3535
context.Logger.LogException(exception);
3636

37-
return new ExtensionMessageResponse(
38-
response,
39-
extensionWasUnloaded,
40-
ExtensionException.FromException(exception));
37+
return new ExtensionMessageResponse(response, extensionWasUnloaded, exception);
4138
}
4239
}

src/Tools/ExternalAccess/Extensions/External/DocumentLinePosition.cs

Lines changed: 0 additions & 80 deletions
This file was deleted.
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
1-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition
2-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.Character.get -> int
3-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.DocumentLinePosition() -> void
4-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.DocumentLinePosition(Microsoft.CodeAnalysis.Document document, Microsoft.CodeAnalysis.Text.LinePosition linePosition) -> void
5-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.DocumentLinePosition(string filePath, int line, int character) -> void
6-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.FilePath.get -> string
7-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.Line.get -> int
8-
Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.ToLinePosition() -> Microsoft.CodeAnalysis.Text.LinePosition
91
Microsoft.CodeAnalysis.Extensions.ExtensionMessageContext
102
Microsoft.CodeAnalysis.Extensions.ExtensionMessageContext.Solution.get -> Microsoft.CodeAnalysis.Solution
113
Microsoft.CodeAnalysis.Extensions.IExtensionDocumentMessageHandler<TMessage, TResponse>
124
Microsoft.CodeAnalysis.Extensions.IExtensionDocumentMessageHandler<TMessage, TResponse>.ExecuteAsync(TMessage message, Microsoft.CodeAnalysis.Extensions.ExtensionMessageContext context, Microsoft.CodeAnalysis.Document document, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TResponse>
135
Microsoft.CodeAnalysis.Extensions.IExtensionWorkspaceMessageHandler<TMessage, TResponse>
14-
Microsoft.CodeAnalysis.Extensions.IExtensionWorkspaceMessageHandler<TMessage, TResponse>.ExecuteAsync(TMessage message, Microsoft.CodeAnalysis.Extensions.ExtensionMessageContext context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TResponse>
15-
static Microsoft.CodeAnalysis.Extensions.DocumentLinePosition.implicit operator Microsoft.CodeAnalysis.Text.LinePosition(Microsoft.CodeAnalysis.Extensions.DocumentLinePosition documentLinePosition) -> Microsoft.CodeAnalysis.Text.LinePosition
6+
Microsoft.CodeAnalysis.Extensions.IExtensionWorkspaceMessageHandler<TMessage, TResponse>.ExecuteAsync(TMessage message, Microsoft.CodeAnalysis.Extensions.ExtensionMessageContext context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TResponse>

0 commit comments

Comments
 (0)