Skip to content
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

Jump to bottom

Merge main to VBOverloadResolutionPriority #75876

Merged
merged 25 commits into from
Nov 12, 2024
Merged

Merge main to VBOverloadResolutionPriority #75876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5c5f8a6
Add new line before 'where' constraints in Quick Info
Youssef1313 Apr 3, 2022
658a8d5
Add four spaces
Youssef1313 Jun 23, 2022
66a0c72
Fix formatting of simplify-linq-expression
CyrusNajmabadi Nov 11, 2024
af475f1
Share fixer
CyrusNajmabadi Nov 11, 2024
eff1394
Update tests
CyrusNajmabadi Nov 11, 2024
ad7f251
Add test
CyrusNajmabadi Nov 11, 2024
fcaaaf6
Work item
CyrusNajmabadi Nov 11, 2024
62fc746
Move HasHome out of Binder (#75851)
jjonescz Nov 12, 2024
5780d35
Update structured logger (#75865)
jaredpar Nov 12, 2024
d3176f5
Make VBCSCompiler pipe name insensitive to casing of the path (#75852)
jjonescz Nov 12, 2024
c576a3b
Merge remote-tracking branch 'upstream/main' into symbol-display-cons…
CyrusNajmabadi Nov 12, 2024
83480ec
Only wrap when multiple
CyrusNajmabadi Nov 12, 2024
6a24d0c
Wrap types
CyrusNajmabadi Nov 12, 2024
002f3bf
Add tests
CyrusNajmabadi Nov 12, 2024
fa02ecd
Use raw strings for tests
CyrusNajmabadi Nov 12, 2024
e0f7781
Add support for running lightbulbs even when not fully loaded.
CyrusNajmabadi Nov 12, 2024
6f02ad9
Merge branch 'main' into linqFormatting
CyrusNajmabadi Nov 12, 2024
9980db3
Add new line before 'where' constraints in Quick Info (#60545)
CyrusNajmabadi Nov 12, 2024
84e2b49
Update VSSDK and Gladstone versions
tmat Oct 23, 2024
d1f0374
Update VS SDK to 17.12.39557-preview.2.1
tmat Oct 28, 2024
f155e6b
Editor
tmat Oct 28, 2024
9b88f4f
Add support for running lightbulbs even when not fully loaded. (#75869)
CyrusNajmabadi Nov 12, 2024
856a1a2
Change tagging to free a SegmentedList back to a pool (#75873)
ToddGrun Nov 12, 2024
3b99be5
Fix formatting of simplify-linq-expression (#75860)
CyrusNajmabadi Nov 12, 2024
30f5e30
Update VSSDK versions (#75594)
arunchndr Nov 12, 2024
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
63 changes: 32 additions & 31 deletions eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
<VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
<ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
<ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
<MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
Expand Down Expand Up @@ -46,10 +46,10 @@
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Build" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.0-preview-24426-07" />
</ItemGroup>

<ItemGroup>
Expand All @@ -58,7 +58,7 @@
<!--
Visual Studio
-->
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.10.234-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
<PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="$(MicrosoftVisualStudioExtensibilityVersion)" />
Expand Down Expand Up @@ -91,32 +91,33 @@

<!--
Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
See https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md if any of these packages fail to restore.
-->
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.5.31" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.10.37" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.10.37" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.10.40170" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.10.40152" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.10.124" />
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.32-beta" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.17-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.17-preview" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.12.39-preview" />
<PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.21" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.10.40170" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.13.14" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
<PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageVersion Include="StreamJsonRpc" Version="2.18.48" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.11-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.32" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.73" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />

<!--
VS Debugger
Expand Down Expand Up @@ -319,7 +320,7 @@
Infra
-->
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.169" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
<PackageVersion Include="Mono.Options" Version="6.6.0.161" />
<PackageVersion Include="RichCodeNav.EnvVarDump" Version="0.1.1643-alpha" />
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsNugetPackageVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
Expand Down
1 change: 0 additions & 1 deletion src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
<Compile Include="$(MSBuildThisFileDirectory)RemoveUnusedMembers\CSharpRemoveUnusedMembersCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)RemoveUnusedParametersAndValues\CSharpRemoveUnusedValuesCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyInterpolation\CSharpSimplifyInterpolationCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyLinqExpression\CSharpSimplifyLinqExpressionCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyPropertyPattern\CSharpSimplifyPropertyPatternCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TransposeRecordKeyword\CSharpTransposeRecordKeywordCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UseCollectionInitializer\CSharpUseCollectionInitializerCodeFixProvider.cs" />
Expand Down
21 changes: 0 additions & 21 deletions ...rs/CSharp/CodeFixes/SimplifyLinqExpression/CSharpSimplifyLinqExpressionCodeFixProvider.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Analyzers/CSharp/Tests/SimplifyLinqExpression/CSharpSimplifyLinqExpressionFixAllTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.SimplifyLinqExpression;
using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
using Microsoft.CodeAnalysis.SimplifyLinqExpression;
using Microsoft.CodeAnalysis.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.CSharp.Analyzers.UnitTests.SimplifyLinqExpression;

using VerifyCS = CSharpCodeFixVerifier<
CSharpSimplifyLinqExpressionDiagnosticAnalyzer,
CSharpSimplifyLinqExpressionCodeFixProvider>;
SimplifyLinqExpressionCodeFixProvider>;

[Trait(Traits.Feature, Traits.Features.CodeActionsInlineDeclaration)]
public partial class CSharpSimplifyLinqExpressionTests
Expand Down
42 changes: 40 additions & 2 deletions src/Analyzers/CSharp/Tests/SimplifyLinqExpression/CSharpSimplifyLinqExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.SimplifyLinqExpression;
using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
using Microsoft.CodeAnalysis.SimplifyLinqExpression;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.CSharp.Analyzers.UnitTests.SimplifyLinqExpression;

using VerifyCS = CSharpCodeFixVerifier<
CSharpSimplifyLinqExpressionDiagnosticAnalyzer,
CSharpSimplifyLinqExpressionCodeFixProvider>;
SimplifyLinqExpressionCodeFixProvider>;

[Trait(Traits.Feature, Traits.Features.CodeActionsSimplifyLinqExpression)]
public partial class CSharpSimplifyLinqExpressionTests
public sealed partial class CSharpSimplifyLinqExpressionTests
{
[Theory, CombinatorialData]
public static async Task TestAllowedMethodTypes(
Expand Down Expand Up @@ -525,4 +527,40 @@ void Main()
""";
await VerifyCS.VerifyAnalyzerAsync(source);
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/52283")]
public static async Task TestTrivia1()
{
await new VerifyCS.Test
{
TestCode = """
using System;
using System.Linq;
using System.Collections.Generic;

class C
{
static void Main(string[] args)
{
var v = [|args.Skip(1)
.Where(a => a.Length == 1).Count()|];
}
}
""",
FixedCode = """
using System;
using System.Linq;
using System.Collections.Generic;

class C
{
static void Main(string[] args)
{
var v = args.Skip(1)
.Count(a => a.Length == 1);
}
}
"""
}.RunAsync();
}
}
4 changes: 3 additions & 1 deletion src/Analyzers/Core/Analyzers/Analyzers.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)AnalyzersResources.resx" GenerateSource="true" Link="AnalyzersResources.resx" />
<None Include="$(MSBuildThisFileDirectory)AnalyzersResources.resx" />
<None Include="$(MSBuildThisFileDirectory)AnalyzersResources.resx">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Core/CodeFixes/CodeFixes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<Compile Include="$(MSBuildThisFileDirectory)RemoveUnusedParametersAndValues\AbstractRemoveUnusedValuesCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyBooleanExpression\SimplifyConditionalCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyInterpolation\AbstractSimplifyInterpolationCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyLinqExpression\AbstractSimplifyLinqExpressionCodeFixProvider`3.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SimplifyLinqExpression\SimplifyLinqExpressionCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UpgradeProject\AbstractUpgradeProjectCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UseCoalesceExpression\AbstractUseCoalesceExpressionForIfNullStatementCheckCodeFixProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UseCoalesceExpression\UseCoalesceExpressionForTernaryConditionalCheckCodeFixProvider.cs" />
Expand Down
70 changes: 0 additions & 70 deletions .../Core/CodeFixes/SimplifyLinqExpression/AbstractSimplifyLinqExpressionCodeFixProvider`3.cs
View file
Open in desktop

This file was deleted.

Loading
Loading