Merge pull request #68095 from Cosifne/dev/shech/portSymbolRenamedCod…

…eActionOptionFactoryService Check ISymbolRenamedCodeActionOperationFactoryWorkspaceService is null when rename
dotnet · May 4, 2023 · 5ec6d1a · 5ec6d1a
2 parents 806dba8 + 9b6958b
commit 5ec6d1a
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Analyzers/Core/CodeFixes/NamingStyle/NamingStyleCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/NamingStyle/NamingStyleCodeFixProvider.cs
@@ -18,6 +18,7 @@
 using Microsoft.CodeAnalysis.Rename;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.Shared.Collections;
 
 #if !CODE_STYLE  // https://github.com/dotnet/roslyn/issues/42218 removing dependency on WorkspaceServices.
 using Microsoft.CodeAnalysis.CodeActions.WorkspaceServices;
@@ -163,12 +164,17 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
 #if CODE_STYLE  // https://github.com/dotnet/roslyn/issues/42218 tracks removing this conditional code.
                 return SpecializedCollections.SingletonEnumerable(codeAction);
 #else
-                var factory = _startingSolution.Services.GetRequiredService<ISymbolRenamedCodeActionOperationFactoryWorkspaceService>();
-                return new CodeActionOperation[]
+
+                using var operations = TemporaryArray<CodeActionOperation>.Empty;
+
+                operations.Add(codeAction);
+                var factory = _startingSolution.Services.GetService<ISymbolRenamedCodeActionOperationFactoryWorkspaceService>();
+                if (factory is not null)
                 {
-                    codeAction,
-                    factory.CreateSymbolRenamedOperation(_symbol, _newName, _startingSolution, newSolution)
-                };
+                    operations.Add(factory.CreateSymbolRenamedOperation(_symbol, _newName, _startingSolution, newSolution));
+                }
+
+                return operations.ToImmutableAndClear();
 #endif
             }