Skip to content

Bump OmniSharp to v0.19.6 #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 7, 2022
Merged

Bump OmniSharp to v0.19.6 #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acdde6f
Bump OmniSharp.Extensions.LanguageServer from 0.19.5 to 0.19.6
dependabot[bot] Nov 4, 2022
2fadbcf
Bump OmniSharp.Extensions.DebugAdapter.Server from 0.19.5 to 0.19.6
dependabot[bot] Nov 4, 2022
0571d39
Bump OmniSharp.Extensions.LanguageClient from 0.19.5 to 0.19.6
dependabot[bot] Nov 4, 2022
19cdeb8
Bump OmniSharp.Extensions.DebugAdapter.Client from 0.19.5 to 0.19.6
dependabot[bot] Nov 4, 2022
e1817de
Skip tests broken by OmniSharp update
andyleejordan Nov 7, 2022
32f6832
Remove superfluous build flags
andyleejordan Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions PowerShellEditorServices.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@
<!-- Required to enable IDE0005 as error -->
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<!-- TODO: Enable <AnalysisMode>All</AnalysisMode> -->
<!-- See: https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/6.0/implicit-namespaces -->
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/PowerShellEditorServices/PowerShellEditorServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<!-- Manually pull in the updated version of Newtonsoft.Json. -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.5" />
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.6" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
Expand Down
4 changes: 2 additions & 2 deletions test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.5" />
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.5" />
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.6" />
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.6" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
Expand Down
4 changes: 0 additions & 4 deletions test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<ItemGroup>
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
</ItemGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Microsoft.PowerShell.EditorServices.Test</_Parameter1>
Expand Down
17 changes: 12 additions & 5 deletions test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,19 @@ private Task<CompletionResults> GetCompletionResultsAsync(ScriptRegion scriptReg
CancellationToken.None);
}

[Fact]
[SkippableFact]
public async Task CompletesCommandInFile()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandInFile.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
Assert.Equal(CompleteCommandInFile.ExpectedCompletion, actual);
}

[Fact]
[SkippableFact]
public async Task CompletesCommandFromModule()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandFromModule.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
// NOTE: The tooltip varies across PowerShell and OS versions, so we ignore it.
Expand All @@ -74,6 +76,7 @@ public async Task CompletesCommandFromModule()
[SkippableFact]
public async Task CompletesTypeName()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
Expand All @@ -95,23 +98,26 @@ public async Task CompletesTypeName()
[SkippableFact]
public async Task CompletesNamespace()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);
}

[Fact]
[SkippableFact]
public async Task CompletesVariableInFile()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteVariableInFile.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);
}

[Fact]
[SkippableFact]
public async Task CompletesAttributeValue()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);
// NOTE: Since the completions come through un-ordered from PowerShell, their SortText
// (which has an index prepended from the original order) will mis-match our assumed
Expand All @@ -122,9 +128,10 @@ public async Task CompletesAttributeValue()
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));
}

[Fact]
[SkippableFact]
public async Task CompletesFilePath()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteFilePath.SourceDetails).ConfigureAwait(true);
Assert.NotEmpty(results);
CompletionItem actual = results.First();
Expand Down
7 changes: 1 addition & 6 deletions test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
<TargetPlatform>x64</TargetPlatform>
</PropertyGroup>

<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
<ProjectReference Include="..\PowerShellEditorServices.Test.Shared\PowerShellEditorServices.Test.Shared.csproj" />
Expand All @@ -36,7 +31,7 @@
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions test/PowerShellEditorServices.Test/Services/Symbols/PSScriptAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.PowerShell.EditorServices.Services;
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
using Microsoft.PowerShell.EditorServices.Test;
using Microsoft.PowerShell.EditorServices.Utility;
using Xunit;

namespace PowerShellEditorServices.Test.Services.Symbols
Expand Down Expand Up @@ -65,9 +66,10 @@ public async Task CanLoadPSScriptAnalyzerAsync()
});
}

[Fact]
[SkippableFact]
public async Task DoesNotDuplicateScriptMarkersAsync()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-1", script);
ScriptFile[] scriptFiles = { scriptFile };

Expand All @@ -83,9 +85,10 @@ await analysisService
Assert.Single(scriptFile.DiagnosticMarkers);
}

[Fact]
[SkippableFact]
public async Task DoesNotClearParseErrorsAsync()
{
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
// Causing a missing closing } parser error
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-2", script.TrimEnd('}'));
ScriptFile[] scriptFiles = { scriptFile };
Expand Down