Skip to content

Commit 93286ff

Browse files
committed
Use the LspSerializer in CodeActions and SendTelemetry
1 parent 5ce62d8 commit 93286ff

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ public async Task<CodeLens> ResolveCodeLens(
154154
Title = GetReferenceCountHeader(referenceLocations.Length),
155155
Arguments = JArray.FromObject(new object[]
156156
{
157-
scriptFile.DocumentUri,
158-
codeLens.Range.Start,
159-
referenceLocations
157+
scriptFile.DocumentUri,
158+
codeLens.Range.Start,
159+
referenceLocations
160160
},
161161
LspSerializer.Instance.JsonSerializer)
162162
}

src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
using System.Collections.Generic;
66
using System.Threading;
77
using System.Threading.Tasks;
8+
using Newtonsoft.Json.Linq;
89
using Microsoft.Extensions.Logging;
910
using Microsoft.PowerShell.EditorServices.Services;
1011
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
1112
using Microsoft.PowerShell.EditorServices.Utility;
1213
using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
1314
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
1415
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
16+
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
1517

1618
namespace Microsoft.PowerShell.EditorServices.Handlers
1719
{
@@ -131,7 +133,11 @@ public override async Task<CommandOrCodeActionContainer> Handle(CodeActionParams
131133
{
132134
Title = title,
133135
Name = "PowerShell.ShowCodeActionDocumentation",
134-
Arguments = Newtonsoft.Json.Linq.JArray.FromObject(new[] { diagnostic.Code?.String })
136+
Arguments = JArray.FromObject(new object[]
137+
{
138+
diagnostic.Code?.String
139+
},
140+
LspSerializer.Instance.JsonSerializer)
135141
}
136142
});
137143
}

src/PowerShellEditorServices/Services/Workspace/Handlers/ConfigurationHandler.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.PowerShell.EditorServices.Services.Configuration;
1313
using Newtonsoft.Json.Linq;
1414
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
15+
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
1516
using OmniSharp.Extensions.LanguageServer.Protocol.Server;
1617
using OmniSharp.Extensions.LanguageServer.Protocol.Window;
1718
using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
@@ -158,7 +159,7 @@ private void SendFeatureChangesTelemetry(LanguageServerSettingsWrapper incomingS
158159
ExtensionData = new PsesTelemetryEvent
159160
{
160161
EventName = "NonDefaultPsesFeatureConfiguration",
161-
Data = JObject.FromObject(configChanges)
162+
Data = JObject.FromObject(configChanges, LspSerializer.Instance.JsonSerializer)
162163
}
163164
});
164165
}

0 commit comments

Comments
 (0)