Skip to content

Commit 1ffe6db

Browse files
andyleejordanandyleejordan
authored
Merge pull request #1424 from PowerShell/andschwa/omnisharp-update
Update to use OmniSharp 0.19.0
2 parents 9d4e4c2 + 3ae17e8 commit 1ffe6db

35 files changed

+145
-311
lines changed

‎PowerShellEditorServices.Common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<VersionSuffix>preview.1</VersionSuffix>
55
<Company>Microsoft</Company>
66
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
7+
<LangVersion>9.0</LangVersion>
78
<PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
89
<PackageLicenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</PackageLicenseUrl>
910
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

‎src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
23

34
<PropertyGroup>
45
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
56
<AssemblyName>Microsoft.PowerShell.EditorServices.Hosting</AssemblyName>
6-
<LangVersion>latest</LangVersion>
77
</PropertyGroup>
88

99
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

‎src/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
20-
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0">
20+
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1">
2121
<PrivateAssets>All</PrivateAssets>
2222
</PackageReference>
2323
</ItemGroup>

‎src/PowerShellEditorServices/Logging/PsesTelemetryEvent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
namespace Microsoft.PowerShell.EditorServices.Logging
1010
{
1111
// This inheirits from Dictionary so that it can be passed in to SendTelemetryEvent()
12-
// which takes in an IDictionary<string, JToken>
12+
// which takes in an IDictionary<string, object>
1313
// However, I wanted creation to be easy so you can do
1414
// new PsesTelemetryEvent { EventName = "eventName", Data = data }
15-
internal class PsesTelemetryEvent : Dictionary<string, JToken>
15+
internal class PsesTelemetryEvent : Dictionary<string, object>
1616
{
1717
public string EventName
1818
{

‎src/PowerShellEditorServices/PowerShellEditorServices.csproj

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,9 @@
77
<Description>Provides common PowerShell editor capabilities as a .NET library.</Description>
88
<TargetFrameworks>netstandard2.0</TargetFrameworks>
99
<AssemblyName>Microsoft.PowerShell.EditorServices</AssemblyName>
10-
<LangVersion>Latest</LangVersion>
1110
<Configurations>Debug;Release</Configurations>
1211
</PropertyGroup>
1312

14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<LangVersion>latest</LangVersion>
16-
<CheckForOverflowUnderflow></CheckForOverflowUnderflow>
17-
</PropertyGroup>
18-
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
20-
<LangVersion>latest</LangVersion>
21-
</PropertyGroup>
22-
2313
<ItemGroup>
2414
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
2515
<_Parameter1>Microsoft.PowerShell.EditorServices.Hosting</_Parameter1>
@@ -39,8 +29,8 @@
3929
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
4030
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />
4131
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
42-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.18.3" />
43-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.18.3" />
32+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
33+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.0" />
4434
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
4535
<PackageReference Include="Serilog" Version="2.10.0" />
4636
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />

‎src/PowerShellEditorServices/Server/PsesLanguageServer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public async Task StartAsync()
6767
.AddPsesLanguageServices(_hostDetails))
6868
.ConfigureLogging(builder => builder
6969
.AddSerilog(Log.Logger)
70-
.AddLanguageProtocolLogging(_minimumLogLevel)
70+
.AddLanguageProtocolLogging()
7171
.SetMinimumLevel(_minimumLogLevel))
7272
.WithHandler<PsesWorkspaceSymbolsHandler>()
7373
.WithHandler<PsesTextDocumentHandler>()
@@ -94,6 +94,7 @@ public async Task StartAsync()
9494
.WithHandler<ExpandAliasHandler>()
9595
.WithHandler<PsesSemanticTokensHandler>()
9696
.OnInitialize(
97+
// TODO: Either fix or ignore "method lacks 'await'" warning.
9798
async (languageServer, request, cancellationToken) =>
9899
{
99100
var serviceProvider = languageServer.Services;

‎src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile
5555
Data = JToken.FromObject(new {
5656
Uri = scriptFile.DocumentUri,
5757
ProviderId = nameof(PesterCodeLensProvider)
58-
}, Serializer.Instance.JsonSerializer),
58+
}, LspSerializer.Instance.JsonSerializer),
5959
Command = new Command()
6060
{
6161
Name = "PowerShell.RunPesterTests",
@@ -66,7 +66,7 @@ private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile
6666
false /* No debug */,
6767
pesterSymbol.TestName,
6868
pesterSymbol.ScriptRegion?.StartLineNumber
69-
}, Serializer.Instance.JsonSerializer)
69+
}, LspSerializer.Instance.JsonSerializer)
7070
}
7171
},
7272

@@ -76,7 +76,7 @@ private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile
7676
Data = JToken.FromObject(new {
7777
Uri = scriptFile.DocumentUri,
7878
ProviderId = nameof(PesterCodeLensProvider)
79-
}, Serializer.Instance.JsonSerializer),
79+
}, LspSerializer.Instance.JsonSerializer),
8080
Command = new Command()
8181
{
8282
Name = "PowerShell.RunPesterTests",
@@ -88,7 +88,7 @@ private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile
8888
pesterSymbol.TestName,
8989
pesterSymbol.ScriptRegion?.StartLineNumber
9090
},
91-
Serializer.Instance.JsonSerializer)
91+
LspSerializer.Instance.JsonSerializer)
9292
}
9393
}
9494
};

‎src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
6868
{
6969
Uri = scriptFile.DocumentUri,
7070
ProviderId = nameof(ReferencesCodeLensProvider)
71-
}, Serializer.Instance.JsonSerializer),
71+
}, LspSerializer.Instance.JsonSerializer),
7272
Range = sym.ScriptRegion.ToRange()
7373
});
7474
}
@@ -145,7 +145,7 @@ public CodeLens ResolveCodeLens(CodeLens codeLens, ScriptFile scriptFile)
145145
codeLens.Range.Start,
146146
referenceLocations
147147
},
148-
Serializer.Instance.JsonSerializer)
148+
LspSerializer.Instance.JsonSerializer)
149149
}
150150
};
151151
}

‎src/PowerShellEditorServices/Services/DebugAdapter/DebugEventHandlerService.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ private void DebugService_BreakpointUpdated(object sender, BreakpointUpdatedEven
146146
break;
147147
}
148148

149-
OmniSharp.Extensions.DebugAdapter.Protocol.Models.Breakpoint breakpoint;
149+
var breakpoint = new OmniSharp.Extensions.DebugAdapter.Protocol.Models.Breakpoint
150+
{
151+
Verified = e.UpdateType != BreakpointUpdateType.Disabled
152+
};
153+
150154
if (e.Breakpoint is LineBreakpoint)
151155
{
152156
breakpoint = LspDebugUtils.CreateBreakpoint(BreakpointDetails.Create(e.Breakpoint));
@@ -162,8 +166,6 @@ private void DebugService_BreakpointUpdated(object sender, BreakpointUpdatedEven
162166
return;
163167
}
164168

165-
breakpoint.Verified = e.UpdateType != BreakpointUpdateType.Disabled;
166-
167169
_debugAdapterServer.SendNotification(EventNames.Breakpoint,
168170
new BreakpointEvent
169171
{

‎src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Microsoft.PowerShell.EditorServices.Handlers
1515
{
16+
// TODO: Inherit from ABCs instead of satisfying interfaces.
1617
internal class DebuggerActionHandlers : IContinueHandler, INextHandler, IPauseHandler, IStepInHandler, IStepOutHandler
1718
{
1819
private readonly ILogger _logger;
@@ -22,7 +23,7 @@ public DebuggerActionHandlers(
2223
ILoggerFactory loggerFactory,
2324
DebugService debugService)
2425
{
25-
_logger = loggerFactory.CreateLogger<ContinueHandler>();
26+
_logger = loggerFactory.CreateLogger<ContinueHandlerBase>();
2627
_debugService = debugService;
2728
}
2829

0 commit comments

Comments
 (0)