Merge branch 'legacy/1.x' of https://github.com/powershell/powershelleditorservices into legacy/1.x

Author: Christoph Bergmeister

CHANGELOG.md

@@ -1,5 +1,17 @@
 # PowerShell Editor Services Release History
 
+## v1.13.1
+### Friday, November 1, 2019
+
+- 📟 [PowerShellEditorServices #1077](https://github.com/PowerShell/PowerShellEditorServices/pull/1077) -
+  Support new console color configuration in PowerShell 7.
+- 🐛 [vscode-powershell #2116](https://github.com/PowerShell/PowerShellEditorServices/pull/1044) -
+  Fix UNC intellisense backslash.
+- 🐛 [vscode-powershell #2214](https://github.com/PowerShell/PowerShellEditorServices/pull/1050) -
+  Fix issue where PipelineIndentationStyle setting is ignored. (Thanks @bergmeister!)
+- ⚙️ [PowerShellEditorServices #1052](https://github.com/PowerShell/PowerShellEditorServices/pull/1052) -
+  Update minimum PSSA version to 1.18.3. (Thanks @bergmeister!)
+
 ## v1.13.0
 ### Monday, September 23, 2019
 

PowerShellEditorServices.Common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.13.0</VersionPrefix>
+    <VersionPrefix>1.13.1</VersionPrefix>
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>

PowerShellEditorServices.build.ps1

@@ -34,7 +34,7 @@ if ($PSVersionTable.PSEdition -ne "Core") {
 
 task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestPowerShellApi {
 
-    $requiredSdkVersion = "2.0.0"
+    $minRequiredSdkVersion = "2.0.0"
 
     $dotnetPath = "$PSScriptRoot/.dotnet"
     $dotnetExePath = if ($script:IsUnix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" }
@@ -54,8 +54,11 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP
     if ($dotnetExePath) {
         # dotnet --version can return a semver that System.Version can't handle
         # e.g.: 2.1.300-preview-01. The replace operator is used to remove any build suffix.
-        $version = (& $dotnetExePath --version) -replace '[+-].*$',''
-        if ([version]$version -ge [version]$requiredSdkVersion) {
+        $version = [version]((& $dotnetExePath --version) -replace '[+-].*$','')
+        $maxRequiredSdkVersion = [version]::Parse("3.0.0")
+
+        # $minRequiredSdkVersion <= version < $maxRequiredSdkVersion
+        if ($version -ge [version]$minRequiredSdkVersion -and $version -lt $maxRequiredSdkVersion) {
             $script:dotnetExe = $dotnetExePath
         }
         else {
@@ -70,7 +73,7 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP
 
     if ($script:dotnetExe -eq $null) {
 
-        Write-Host "`n### Installing .NET CLI $requiredSdkVersion...`n" -ForegroundColor Green
+        Write-Host "`n### Installing .NET CLI $minRequiredSdkVersion...`n" -ForegroundColor Green
 
         # The install script is platform-specific
         $installScriptExt = if ($script:IsUnix) { "sh" } else { "ps1" }
@@ -81,10 +84,10 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP
         $env:DOTNET_INSTALL_DIR = "$PSScriptRoot/.dotnet"
 
         if (!$script:IsUnix) {
-            & $installScriptPath -Version $requiredSdkVersion -InstallDir "$env:DOTNET_INSTALL_DIR"
+            & $installScriptPath -Version $minRequiredSdkVersion -InstallDir "$env:DOTNET_INSTALL_DIR"
         }
         else {
-            & /bin/bash $installScriptPath -Version $requiredSdkVersion -InstallDir "$env:DOTNET_INSTALL_DIR"
+            & /bin/bash $installScriptPath -Version $minRequiredSdkVersion -InstallDir "$env:DOTNET_INSTALL_DIR"
             $env:PATH = $dotnetExeDir + [System.IO.Path]::PathSeparator + $env:PATH
         }
 

module/PowerShellEditorServices/PowerShellEditorServices.psd1

@@ -12,7 +12,7 @@
 RootModule = 'PowerShellEditorServices.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.13.0'
+ModuleVersion = '1.13.1'
 
 # ID used to uniquely identify this module
 GUID = '9ca15887-53a2-479a-9cda-48d26bcb6c47'

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -1987,8 +1987,13 @@ private static CompletionItem CreateCompletionItem(
                 // This causes the editing cursor to be placed *before* the final quote after completion,
                 // which makes subsequent path completions work. See this part of the LSP spec for details:
                 // https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
-                int len = completionDetails.CompletionText.Length;
-                completionText = completionDetails.CompletionText.Insert(len - 1, "$0");
+
+                // Since we want to use a "tab stop" we need to escape a few things for Textmate to render properly.
+                var sb = new StringBuilder(completionDetails.CompletionText)
+                    .Replace(@"\", @"\\")
+                    .Replace(@"}", @"\}")
+                    .Replace(@"$", @"\$");
+                completionText = sb.Insert(sb.Length - 1, "$0").ToString();
                 insertTextFormat = InsertTextFormat.Snippet;
             }
 

src/PowerShellEditorServices/Session/Host/EditorServicesPSHost.cs

@@ -87,6 +87,38 @@ internal ConsoleColorProxy(EditorServicesPSHostUserInterface hostUserInterface)
                 _hostUserInterface = hostUserInterface;
             }
 
+            /// <summary>
+            /// The Accent Color for Formatting
+            /// </summary>
+            public ConsoleColor FormatAccentColor
+            {
+                get
+                {
+                    return _hostUserInterface.FormatAccentColor;
+                }
+
+                set
+                {
+                    _hostUserInterface.FormatAccentColor = value;
+                }
+            }
+
+            /// <summary>
+            /// The Accent Color for Error
+            /// </summary>
+            public ConsoleColor ErrorAccentColor
+            {
+                get
+                {
+                    return _hostUserInterface.ErrorAccentColor;
+                }
+
+                set
+                {
+                    _hostUserInterface.ErrorAccentColor = value;
+                }
+            }
+
             /// <summary>
             /// The ForegroundColor for Error
             /// </summary>

src/PowerShellEditorServices/Session/Host/EditorServicesPSHostUserInterface.cs

@@ -690,6 +690,9 @@ private void WriteDebuggerBanner(DebuggerStopEventArgs eventArgs)
 
         internal static ConsoleColor BackgroundColor { get; set; }
 
+        internal ConsoleColor FormatAccentColor { get; set; } = ConsoleColor.Green;
+        internal ConsoleColor ErrorAccentColor { get; set; } = ConsoleColor.Cyan;
+
         internal ConsoleColor ErrorForegroundColor { get; set; } = ConsoleColor.Red;
         internal ConsoleColor ErrorBackgroundColor { get; set; } = BackgroundColor;