Additional changes to allow PSReadLine to work in CLM (#1290)

* Use PSReadLine in CLM

* update PSRL version check for CLM

* feedback

* add workaround for PSGet behavior

Co-authored-by: Tyler Leonhardt (POWERSHELL) <[email protected]>

Author: TylerLeonhardt

PowerShellEditorServices.build.ps1

@@ -406,13 +406,18 @@ task RestorePsesModules -After Build {
 
         $splatParameters = @{
            Name = $moduleName
-           MinimumVersion = $moduleInstallDetails.MinimumVersion
-           MaximumVersion = $moduleInstallDetails.MaximumVersion
            AllowPrerelease = $moduleInstallDetails.AllowPrerelease
            Repository = if ($moduleInstallDetails.Repository) { $moduleInstallDetails.Repository } else { $DefaultModuleRepository }
            Path = $submodulePath
         }
 
+        # Only add Min and Max version if we're doing a stable release.
+        # This is due to a PSGet issue with AllowPrerelease not installing the latest preview.
+        if (!$moduleInstallDetails.AllowPrerelease) {
+            $splatParameters.MinimumVersion = $moduleInstallDetails.MinimumVersion
+            $splatParameters.MaximumVersion = $moduleInstallDetails.MaximumVersion
+        }
+
         Write-Host "`tInstalling module: ${moduleName} with arguments $(ConvertTo-Json $splatParameters)"
 
         Save-Module @splatParameters

modules.json

@@ -8,6 +8,6 @@
         "MaximumVersion":"1.99"
     },
     "PSReadLine":{
-        "MinimumVersion":"2.0.0"
+        "MinimumVersion":"2.0.2"
     }
 }

src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs

@@ -415,8 +415,6 @@ public void Initialize(
 
             if (powerShellVersion.Major >= 5 &&
                 this.isPSReadLineEnabled &&
-                // TODO: Figure out why PSReadLine isn't working in ConstrainedLanguage mode.
-                initialRunspace.SessionStateProxy.LanguageMode == PSLanguageMode.FullLanguage &&
                 PSReadLinePromptContext.TryGetPSReadLineProxy(logger, initialRunspace, out PSReadLineProxy proxy))
             {
                 this.PromptContext = new PSReadLinePromptContext(

src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs

@@ -729,7 +729,7 @@ private async Task WritePromptStringToHostAsync(CancellationToken cancellationTo
             {
             }
 
-            PSCommand promptCommand = new PSCommand().AddScript("prompt");
+            PSCommand promptCommand = new PSCommand().AddCommand("prompt");
 
             cancellationToken.ThrowIfCancellationRequested();
             string promptString =

src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLinePromptContext.cs

@@ -14,26 +14,35 @@
 
 namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
+    using System.IO;
     using System.Management.Automation;
 
     internal class PSReadLinePromptContext : IPromptContext
     {
-        private const string ReadLineInitScript = @"
+        private static readonly string _psReadLineModulePath = Path.Combine(
+            Path.GetDirectoryName(typeof(PSReadLinePromptContext).Assembly.Location),
+            "..",
+            "..",
+            "..",
+            "PSReadLine");
+
+        private static readonly string ReadLineInitScript = $@"
             [System.Diagnostics.DebuggerHidden()]
             [System.Diagnostics.DebuggerStepThrough()]
             param()
-            end {
+            end {{
                 $module = Get-Module -ListAvailable PSReadLine |
-                    Where-Object { $_.Version -gt '2.0.0' -or ($_.Version -eq '2.0.0' -and -not $_.PrivateData.PSData.Prerelease) } |
+                    Where-Object {{ $_.Version -ge '2.0.2' }} |
                     Sort-Object -Descending Version |
                     Select-Object -First 1
-                if (-not $module) {
-                    return
-                }
+                if (-not $module) {{
+                    Import-Module '{_psReadLineModulePath.Replace("'", "''")}'
+                    return [Microsoft.PowerShell.PSConsoleReadLine]
+                }}
 
                 Import-Module -ModuleInfo $module
                 return [Microsoft.PowerShell.PSConsoleReadLine]
-            }";
+            }}";
 
         private static readonly Lazy<CmdletInfo> s_lazyInvokeReadLineForEditorServicesCmdletInfo = new Lazy<CmdletInfo>(() =>
         {