Skip to content

Commit 1c3cdb0

Browse files
Merge pull request #63241 from CyrusNajmabadi/solutionServices
Make SolutionServices (and related) APIs public
2 parents 766ecab + da40e25 commit 1c3cdb0

167 files changed

Lines changed: 342 additions & 341 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private static SyntaxNode ReplaceIdentifierWithInlineDeclaration(
115115
declarator = currentRoot.GetCurrentNode(declarator);
116116
identifier = currentRoot.GetCurrentNode(identifier);
117117

118-
var editor = document.GetSyntaxEditor(currentRoot);
118+
var editor = new SyntaxEditor(currentRoot, document.Project.Solution.Services);
119119
var sourceText = currentRoot.GetText();
120120

121121
var declaration = (VariableDeclarationSyntax)declarator.Parent;

src/Analyzers/CSharp/CodeFixes/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
4848
public static async Task<Document> FixAllAsync(Document document, ImmutableArray<Diagnostic> diagnostics, CodeActionOptionsProvider codeActionOptionsProvider, CancellationToken cancellationToken)
4949
{
5050
var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
51-
var editor = document.GetSyntaxEditor(root);
51+
var editor = new SyntaxEditor(root, document.Project.Solution.Services);
5252

5353
var options = await document.GetCSharpCodeFixOptionsProviderAsync(codeActionOptionsProvider, cancellationToken).ConfigureAwait(false);
5454

src/Analyzers/CSharp/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static async Task<Document> FixAllAsync(
6464
{
6565
var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
6666
var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
67-
var editor = document.GetSyntaxEditor(root);
67+
var editor = new SyntaxEditor(root, document.Project.Solution.Services);
6868
var generator = editor.Generator;
6969
var generatorInternal = document.GetRequiredLanguageService<SyntaxGeneratorInternal>();
7070

src/Analyzers/CSharp/CodeFixes/UseDeconstruction/CSharpUseDeconstructionCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private SyntaxNode UpdateRoot(
6666
SyntaxNode node,
6767
CancellationToken cancellationToken)
6868
{
69-
var editor = document.GetSyntaxEditor(root);
69+
var editor = new SyntaxEditor(root, document.Project.Solution.Services);
7070

7171
// We use the callback form of ReplaceNode because we may have nested code that
7272
// needs to be updated in fix-all situations. For example, nested foreach statements.

src/Analyzers/Core/CodeFixes/RemoveUnusedParametersAndValues/AbstractRemoveUnusedValuesCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private async Task<SyntaxNode> GetNewRootAsync(
288288
var semanticFacts = document.GetRequiredLanguageService<ISemanticFactsService>();
289289
var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
290290

291-
var editor = document.GetSyntaxEditor(root);
291+
var editor = new SyntaxEditor(root, document.Project.Solution.Services);
292292

293293
// We compute the code fix in two passes:
294294
// 1. The first pass groups the diagnostics to fix by containing member declaration and

src/Analyzers/Core/CodeFixes/UnsealClass/AbstractUnsealClassCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private static async Task<Solution> UnsealDeclarationsAsync(
6565
var document = solution.GetDocument(documentId);
6666
var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
6767

68-
var editor = document.GetSyntaxEditor(root);
68+
var editor = new SyntaxEditor(root, document.Project.Solution.Services);
6969
var generator = editor.Generator;
7070

7171
foreach (var syntaxReference in syntaxReferences)

src/Analyzers/Core/CodeFixes/UseCollectionInitializer/AbstractUseCollectionInitializerCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected override async Task FixAllAsync(
9696
var newStatement = GetNewStatement(statement, objectCreation, matches.Value)
9797
.WithAdditionalAnnotations(Formatter.Annotation);
9898

99-
var subEditor = document.GetSyntaxEditor(currentRoot);
99+
var subEditor = new SyntaxEditor(currentRoot, document.Project.Solution.Services);
100100

101101
subEditor.ReplaceNode(statement, newStatement);
102102
foreach (var match in matches)

src/Analyzers/Core/CodeFixes/UseConditionalExpression/AbstractUseConditionalExpressionCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected override async Task FixAllAsync(
5858
// will return 'true' if it made a multi-line conditional expression. In that case,
5959
// we'll need to explicitly format this node so we can get our special multi-line
6060
// formatting in VB and C#.
61-
var nestedEditor = document.GetSyntaxEditor(root);
61+
var nestedEditor = new SyntaxEditor(root, document.Project.Solution.Services);
6262
foreach (var diagnostic in diagnostics)
6363
{
6464
await FixOneAsync(

src/Analyzers/Core/CodeFixes/UseObjectInitializer/AbstractUseObjectInitializerCodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected override async Task FixAllAsync(
9797
var newStatement = GetNewStatement(statement, objectCreation, matches.Value)
9898
.WithAdditionalAnnotations(Formatter.Annotation);
9999

100-
var subEditor = document.GetSyntaxEditor(currentRoot);
100+
var subEditor = new SyntaxEditor(currentRoot, document.Project.Solution.Services);
101101

102102
subEditor.ReplaceNode(statement, newStatement);
103103
foreach (var match in matches)

src/Analyzers/VisualBasic/CodeFixes/RemoveUnnecessaryCast/VisualBasicRemoveUnnecessaryCastCodeFixProvider.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnnecessaryCast
100100
' Now, find the cast nodes again in the expanded document
101101
Dim currentCastNodes = root.GetCurrentNodes(originalCastNodes)
102102

103-
Dim innerEditor = document.GetSyntaxEditor(root)
103+
Dim innerEditor = New SyntaxEditor(root, document.Project.Solution.Services)
104104
Await innerEditor.ApplyExpressionLevelSemanticEditsAsync(
105105
document, currentCastNodes.ToImmutableArray(),
106106
Function(semanticModel, castExpression) IsUnnecessaryCast(castExpression, semanticModel, cancellationToken),
@@ -134,7 +134,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnnecessaryCast
134134
{containingStatement, nextStatement})
135135
End Function).Distinct()
136136

137-
Dim editor = document.GetSyntaxEditor(root)
137+
Dim editor = New SyntaxEditor(root, document.Project.Solution.Services)
138138

139139
For Each containingStatement In containingAndNextStatements
140140
Dim expandedStatement = Await Simplifier.ExpandAsync(containingStatement, document, cancellationToken:=cancellationToken).ConfigureAwait(False)

0 commit comments

Comments
 (0)