From 22f832779ae988ed7375a4ece2c32e0e6d2b5450 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Thu, 4 May 2023 12:36:15 -0700 Subject: [PATCH 1/2] Remove not used service --- ...eActionOperationFactoryWorkspaceService.cs | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 src/OmniSharp.Roslyn/WorkspaceServices/OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService.cs diff --git a/src/OmniSharp.Roslyn/WorkspaceServices/OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService.cs b/src/OmniSharp.Roslyn/WorkspaceServices/OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService.cs deleted file mode 100644 index 8c1ba7ec71..0000000000 --- a/src/OmniSharp.Roslyn/WorkspaceServices/OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Composition; -using System.Threading; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CodeActions; -using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CodeRefactorings.WorkspaceServices; - -namespace OmniSharp -{ - [Shared] - [Export(typeof(IOmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService))] - public class OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService : IOmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService - { - [ImportingConstructor] - public OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService() - { - } - - public CodeActionOperation CreateSymbolRenamedOperation(ISymbol symbol, string newName, Solution startingSolution, Solution updatedSolution) - { - return new RenameSymbolOperation( - symbol, - newName, - updatedSolution); - } - - private class RenameSymbolOperation : CodeActionOperation - { - private readonly ISymbol _symbol; - private readonly string _newName; - private readonly Solution _updatedSolution; - - public RenameSymbolOperation( - ISymbol symbol, - string newName, - Solution updatedSolution) - { - _symbol = symbol; - _newName = newName; - _updatedSolution = updatedSolution; - } - - public override void Apply(Workspace workspace, CancellationToken cancellationToken = default) - { - workspace.TryApplyChanges(_updatedSolution); - } - - public override string Title => $"Rename {_symbol.Name} to {_newName}"; - } - } -} From 5f14b4633828e60726d0a184e85c33f6093f54a9 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Thu, 4 May 2023 12:50:08 -0700 Subject: [PATCH 2/2] Use PickMemberService to locate assembly --- src/OmniSharp.Roslyn/HostServicesAggregator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OmniSharp.Roslyn/HostServicesAggregator.cs b/src/OmniSharp.Roslyn/HostServicesAggregator.cs index 709510c6d0..8ec0f85b02 100644 --- a/src/OmniSharp.Roslyn/HostServicesAggregator.cs +++ b/src/OmniSharp.Roslyn/HostServicesAggregator.cs @@ -60,7 +60,7 @@ public HostServicesAggregator( } } - builder.Add(typeof(OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService).Assembly); + builder.Add(typeof(PickMemberWorkspaceService).Assembly); _assemblies = builder.ToImmutableArray(); _options = options; }