Move EditorSession creation out of LanguageServer and DebugAdapter

This change is the first step toward moving runspace and feature
creation to the host's entry point so that it can be more configurable.
The creation of EditorSession is now handled by the EditorServicesHost.
This is the start of further refactoring so expect more changes.

Author: daviwil

src/PowerShellEditorServices.Host/EditorServicesHost.cs

@@ -12,6 +12,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
+using Microsoft.PowerShell.EditorServices.Extensions;
 
 namespace Microsoft.PowerShell.EditorServices.Host
 {
@@ -34,6 +35,7 @@ public class EditorServicesHost
         private HostDetails hostDetails;
         private string bundledModulesPath;
         private DebugAdapter debugAdapter;
+        private EditorSession editorSession;
         private HashSet<string> featureFlags;
         private LanguageServer languageServer;
 
@@ -82,7 +84,7 @@ public EditorServicesHost(
                 else
                 {
                     Debugger.Launch();
-                }                
+                }
             }
 #endif
 
@@ -148,11 +150,15 @@ public void StartLogging(string logFilePath, LogLevel logLevel)
         /// <param name="profilePaths">The object containing the profile paths to load for this session.</param>
         public void StartLanguageService(int languageServicePort, ProfilePaths profilePaths)
         {
+            this.editorSession =
+                CreateSession(
+                    this.hostDetails,
+                    profilePaths,
+                    this.enableConsoleRepl);
+
             this.languageServer =
                 new LanguageServer(
-                    hostDetails,
-                    profilePaths,
-                    this.enableConsoleRepl,
+                    this.editorSession,
                     new TcpSocketServerChannel(languageServicePort));
 
             this.languageServer.Start().Wait();
@@ -177,17 +183,23 @@ public void StartDebugService(
             {
                 this.debugAdapter =
                     new DebugAdapter(
-                        this.languageServer.EditorSession,
-                        new TcpSocketServerChannel(debugServicePort));
+                        this.editorSession,
+                        new TcpSocketServerChannel(debugServicePort),
+                        false);
             }
             else
             {
+                EditorSession debugSession =
+                    this.CreateDebugSession(
+                        this.hostDetails,
+                        profilePaths,
+                        this.languageServer.EditorOperations);
+
                 this.debugAdapter =
                     new DebugAdapter(
-                        hostDetails,
-                        profilePaths,
+                        debugSession,
                         new TcpSocketServerChannel(debugServicePort),
-                        this.languageServer?.EditorOperations);
+                        true);
             }
 
             this.debugAdapter.SessionEnded +=
@@ -253,6 +265,28 @@ public void WaitForCompletion()
 
         #region Private Methods
 
+        private EditorSession CreateSession(
+            HostDetails hostDetails,
+            ProfilePaths profilePaths,
+            bool enableConsoleRepl)
+        {
+            EditorSession editorSession = new EditorSession();
+            editorSession.StartSession(hostDetails, profilePaths, enableConsoleRepl);
+
+            return editorSession;
+        }
+
+        private EditorSession CreateDebugSession(
+            HostDetails hostDetails,
+            ProfilePaths profilePaths,
+            IEditorOperations editorOperations)
+        {
+            EditorSession editorSession = new EditorSession();
+            editorSession.StartDebugSession(hostDetails, profilePaths, editorOperations);
+
+            return editorSession;
+        }
+
 #if !CoreCLR
         static void CurrentDomain_UnhandledException(
             object sender,

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -37,40 +37,17 @@ public class DebugAdapter : DebugAdapterBase
         private bool isInteractiveDebugSession;
         private RequestContext<object> disconnectRequestContext = null;
 
-        public DebugAdapter(HostDetails hostDetails, ProfilePaths profilePaths)
-            : this(hostDetails, profilePaths, new StdioServerChannel(), null)
-        {
-        }
-
-        public DebugAdapter(EditorSession editorSession, ChannelBase serverChannel)
-            : base(serverChannel)
-        {
-            this.editorSession = editorSession;
-        }
-
         public DebugAdapter(
-            HostDetails hostDetails,
-            ProfilePaths profilePaths,
+            EditorSession editorSession,
             ChannelBase serverChannel,
-            IEditorOperations editorOperations)
-            : this(hostDetails, profilePaths, serverChannel, editorOperations, false)
+            bool ownsEditorSession)
+                : base(serverChannel)
         {
+            this.editorSession = editorSession;
+            this.ownsEditorSession = ownsEditorSession;
+            this.enableConsoleRepl = editorSession.UsesConsoleHost;
         }
 
-        public DebugAdapter(
-            HostDetails hostDetails,
-            ProfilePaths profilePaths,
-            ChannelBase serverChannel,
-            IEditorOperations editorOperations,
-            bool enableConsoleRepl)
-            : base(serverChannel)
-        {
-            this.ownsEditorSession = true;
-            this.editorSession = new EditorSession();
-            this.editorSession.StartDebugSession(hostDetails, profilePaths, editorOperations);
-            this.enableConsoleRepl = enableConsoleRepl;
-       }
-
         protected override void Initialize()
         {
             // Register all supported message types
@@ -325,6 +302,7 @@ protected async Task HandleLaunchRequest(
 
             if (this.editorSession.ConsoleService.EnableConsoleRepl)
             {
+                // TODO: Write this during DebugSession init
                 await this.WriteUseIntegratedConsoleMessage();
             }
 

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -45,31 +45,15 @@ public IEditorOperations EditorOperations
             get { return this.editorOperations; }
         }
 
-        public EditorSession EditorSession
-        {
-            get { return this.editorSession; }
-        }
-
-        /// <param name="hostDetails">
-        /// Provides details about the host application.
-        /// </param>
-        public LanguageServer(HostDetails hostDetails, ProfilePaths profilePaths)
-            : this(hostDetails, profilePaths, false, new StdioServerChannel())
-        {
-        }
-
         /// <param name="hostDetails">
         /// Provides details about the host application.
         /// </param>
         public LanguageServer(
-            HostDetails hostDetails,
-            ProfilePaths profilePaths,
-            bool enableConsoleRepl,
+            EditorSession editorSession,
             ChannelBase serverChannel)
             : base(serverChannel)
         {
-            this.editorSession = new EditorSession();
-            this.editorSession.StartSession(hostDetails, profilePaths, enableConsoleRepl);
+            this.editorSession = editorSession;
             this.editorSession.PowerShellContext.RunspaceChanged += PowerShellContext_RunspaceChanged;
 
             // Attach to ExtensionService events
@@ -86,7 +70,7 @@ public LanguageServer(
             this.editorSession.StartDebugService(this.editorOperations);
             this.editorSession.DebugService.DebuggerStopped += DebugService_DebuggerStopped;
 
-            if (enableConsoleRepl)
+            if (this.editorSession.UsesConsoleHost)
             {
                 this.editorSession.ConsoleService.EnableConsoleRepl = true;
             }
@@ -1080,18 +1064,18 @@ protected async Task HandleCommentHelpRequest(
            CommentHelpRequestParams requestParams,
            RequestContext<CommentHelpRequestResult> requestContext)
         {
-            var scriptFile = EditorSession.Workspace.GetFile(requestParams.DocumentUri);
+            var scriptFile = this.editorSession.Workspace.GetFile(requestParams.DocumentUri);
             var expectedFunctionLine = requestParams.TriggerPosition.Line + 2;
 
             string helpLocation;
-            var functionDefinitionAst = EditorSession.LanguageService.GetFunctionDefinitionForHelpComment(
+            var functionDefinitionAst = this.editorSession.LanguageService.GetFunctionDefinitionForHelpComment(
                 scriptFile,
                 requestParams.TriggerPosition.Line + 1,
                 out helpLocation);
             var result = new CommentHelpRequestResult();
             if (functionDefinitionAst != null)
             {
-                var analysisResults = await EditorSession.AnalysisService.GetSemanticMarkersAsync(
+                var analysisResults = await this.editorSession.AnalysisService.GetSemanticMarkersAsync(
                     functionDefinitionAst.Extent.Text,
                     AnalysisService.GetCommentHelpRuleSettings(
                         true,

src/PowerShellEditorServices/Session/EditorSession.cs

@@ -65,6 +65,12 @@ public class EditorSession
         /// </summary>
         public RemoteFileManager RemoteFileManager { get; private set; }
 
+        /// <summary>
+        /// Gets a boolean which is true if the integrated console host is
+        /// active in this session.
+        /// </summary>
+        public bool UsesConsoleHost { get; private set; }
+
         #endregion
 
         #region Public Methods
@@ -93,6 +99,7 @@ public void StartSession(
             this.ConsoleService = new ConsoleService(this.PowerShellContext);
             this.ExtensionService = new ExtensionService(this.PowerShellContext);
             this.TemplateService = new TemplateService(this.PowerShellContext);
+            this.UsesConsoleHost = enableConsoleRepl;
 
             this.InstantiateAnalysisService();