Fix rebase issues

Author: rjmholt

src/PowerShellEditorServices/Server/PsesServiceCollectionExtensions.cs

@@ -47,7 +47,7 @@ public static IServiceCollection AddPsesLanguageServices(
                             provider.GetService<EditorOperationsService>(),
                             provider.GetService<PowerShellExecutionService>());
 
-                        extensionService.InitializeAsync().GetAwaiter().GetResult();
+                        extensionService.InitializeAsync();
 
                         return extensionService;
                     })

src/PowerShellEditorServices/Services/PowerShell/Console/PSReadLineProxy.cs

@@ -62,7 +62,7 @@ internal class PSReadLineProxy
             param()
             end {{
                 $module = Get-Module -ListAvailable PSReadLine |
-                    Where-Object {{ $_.Version -ge '2.0.2' }} |
+                    Where-Object {{ $_.Version -ge '2.2.1' }} |
                     Sort-Object -Descending Version |
                     Select-Object -First 1
                 if (-not $module) {{
@@ -104,11 +104,6 @@ public PSReadLineProxy(
                 new[] { typeof(Runspace), typeof(EngineIntrinsics), typeof(CancellationToken) })
                 ?.CreateDelegate(typeof(Func<Runspace, EngineIntrinsics, CancellationToken, string>));
 
-            ForcePSEventHandling = (Action)psConsoleReadLine.GetMethod(
-                ForcePSEventHandlingMethodName,
-                BindingFlags.Static | BindingFlags.NonPublic)
-                ?.CreateDelegate(typeof(Action));
-
             AddToHistory = (Action<string>)psConsoleReadLine.GetMethod(
                 AddToHistoryMethodName,
                 s_addToHistoryTypes)
@@ -156,14 +151,6 @@ public PSReadLineProxy(
                     AddToHistoryMethodName,
                     _logger);
             }
-
-            if (ForcePSEventHandling == null)
-            {
-                throw NewInvalidPSReadLineVersionException(
-                    MethodMemberType,
-                    ForcePSEventHandlingMethodName,
-                    _logger);
-            }
         }
 
         internal Action<string> AddToHistory { get; }

src/PowerShellEditorServices/Services/PowerShell/Debugging/PowerShellDebugContext.cs

@@ -14,15 +14,15 @@ internal class PowerShellDebugContext : IPowerShellDebugContext
     {
         private readonly ILogger _logger;
 
-        private readonly ILanguageServer _languageServer;
+        private readonly ILanguageServerFacade _languageServer;
 
         private readonly EditorServicesConsolePSHost _psesHost;
 
         private readonly ConsoleReplRunner _consoleRepl;
 
         public PowerShellDebugContext(
             ILoggerFactory loggerFactory,
-            ILanguageServer languageServer,
+            ILanguageServerFacade languageServer,
             EditorServicesConsolePSHost psesHost,
             ConsoleReplRunner consoleReplRunner)
         {
@@ -33,7 +33,7 @@ public PowerShellDebugContext(
         }
 
         private CancellationTokenSource _debugLoopCancellationSource;
-        
+
         public bool IsStopped { get; private set; }
 
         public DscBreakpointCapability DscBreakpointCapability => throw new NotImplementedException();

src/PowerShellEditorServices/Services/PowerShell/Host/EditorServicesConsolePSHost.cs

@@ -44,7 +44,7 @@ internal class EditorServicesConsolePSHost : PSHost, IHostSupportsInteractiveSes
 
         public EditorServicesConsolePSHost(
             ILoggerFactory loggerFactory,
-            ILanguageServer languageServer,
+            ILanguageServerFacade languageServer,
             HostStartupInfo hostInfo)
         {
             _logger = loggerFactory.CreateLogger<EditorServicesConsolePSHost>();