Skip to content

Commit 9304403

Browse files
Merge branch 'main' into extractMethodCleanup
2 parents acfbf81 + dabda72 commit 9304403

File tree

574 files changed

+2081
-1967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

574 files changed

+2081
-1967
lines changed

eng/config/PublishData.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,15 @@
215215
"vsMajorVersion": 17,
216216
"insertionTitlePrefix": "[d17.12]"
217217
},
218+
"release/dev17.12-telmet": {
219+
"nugetKind": [
220+
"Shipping",
221+
"NonShipping"
222+
],
223+
"vsBranch": "rel/d17.12telmet",
224+
"vsMajorVersion": 17,
225+
"insertionTitlePrefix": "[d17.12]"
226+
},
218227
"release/dev17.13": {
219228
"nugetKind": [
220229
"Shipping",

src/Analyzers/CSharp/Analyzers/RemoveUnreachableCode/RemoveUnreachableCodeHelpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public static ImmutableArray<ImmutableArray<StatementSyntax>> GetSubsequentUnrea
1818
switch (firstUnreachableStatement.Parent)
1919
{
2020
case BlockSyntax block:
21-
siblingStatements = ImmutableArray.CreateRange(block.Statements);
21+
siblingStatements = [.. block.Statements];
2222
break;
2323

2424
case SwitchSectionSyntax switchSection:
25-
siblingStatements = ImmutableArray.CreateRange(switchSection.Statements);
25+
siblingStatements = [.. switchSection.Statements];
2626
break;
2727

2828
case GlobalStatementSyntax globalStatement:

src/Analyzers/CSharp/CodeFixes/DocumentationComments/CSharpAddDocCommentNodesCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal sealed class CSharpAddDocCommentNodesCodeFixProvider()
3232
protected override string NodeName { get; } = "param";
3333

3434
protected override List<XmlNameAttributeSyntax> GetNameAttributes(XmlElementSyntax node)
35-
=> node.StartTag.Attributes.OfType<XmlNameAttributeSyntax>().ToList();
35+
=> [.. node.StartTag.Attributes.OfType<XmlNameAttributeSyntax>()];
3636

3737
protected override string GetValueFromNameAttribute(XmlNameAttributeSyntax attribute)
3838
=> attribute.Identifier.Identifier.ValueText;

src/Analyzers/CSharp/CodeFixes/GenerateParameterizedMember/CSharpGenerateParameterizedMemberService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,16 @@ private ITypeParameterSymbol GetMethodTypeParameter(TypeSyntax type, Cancellatio
126126
}
127127

128128
protected override ImmutableArray<RefKind> DetermineParameterModifiers(CancellationToken cancellationToken)
129-
=> _invocationExpression.ArgumentList.Arguments.Select(a => a.GetRefKind()).ToImmutableArray();
129+
=> [.. _invocationExpression.ArgumentList.Arguments.Select(a => a.GetRefKind())];
130130

131131
protected override ImmutableArray<ITypeSymbol> DetermineParameterTypes(CancellationToken cancellationToken)
132-
=> _invocationExpression.ArgumentList.Arguments.Select(a => DetermineParameterType(a, cancellationToken)).ToImmutableArray();
132+
=> [.. _invocationExpression.ArgumentList.Arguments.Select(a => DetermineParameterType(a, cancellationToken))];
133133

134134
private ITypeSymbol DetermineParameterType(ArgumentSyntax argument, CancellationToken cancellationToken)
135135
=> argument.DetermineParameterType(Document.SemanticModel, cancellationToken);
136136

137137
protected override ImmutableArray<bool> DetermineParameterOptionality(CancellationToken cancellationToken)
138-
=> _invocationExpression.ArgumentList.Arguments.Select(a => false).ToImmutableArray();
138+
=> [.. _invocationExpression.ArgumentList.Arguments.Select(a => false)];
139139

140140
protected override bool IsIdentifierName()
141141
=> State.SimpleNameOpt.Kind() == SyntaxKind.IdentifierName;

src/Analyzers/CSharp/CodeFixes/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private static ImmutableArray<StatementSyntax> GetStatements(SyntaxNode pseudoBl
246246
return [.. switchSection.Statements];
247247

248248
if (pseudoBlock is CompilationUnitSyntax compilationUnit)
249-
return compilationUnit.Members.OfType<GlobalStatementSyntax>().Select(g => g.Statement).ToImmutableArray();
249+
return [.. compilationUnit.Members.OfType<GlobalStatementSyntax>().Select(g => g.Statement)];
250250

251251
return [];
252252
}

src/Analyzers/CSharp/CodeFixes/MisplacedUsingDirectives/MisplacedUsingDirectivesCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private static CompilationUnitSyntax MoveUsingsOutsideNamespaces(CompilationUnit
227227
var usingsToAdd = namespaceDeclarationMap.Values.SelectMany(result => result.usingsFromNamespace)
228228
.Select(directive => directive.WithAdditionalAnnotations(Formatter.Annotation, s_warningAnnotation));
229229

230-
var (deduplicatedUsings, orphanedTrivia) = RemoveDuplicateUsings(compilationUnit.Usings, usingsToAdd.ToImmutableArray());
230+
var (deduplicatedUsings, orphanedTrivia) = RemoveDuplicateUsings(compilationUnit.Usings, [.. usingsToAdd]);
231231

232232
// Update the compilation unit with the usings from the namespace declaration.
233233
var newUsings = compilationUnitWithReplacedNamespaces.Usings.AddRange(deduplicatedUsings);

src/Analyzers/CSharp/CodeFixes/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsCodeFixProvider.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace Microsoft.CodeAnalysis.CSharp.RemoveUnnecessaryImports;
1313

1414
[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.RemoveUnnecessaryImports), Shared]
1515
[ExtensionOrder(After = PredefinedCodeFixProviderNames.AddMissingReference)]
16+
[ExtensionOrder(Before = PredefinedCodeFixProviderNames.ConvertToProgramMain)]
1617
[method: ImportingConstructor]
1718
[method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
1819
internal sealed class CSharpRemoveUnnecessaryImportsCodeFixProvider() : AbstractRemoveUnnecessaryImportsCodeFixProvider

src/Analyzers/CSharp/CodeFixes/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected override async Task FixAllAsync(
114114
currentRoot = ReplaceReferences(
115115
document, currentRoot,
116116
delegateType, parameterList,
117-
references.Select(node => currentRoot.GetCurrentNode(node)).ToImmutableArray());
117+
[.. references.Select(node => currentRoot.GetCurrentNode(node))]);
118118
}
119119

120120
editor.ReplaceNode(root, currentRoot);

src/Analyzers/CSharp/Tests/ConvertToRecord/ConvertToRecordCodeFixTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ private class TestAnalyzer : DiagnosticAnalyzer
161161
{
162162
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
163163
#pragma warning disable RS0030 // Do not used banned APIs
164-
=> ImmutableArray.Create(new DiagnosticDescriptor(
164+
=> [new DiagnosticDescriptor(
165165
"CS8865",
166166
"Only records may inherit from records.",
167167
"Only records may inherit from records.",
168168
"Compiler error",
169169
DiagnosticSeverity.Error,
170-
isEnabledByDefault: true));
170+
isEnabledByDefault: true)];
171171
#pragma warning restore RS0030 // Do not used banned APIs
172172

173173
public override void Initialize(AnalysisContext context)

src/Analyzers/CSharp/Tests/NamingStyles/NamingStylesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class C
272272
{
273273
{{camelCaseSymbol}}
274274
}
275-
""", new TestParameters(options: s_options.AccessibilitiesArePascalCase(ImmutableArray.Create(alternateAccessibility))));
275+
""", new TestParameters(options: s_options.AccessibilitiesArePascalCase([alternateAccessibility])));
276276

277277
await TestInRegularAndScriptAsync(
278278
$$"""
@@ -286,7 +286,7 @@ class C
286286
{
287287
{{pascalCaseSymbol}}
288288
}
289-
""", options: s_options.AccessibilitiesArePascalCase(ImmutableArray.Create(accessibility)));
289+
""", options: s_options.AccessibilitiesArePascalCase([accessibility]));
290290
}
291291

292292
[Fact]

0 commit comments

Comments
 (0)