Feature/constrained runspace support

PowerShellEditorServices.build.ps1

@@ -107,8 +107,8 @@ task SetupDotNet -Before Clean, Build, TestServerWinPS, TestServerPS7, TestServe
     $dotnetExePath = if ($script:IsNix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
 
     if (!(Test-Path $dotnetExePath)) {
-        # TODO: Test .NET 5 with PowerShell 7.1, and add that channel here.
-        Install-Dotnet -Channel '3.1','release/6.0.1xx-preview2'
+        # TODO: Test .NET 5 with PowerShell 7.1
+        Install-Dotnet -Channel '3.1','5.0','6.0'
     }
 
     # This variable is used internally by 'dotnet' to know where it's installed
@@ -174,6 +174,7 @@ task GetProductVersion -Before PackageModule, UploadArtifacts {
 task CreateBuildInfo -Before Build {
     $buildVersion = "<development-build>"
     $buildOrigin = "Development"
+    $buildCommit = git rev-parse HEAD
 
     # Set build info fields on build platforms
     if ($env:TF_BUILD) {
@@ -215,6 +216,7 @@ namespace Microsoft.PowerShell.EditorServices.Hosting
     {
         public static readonly string BuildVersion = "$buildVersion";
         public static readonly string BuildOrigin = "$buildOrigin";
+        public static readonly string BuildCommit = "$buildCommit";
         public static readonly System.DateTime? BuildTime = System.DateTime.Parse("$buildTime", CultureInfo.InvariantCulture.DateTimeFormat);
     }
 }
@@ -446,4 +448,4 @@ task UploadArtifacts -If ($null -ne $env:TF_BUILD) {
 }
 
 # The default task is to run the entire CI build
-task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageModule, UploadArtifacts
+task . GetProductVersion, Clean, Build, Test, BuildCmdletHelp, PackageModule, UploadArtifacts

build.ps1

@@ -100,4 +100,4 @@ if ($Bootstrap) {
     if($Test) {
         Invoke-Build Test
     }
-}
+}

src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs

@@ -349,6 +349,7 @@ private EditorServicesConfig CreateConfigObject()
             var profile = (PSObject)GetVariableValue("profile");
 
             var hostInfo = new HostInfo(HostName, HostProfileId, HostVersion);
+            var initialSessionState = Runspace.DefaultRunspace.InitialSessionState;
             var editorServicesConfig = new EditorServicesConfig(hostInfo, Host, SessionDetailsPath, bundledModulesPath, LogPath)
             {
                 FeatureFlags = FeatureFlags,
@@ -357,7 +358,7 @@ private EditorServicesConfig CreateConfigObject()
                 AdditionalModules = AdditionalModules,
                 LanguageServiceTransport = GetLanguageServiceTransport(),
                 DebugServiceTransport = GetDebugServiceTransport(),
-                LanguageMode = Runspace.DefaultRunspace.SessionStateProxy.LanguageMode,
+                InitialSessionState = initialSessionState,
                 ProfilePaths = new ProfilePathConfig
                 {
                     AllUsersAllHosts = GetProfilePathFromProfileObject(profile, ProfileUserKind.AllUsers, ProfileHostKind.AllHosts),

src/PowerShellEditorServices.Hosting/Configuration/EditorServicesConfig.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using System.Management.Automation.Host;
+using System.Management.Automation.Runspaces;
 
 namespace Microsoft.PowerShell.EditorServices.Hosting
 {
@@ -111,10 +112,9 @@ public EditorServicesConfig(
         public ProfilePathConfig ProfilePaths { get; set; }
 
         /// <summary>
-        /// The language mode inherited from the orginal PowerShell process.
-        /// This will be used when creating runspaces so that we honor the same language mode.
+        /// The InitialSessionState to use when creating runspaces. LanguageMode can be set here.
         /// </summary>
-        public PSLanguageMode LanguageMode { get; internal set; }
+        public InitialSessionState InitialSessionState { get; internal set; }
 
         public string StartupBanner { get; set; } = @"
 

src/PowerShellEditorServices.Hosting/EditorServicesLoader.cs

@@ -269,6 +269,7 @@ private void LogHostInformation()
 == Build Details ==
 - Editor Services version: {BuildInfo.BuildVersion}
 - Build origin:            {BuildInfo.BuildOrigin}
+- Build commit:            {BuildInfo.BuildCommit}
 - Build time:              {BuildInfo.BuildTime}
 ");
 

src/PowerShellEditorServices.Hosting/Internal/EditorServicesRunner.cs

@@ -288,7 +288,7 @@ private HostStartupInfo CreateHostStartupInfo()
                 profilePaths,
                 _config.FeatureFlags,
                 _config.AdditionalModules,
-                _config.LanguageMode,
+                _config.InitialSessionState,
                 _config.LogPath,
                 (int)_config.LogLevel,
                 consoleReplEnabled: _config.ConsoleRepl != ConsoleReplKind.None,

src/PowerShellEditorServices/Hosting/HostStartupInfo.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using System.Management.Automation.Host;
+using System.Management.Automation.Runspaces;
 
 namespace Microsoft.PowerShell.EditorServices.Hosting
 {
@@ -92,10 +93,10 @@ public sealed class HostStartupInfo
         public string LogPath { get; }
 
         /// <summary>
-        /// The language mode inherited from the orginal PowerShell process.
-        /// This will be used when creating runspaces so that we honor the same language mode.
+        /// The initialSessionState will be inherited from the orginal PowerShell process.
+        /// This will be used when creating runspaces so that we honor the same initialSessionState including allowed modules, cmdlets and language mode.
         /// </summary>
-        public PSLanguageMode LanguageMode { get; }
+        public InitialSessionState InitialSessionState { get; }
 
         /// <summary>
         /// The minimum log level of log events to be logged.
@@ -130,7 +131,7 @@ public sealed class HostStartupInfo
         /// <param name="currentUsersProfilePath">The path to the user specific profile.</param>
         /// <param name="featureFlags">Flags of features to enable.</param>
         /// <param name="additionalModules">Names or paths of additional modules to import.</param>
-        /// <param name="languageMode">The language mode inherited from the orginal PowerShell process. This will be used when creating runspaces so that we honor the same language mode.</param>
+        /// <param name="initialSessionState">The language mode inherited from the orginal PowerShell process. This will be used when creating runspaces so that we honor the same initialSessionState including allowed modules, cmdlets and language mode.</param>
         /// <param name="logPath">The path to log to.</param>
         /// <param name="logLevel">The minimum log event level.</param>
         /// <param name="consoleReplEnabled">Enable console if true.</param>
@@ -143,7 +144,7 @@ public HostStartupInfo(
             ProfilePathInfo profilePaths,
             IReadOnlyList<string> featureFlags,
             IReadOnlyList<string> additionalModules,
-            PSLanguageMode languageMode,
+            InitialSessionState initialSessionState,
             string logPath,
             int logLevel,
             bool consoleReplEnabled,
@@ -156,7 +157,7 @@ public HostStartupInfo(
             ProfilePaths = profilePaths;
             FeatureFlags = featureFlags ?? Array.Empty<string>();
             AdditionalModules = additionalModules ?? Array.Empty<string>();
-            LanguageMode = languageMode;
+            InitialSessionState = initialSessionState;
             LogPath = logPath;
             LogLevel = logLevel;
             ConsoleReplEnabled = consoleReplEnabled;

src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs

@@ -86,7 +86,7 @@ internal static string GetUniqueIdFromDiagnostic(Diagnostic diagnostic)
 
         private readonly ConfigurationService _configurationService;
 
-        private readonly WorkspaceService _workplaceService;
+        private readonly WorkspaceService _workspaceService;
 
         private readonly int _analysisDelayMillis;
 
@@ -115,7 +115,7 @@ public AnalysisService(
             _logger = loggerFactory.CreateLogger<AnalysisService>();
             _languageServer = languageServer;
             _configurationService = configurationService;
-            _workplaceService = workspaceService;
+            _workspaceService = workspaceService;
             _analysisDelayMillis = 750;
             _mostRecentCorrectionsByFile = new ConcurrentDictionary<ScriptFile, CorrectionTableEntry>();
             _analysisEngineLazy = new Lazy<PssaCmdletAnalysisEngine>(InstantiateAnalysisEngine);
@@ -223,9 +223,10 @@ public async Task<string> GetCommentHelpText(string functionText, string helpLoc
         /// </summary>
         /// <param name="documentUri">The URI string of the file to get code actions for.</param>
         /// <returns>A threadsafe readonly dictionary of the code actions of the particular file.</returns>
-        public async Task<IReadOnlyDictionary<string, MarkerCorrection>> GetMostRecentCodeActionsForFileAsync(ScriptFile scriptFile)
+        public async Task<IReadOnlyDictionary<string, MarkerCorrection>> GetMostRecentCodeActionsForFileAsync(DocumentUri uri)
         {
-            if (!_mostRecentCorrectionsByFile.TryGetValue(scriptFile, out CorrectionTableEntry corrections))
+            if (!_workspaceService.TryGetFile(uri, out ScriptFile file)
+                || !_mostRecentCorrectionsByFile.TryGetValue(file, out CorrectionTableEntry corrections))
             {
                 return null;
             }
@@ -334,7 +335,7 @@ private bool TryFindSettingsFile(out string settingsFilePath)
                 return false;
             }
 
-            settingsFilePath = _workplaceService.ResolveWorkspacePath(configuredPath);
+            settingsFilePath = _workspaceService.ResolveWorkspacePath(configuredPath);
 
             if (settingsFilePath == null
                 || !File.Exists(settingsFilePath))
@@ -349,7 +350,7 @@ private bool TryFindSettingsFile(out string settingsFilePath)
 
         private void ClearOpenFileMarkers()
         {
-            foreach (ScriptFile file in _workplaceService.GetOpenedFiles())
+            foreach (ScriptFile file in _workspaceService.GetOpenedFiles())
             {
                 ClearMarkers(file);
             }
@@ -455,10 +456,10 @@ private static DiagnosticSeverity MapDiagnosticSeverity(ScriptFileMarkerLevel ma
         {
             switch (markerLevel)
             {
-                case ScriptFileMarkerLevel.Error:       return DiagnosticSeverity.Error;
-                case ScriptFileMarkerLevel.Warning:     return DiagnosticSeverity.Warning;
+                case ScriptFileMarkerLevel.Error: return DiagnosticSeverity.Error;
+                case ScriptFileMarkerLevel.Warning: return DiagnosticSeverity.Warning;
                 case ScriptFileMarkerLevel.Information: return DiagnosticSeverity.Information;
-                default:                                return DiagnosticSeverity.Error;
+                default: return DiagnosticSeverity.Error;
             };
         }