Make required service changes

OmniSharp · Dec 20, 2024 · c9a9937 · c9a9937
1 parent 7efafed
commit c9a9937
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/OmniSharp.Roslyn/WorkspaceServices/ExtractClassWorkspaceService.cs b/src/OmniSharp.Roslyn/WorkspaceServices/ExtractClassWorkspaceService.cs
@@ -16,7 +16,7 @@ public ExtractClassWorkspaceService()
         {
         }
 
-        public Task<OmniSharpExtractClassOptions> GetExtractClassOptionsAsync(Document document, INamedTypeSymbol originalType, ImmutableArray<ISymbol> selectedMembers)
+        public OmniSharpExtractClassOptions GetExtractClassOptions(Document document, INamedTypeSymbol originalType, ImmutableArray<ISymbol> selectedMembers)
         {
             var symbolsToUse = selectedMembers.IsEmpty
                 ? originalType.GetMembers().Where(member => member switch
@@ -29,7 +29,7 @@ public Task<OmniSharpExtractClassOptions> GetExtractClassOptionsAsync(Document d
 
             var memberAnalysisResults = symbolsToUse.Select(m => new OmniSharpExtractClassMemberAnalysisResult(m, makeAbstract: false)).ToImmutableArray();
             const string name = "NewBaseType";
-            return Task.FromResult(new OmniSharpExtractClassOptions($"{name}.cs", name, true, memberAnalysisResults));
+            return new OmniSharpExtractClassOptions($"{name}.cs", name, true, memberAnalysisResults);
         }
     }
 }
diff --git a/src/OmniSharp.Roslyn/WorkspaceServices/ExtractInterfaceWorkspaceService.cs b/src/OmniSharp.Roslyn/WorkspaceServices/ExtractInterfaceWorkspaceService.cs
@@ -16,14 +16,14 @@ public ExtractInterfaceWorkspaceService()
         {
         }
 
-        public Task<OmniSharpExtractInterfaceOptionsResult> GetExtractInterfaceOptionsAsync(List<ISymbol> extractableMembers, string defaultInterfaceName)
+        public OmniSharpExtractInterfaceOptionsResult GetExtractInterfaceOptions(List<ISymbol> extractableMembers, string defaultInterfaceName)
         {
-            return Task.FromResult(new OmniSharpExtractInterfaceOptionsResult(
+            return new OmniSharpExtractInterfaceOptionsResult(
                 isCancelled: false,
                 extractableMembers.ToImmutableArray(),
                 defaultInterfaceName,
                 $"{defaultInterfaceName}.cs",
-                OmniSharpExtractInterfaceOptionsResult.OmniSharpExtractLocation.SameFile));
+                OmniSharpExtractInterfaceOptionsResult.OmniSharpExtractLocation.SameFile);
         }
     }
 }
diff --git a/src/OmniSharp.Roslyn/WorkspaceServices/NotificationWorkspaceService.cs b/src/OmniSharp.Roslyn/WorkspaceServices/NotificationWorkspaceService.cs
@@ -0,0 +1,25 @@
+using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Notification;
+
+namespace OmniSharp
+{
+    [Shared]
+    [Export(typeof(IOmniSharpNotificationService))]
+    internal class NotificationWorkspaceService : IOmniSharpNotificationService
+    {
+        [ImportingConstructor]
+        public NotificationWorkspaceService()
+        {
+        }
+
+        public bool ConfirmMessageBox(string message, string title = null, OmniSharpNotificationSeverity severity = OmniSharpNotificationSeverity.Warning)
+        {
+            return true;
+        }
+
+        public void SendNotification(string message, string title = null, OmniSharpNotificationSeverity severity = OmniSharpNotificationSeverity.Warning)
+        {
+            return;
+        }
+    }
+}