[Ignore] Fix rebase errors, migrate upstream tests

Author: Robert Holt

src/PowerShellEditorServices/Language/LanguageService.cs

@@ -744,13 +744,12 @@ private async Task GetAliases()
                     return;
                 }
 
-                CommandInvocationIntrinsics invokeCommand = runspaceHandle.Runspace.SessionStateProxy.InvokeCommand;
-                    var aliases = await _powerShellContext.ExecuteCommand<AliasInfo>(
-                        new PSCommand()
-                            .AddCommand("Microsoft.PowerShell.Core\\Get-Command")
-                            .AddParameter("CommandType", CommandTypes.Alias),
-                        sendOutputToHost: false,
-                        sendErrorToHost: false);
+                var aliases = await _powerShellContext.ExecuteCommand<AliasInfo>(
+                    new PSCommand()
+                        .AddCommand("Microsoft.PowerShell.Core\\Get-Command")
+                        .AddParameter("CommandType", CommandTypes.Alias),
+                    sendOutputToHost: false,
+                    sendErrorToHost: false);
 
                 foreach (AliasInfo aliasInfo in aliases)
                 {

test/PowerShellEditorServices.Test/Session/ScriptFileTests.cs

@@ -137,31 +137,31 @@ public void CanApplyMultiLineDelete()
         public void CanApplyEditsToEndOfFile()
         {
             this.AssertFileChange(
-                "line1\r\nline2\r\nline3\r\n\r\n",
-                "line1\r\nline2\r\nline3\r\n\r\n\r\n\r\n",
+                TestUtilities.NormalizeNewlines("line1\nline2\nline3\n\n"),
+                TestUtilities.NormalizeNewlines("line1\nline2\nline3\n\n\n\n"),
                 new FileChange
                 {
                     Line = 5,
                     EndLine = 5,
                     Offset = 1,
                     EndOffset = 1,
-                    InsertString = "\r\n\r\n"
+                    InsertString = TestUtilities.NormalizeNewlines("\n\n")
                 });
         }
 
         [Fact]
         public void CanAppendToEndOfFile()
         {
             this.AssertFileChange(
-                "line1\r\nline2\r\nline3",
-                "line1\r\nline2\r\nline3\r\nline4\r\nline5",
+                TestUtilities.NormalizeNewlines("line1\nline2\nline3"),
+                TestUtilities.NormalizeNewlines("line1\nline2\nline3\nline4\nline5"),
                 new FileChange
                 {
                     Line = 4,
                     EndLine = 5,
                     Offset = 1,
                     EndOffset = 1,
-                    InsertString = "line4\r\nline5"
+                    InsertString = TestUtilities.NormalizeNewlines("line4\nline5")
                 }
             );
         }
@@ -216,8 +216,8 @@ public void ThrowsExceptionWithEditOutsideOfRange()
         public void CanDeleteFromEndOfFile()
         {
             this.AssertFileChange(
-                "line1\r\nline2\r\nline3\r\nline4",
-                "line1\r\nline2",
+                TestUtilities.NormalizeNewlines("line1\nline2\nline3\nline4"),
+                TestUtilities.NormalizeNewlines("line1\nline2"),
                 new FileChange
                 {
                     Line = 3,

test/PowerShellEditorServices.Test/Session/WorkspaceTests.cs

@@ -5,10 +5,15 @@
 
 using System;
 using System.IO;
+using System.Collections.Generic;
 using Microsoft.PowerShell.EditorServices.Test.Shared;
 using Microsoft.PowerShell.EditorServices.Utility;
 using Xunit;
 
+#if CoreCLR
+using System.Runtime.InteropServices;
+#endif
+
 namespace Microsoft.PowerShell.EditorServices.Test.Session
 {
     public class WorkspaceTests
@@ -76,15 +81,7 @@ public void CanDetermineIsPathInMemory()
         }
 
         [Theory()]
-        [InlineData("file:///C%3A/banana/", @"C:\banana\")]
-        [InlineData("file:///C%3A/banana/ex.ps1", @"C:\banana\ex.ps1")]
-        [InlineData("file:///E%3A/Path/to/awful%23path", @"E:\Path\to\awful#path")]
-        [InlineData("file:///path/with/no/drive", @"C:\path\with\no\drive")]
-        [InlineData("file:///path/wi[th]/squ[are/brackets/", @"C:\path\wi[th]\squ[are\brackets\")]
-        [InlineData("file:///Carrots/A%5Ere/Good/", @"C:\Carrots\A^re\Good\")]
-        [InlineData("file:///Users/barnaby/%E8%84%9A%E6%9C%AC/Reduce-Directory", @"C:\Users\barnaby\脚本\Reduce-Directory")]
-        [InlineData("file:///C%3A/Program%20Files%20%28x86%29/PowerShell/6/pwsh.exe", @"C:\Program Files (x86)\PowerShell\6\pwsh.exe")]
-        [InlineData("file:///home/maxim/test%20folder/%D0%9F%D0%B0%D0%BF%D0%BA%D0%B0/helloworld.ps1", @"C:\home\maxim\test folder\Папка\helloworld.ps1")]
+        [MemberData(nameof(PathResolutionInput))]
         public void CorrectlyResolvesPaths(string givenPath, string expectedPath)
         {
             Workspace workspace = new Workspace(PowerShellVersion, Logging.NullLogger);
@@ -93,5 +90,52 @@ public void CorrectlyResolvesPaths(string givenPath, string expectedPath)
 
             Assert.Equal(expectedPath, resolvedPath);
         }
+
+        public static IEnumerable<object[]> PathResolutionInput
+        {
+            get
+            {
+#if !CoreCLR
+                return new [] {
+                    new [] { "file:///C%3A/banana/", @"C:\banana\" },
+                    new [] { "file:///C%3A/banana/ex.ps1", @"C:\banana\ex.ps1" },
+                    new [] { "file:///E%3A/Path/to/awful%23path", @"E:\Path\to\awful#path" },
+                    new [] { "file:///path/with/no/drive", @"C:\path\with\no\drive" },
+                    new [] { "file:///path/wi[th]/squ[are/brackets/", @"C:\path\wi[th]\squ[are\brackets\" },
+                    new [] { "file:///Carrots/A%5Ere/Good/", @"C:\Carrots\A^re\Good\" },
+                    new [] { "file:///Users/barnaby/%E8%84%9A%E6%9C%AC/Reduce-Directory", @"C:\Users\barnaby\脚本\Reduce-Directory" },
+                    new [] { "file:///C%3A/Program%20Files%20%28x86%29/PowerShell/6/pwsh.exe", @"C:\Program Files (x86)\PowerShell\6\pwsh.exe" },
+                    new [] { "file:///home/maxim/test%20folder/%D0%9F%D0%B0%D0%BF%D0%BA%D0%B0/helloworld.ps1", @"C:\home\maxim\test folder\Папка\helloworld.ps1" }
+                };
+#else
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    return new [] {
+                        new [] { "file:///C%3A/banana/", @"C:\banana\" },
+                        new [] { "file:///C%3A/banana/ex.ps1", @"C:\banana\ex.ps1" },
+                        new [] { "file:///E%3A/Path/to/awful%23path", @"E:\Path\to\awful#path" },
+                        new [] { "file:///path/with/no/drive", @"C:\path\with\no\drive" },
+                        new [] { "file:///path/wi[th]/squ[are/brackets/", @"C:\path\wi[th]\squ[are\brackets\" },
+                        new [] { "file:///Carrots/A%5Ere/Good/", @"C:\Carrots\A^re\Good\" },
+                        new [] { "file:///Users/barnaby/%E8%84%9A%E6%9C%AC/Reduce-Directory", @"C:\Users\barnaby\脚本\Reduce-Directory" },
+                        new [] { "file:///C%3A/Program%20Files%20%28x86%29/PowerShell/6/pwsh.exe", @"C:\Program Files (x86)\PowerShell\6\pwsh.exe" },
+                        new [] { "file:///home/maxim/test%20folder/%D0%9F%D0%B0%D0%BF%D0%BA%D0%B0/helloworld.ps1", @"C:\home\maxim\test folder\Папка\helloworld.ps1" }
+                    };
+                }
+
+                return new [] {
+                    new [] { "file:///banana/", "/banana/" },
+                    new [] { "file:///banana/ex.ps1", "/banana/ex.ps1" },
+                    new [] { "file://Path/to/awful%23path", "/Path/to/awful#path" },
+                    new [] { "file:///path/wi[th]/squ[are/brackets/", "/path/wi[th]/sq[are/brackets/" },
+                    new [] { "file:///path%5Cto/file", "/path\\to/file" },
+                    new [] { "file:///Carrots/A%5Ere/Good/", "/Carrots/A^re/Good/" },
+                    new [] { "file:///Users/barnaby/%E8%84%9A%E6%9C%AC/Reduce-Directory", "/Users/barnaby/脚本/Reduce-Directory" },
+                    new [] { "file:///Program%20Files%20%28x86%29/PowerShell/6/pwsh.exe", "/Program Files (x86)/PowerShell/6/pwsh.exe" },
+                    new [] { "file:///home/maxim/test%20folder/%D0%9F%D0%B0%D0%BF%D0%BA%D0%B0/helloworld.ps1", @"/home/maxim/test folder/Папка/helloworld.ps1" }
+                };
+#endif
+            }
+        }
     }
 }