Bunch of fixes. Should finally take care of all corner cases #41

parthopdas · parthopdas · commit a3dd33554bbd · 2024-03-26T16:58:23.000-04:00
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact1.json.approved.txt b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact1.json.approved.txt
@@ -1,3 +1,3 @@
 [0] = {
-  "Message": "   Compiling pls_core_extras v0.1.0 (D:\\src\\dpt\\pls\\pls_core_extras)"
+  "Message": "   Compiling pls_core_extras v0.1.0 (file:///D:/src/dpt/pls/pls_core_extras)"
 }
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact2.json.approved.txt b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact2.json.approved.txt
@@ -1,3 +1,3 @@
 [0] = {
-  "Message": "   Compiling tera v1.17.1"
+  "Message": "   Compiling tera v1.17.1 (https://github.com/rust-lang/crates.io-index)"
 }
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact4.json.approved.txt b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact4.json.approved.txt
@@ -0,0 +1,3 @@
+[0] = {
+  "Message": "   Compiling file:///D:/src/u/rlenvs/client-rust#gymnasium v0.1.0"
+}
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact5.json.approved.txt b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.ParseCompilerArtifiacts.datafile-CompilerArtifact5.json.approved.txt
@@ -0,0 +1,3 @@
+[0] = {
+  "Message": "   Compiling https://github.com/rust-lang/crates.io-index#futures-util v0.3.30"
+}
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.cs b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/BuildJsonOutputParserTests.cs
@@ -30,6 +30,8 @@ public void IfNotParsableReturnAsIs()
     [InlineData("CompilerArtifact1.json")]
     [InlineData("CompilerArtifact2.json")]
     [InlineData("CompilerArtifact3.json")]
+    [InlineData("CompilerArtifact4.json")]
+    [InlineData("CompilerArtifact5.json")]
     public void ParseCompilerArtifiacts(string dataFile)
     {
         NamerFactory.AdditionalInformation = $"datafile-{dataFile}";
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/TestData/CompilerArtifact4.json b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/TestData/CompilerArtifact4.json
@@ -0,0 +1,26 @@
+{
+  "reason": "compiler-artifact",
+  "package_id": "path+file:///D:/src/u/rlenvs/client-rust#gymnasium@0.1.0",
+  "manifest_path": "D:\\src\\u\\rlenvs\\client-rust\\Cargo.toml",
+  "target": {
+    "kind": [ "lib" ],
+    "crate_types": [ "lib" ],
+    "name": "gymnasium",
+    "src_path": "D:\\src\\u\\rlenvs\\client-rust\\src\\lib.rs",
+    "edition": "2021",
+    "doc": true,
+    "doctest": true,
+    "test": true
+  },
+  "profile": {
+    "opt_level": "0",
+    "debuginfo": 2,
+    "debug_assertions": true,
+    "overflow_checks": true,
+    "test": false
+  },
+  "features": [],
+  "filenames": [ "D:\\src\\u\\rlenvs\\client-rust\\target\\debug\\libgymnasium.rlib", "D:\\src\\u\\rlenvs\\client-rust\\target\\debug\\deps\\libgymnasium-dfb398c6697a955e.rmeta" ],
+  "executable": null,
+  "fresh": false
+}
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/TestData/CompilerArtifact5.json b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/TestData/CompilerArtifact5.json
@@ -0,0 +1,26 @@
+{
+  "reason": "compiler-artifact",
+  "package_id": "registry+https://github.com/rust-lang/crates.io-index#futures-util@0.3.30",
+  "manifest_path": "C:\\Users\\parth\\scoop\\persist\\rustup\\.cargo\\registry\\src\\index.crates.io-6f17d22bba15001f\\futures-util-0.3.30\\Cargo.toml",
+  "target": {
+    "kind": [ "lib" ],
+    "crate_types": [ "lib" ],
+    "name": "futures-util",
+    "src_path": "C:\\Users\\parth\\scoop\\persist\\rustup\\.cargo\\registry\\src\\index.crates.io-6f17d22bba15001f\\futures-util-0.3.30\\src\\lib.rs",
+    "edition": "2018",
+    "doc": true,
+    "doctest": true,
+    "test": true
+  },
+  "profile": {
+    "opt_level": "0",
+    "debuginfo": 2,
+    "debug_assertions": true,
+    "overflow_checks": true,
+    "test": false
+  },
+  "features": [ "alloc", "futures-io", "io", "memchr", "slab", "std" ],
+  "filenames": [ "D:\\src\\u\\rlenvs\\client-rust\\target\\debug\\deps\\libfutures_util-98553cccec1b9aaa.rlib", "D:\\src\\u\\rlenvs\\client-rust\\target\\debug\\deps\\libfutures_util-98553cccec1b9aaa.rmeta" ],
+  "executable": null,
+  "fresh": false
+}
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/ToolChainServiceTests.cs b/src/RustAnalyzer.TestAdapter.UnitTests/Cargo/ToolChainServiceTests.cs
@@ -125,7 +125,7 @@ public async Task GetTestSuiteTestsAsync(string workspaceRelRoot, string contain
         var tcPath = targetPath + (PathEx)containerName;
 
         await _tcs.DoBuildAsync(workspacePath, manifestPath, profile);
-        var testSuites = await _tcs.GetTestSuiteInfoAsync(tcPath, profile, default).ToArrayAsync();
+        var testSuites = await (await _tcs.GetTestSuiteInfoAsync(tcPath, profile, default)).ToTaskEnumerableAsync();
         var tc = JsonConvert.DeserializeObject<TestContainer>(await tcPath.ReadAllTextAsync(default));
 
         tc.TestExes.All(e => e.FileExists()).Should().BeTrue();
diff --git a/src/RustAnalyzer.TestAdapter.UnitTests/RustAnalyzer.TestAdapter.UnitTests.csproj b/src/RustAnalyzer.TestAdapter.UnitTests/RustAnalyzer.TestAdapter.UnitTests.csproj
@@ -65,6 +65,12 @@
     <None Include="Cargo\TestData\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Cargo\TestData\CompilerArtifact5.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Cargo\TestData\CompilerArtifact4.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Target Name="CopyTestProjects" AfterTargets="Build">
     <ItemGroup>
diff --git a/src/RustAnalyzer.TestAdapter/BaseTestDiscoverer.cs b/src/RustAnalyzer.TestAdapter/BaseTestDiscoverer.cs
@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using KS.RustAnalyzer.TestAdapter.Common;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
@@ -24,31 +22,4 @@ public void DiscoverTests(PathEx source, IDiscoveryContext discoveryContext, IMe
     }
 
     public abstract void DiscoverTests(IEnumerable<PathEx> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink);
-
-    protected void SignupForAssemblyResolution(ILogger logger)
-    {
-        AppDomain.CurrentDomain.AssemblyResolve +=
-            new ResolveEventHandler(CurrentDomain_AssemblyResolve(logger));
-    }
-
-    protected Func<object, ResolveEventArgs, Assembly> CurrentDomain_AssemblyResolve(ILogger logger)
-    {
-        return (object sender, ResolveEventArgs args) =>
-        {
-            logger.WriteLine(@"This is a sign of impending doom. Have been asked by '{0}' to resolve '{1}'.", args.RequestingAssembly.FullName, args.Name);
-
-            var name = new AssemblyName(args.Name);
-            if (name.Name == "System.Diagnostics.DiagnosticSource")
-            {
-                return typeof(System.Diagnostics.DiagnosticSource).Assembly;
-            }
-            else if (name.Name == "System.Runtime.CompilerServices.Unsafe")
-            {
-                return typeof(System.Runtime.CompilerServices.Unsafe).Assembly;
-            }
-
-            logger.WriteError(@"Unable to resolve resolve assembly '{0}'. Behavior unknow from this point on. Please file a bug at https://github.com/kitamstudios/rust-analyzer.vs.", args.Name);
-            return null;
-        };
-    }
 }
diff --git a/src/RustAnalyzer.TestAdapter/Cargo/BuildJsonOutputParser.cs b/src/RustAnalyzer.TestAdapter/Cargo/BuildJsonOutputParser.cs
@@ -27,9 +27,12 @@ public static class BuildJsonOutputParser
             ["error: internal compiler error"] = Level.Error,
         };
 
-    private static readonly Regex CompilerArtifactMessageCracker =
+    private static readonly Regex CompilerArtifactMessageCracker1 =
         new (@"^(.*) (.*) \((.*)\+(.*)\)$", RegexOptions.Compiled);
 
+    private static readonly Regex CompilerArtifactMessageCracker2 =
+        new (@"^(.*)\+(.*)@(.*)$", RegexOptions.Compiled);
+
     public static BuildMessage[] Parse(PathEx workspaceRoot, string jsonLine, TL tl)
     {
         dynamic obj;
@@ -148,13 +151,18 @@ private static BuildMessage[] ParseCompilerArtifact(dynamic obj)
             return Array.Empty<BuildMessage>();
         }
 
-        var matches = CompilerArtifactMessageCracker.Matches(obj.package_id.Value as string);
-        var path = string.Empty;
-        if (matches[0].Groups[3].Value == "path")
+        var matches = CompilerArtifactMessageCracker1.Matches(obj.package_id.Value as string);
+        if (matches.Count != 0)
+        {
+            return new[] { new StringBuildMessage { Message = $"   Compiling {matches[0].Groups[1].Value} v{matches[0].Groups[2].Value} ({matches[0].Groups[4].Value})" } };
+        }
+
+        matches = CompilerArtifactMessageCracker2.Matches(obj.package_id.Value as string);
+        if (matches.Count != 0)
         {
-            path = $" ({new Uri(matches[0].Groups[4].Value).LocalPath})";
+            return new[] { new StringBuildMessage { Message = $"   Compiling {matches[0].Groups[2].Value} v{matches[0].Groups[3].Value}" } };
         }
 
-        return new[] { new StringBuildMessage { Message = $"   Compiling {matches[0].Groups[1].Value} v{matches[0].Groups[2].Value}{path}" } };
+        throw new InvalidDataException($"Unable to match. Will be shown as is in the output window.");
     }
 }
diff --git a/src/RustAnalyzer.TestAdapter/Cargo/ToolChainService.cs b/src/RustAnalyzer.TestAdapter/Cargo/ToolChainService.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -49,9 +48,6 @@ public ToolChainService([Import] ITelemetryService t, [Import] ILogger l)
 
     public async Task<bool> BuildAsync(BuildTargetInfo bti, BuildOutputSinks bos, CancellationToken ct)
     {
-        var w = await GetWorkspaceAsync(bti.ManifestPath, ct);
-        CleanTestContainers(w.TargetDirectory.MakeProfilePath(bti.Profile));
-
         var success = await ExecuteOperationAsync(
             "build",
             bti.ManifestPath,
@@ -66,8 +62,10 @@ public async Task<bool> BuildAsync(BuildTargetInfo bti, BuildOutputSinks bos, Ca
 
         if (success)
         {
-            var tasks = w.Packages
-                .SelectMany(p => p.GetTestContainers(bti.Profile))
+            var w = await GetWorkspaceAsync(bti.ManifestPath, ct);
+            var testContainers = w.Packages.SelectMany(p => p.GetTestContainers(bti.Profile));
+            w.TargetDirectory.MakeProfilePath(bti.Profile).CleanTestContainers(testContainers.Select(x => x.Container));
+            var tasks = testContainers
                 .Select(x => x.Container.WriteTestContainerAsync(x.Target.Parent.ManifestPath, w.TargetDirectory, bti.AdditionalTestDiscoveryArguments, bti.AdditionalTestExecutionArguments, bti.TestExecutionEnvironment, bti.Profile, Array.Empty<PathEx>(), ct));
             await Task.WhenAll(tasks);
         }
@@ -149,7 +147,7 @@ public async Task<Workspace> GetWorkspaceAsync(PathEx manifestPath, Cancellation
         }
     }
 
-    public async IAsyncEnumerable<TestSuiteInfo> GetTestSuiteInfoAsync(PathEx testContainerPath, string profile, [EnumeratorCancellation] CancellationToken ct)
+    public async Task<IEnumerable<Task<TestSuiteInfo>>> GetTestSuiteInfoAsync(PathEx testContainerPath, string profile, CancellationToken ct)
     {
         var cargoFullPath = GetCargoExePath();
         var tc = await testContainerPath.ReadTestContainerAsync(ct);
@@ -180,6 +178,13 @@ public async IAsyncEnumerable<TestSuiteInfo> GetTestSuiteInfoAsync(PathEx testCo
             var exes = testExeBuildInfos.Select(x => x.exe);
             tc.TestExes = exes.ToArray();
             await testContainerPath.WriteTestContainerAsync(tc.Manifest, tc.TargetDir, tc.AdditionalTestDiscoveryArguments, tc.AdditionalTestExecutionArguments, tc.TestExecutionEnvironment, profile, tc.TestExes, ct);
+
+            if (!tc.TestExes.Any())
+            {
+                _tl.L.WriteError($"GetTestSuiteInfoAsync: Something is not right. No test executables found in '{tc.ThisPath}'.");
+            }
+
+            return tc.TestExes.Select(async exe => await GetTestSuiteInfoFromOneTestExeAsync(tc, exe, ct));
         }
         catch (Exception e)
         {
@@ -191,16 +196,6 @@ public async IAsyncEnumerable<TestSuiteInfo> GetTestSuiteInfoAsync(PathEx testCo
 
             throw;
         }
-
-        if (!tc.TestExes.Any())
-        {
-            _tl.L.WriteError($"GetTestSuiteInfoAsync: Something is not right. No test executables found in '{tc.ThisPath}'.");
-        }
-
-        foreach (var exe in tc.TestExes)
-        {
-            yield return await GetTestSuiteInfoFromOneTestExeAsync(tc, exe, ct);
-        }
     }
 
     private async Task<TestSuiteInfo> GetTestSuiteInfoFromOneTestExeAsync(TestContainer container, PathEx testExePath, CancellationToken ct)
@@ -327,16 +322,6 @@ private static async Task<bool> RunAsync(PathEx cargoFullPath, string arguments,
         }
     }
 
-    private static void CleanTestContainers(PathEx outDir)
-    {
-        if (!outDir.DirectoryExists())
-        {
-            return;
-        }
-
-        Directory.EnumerateFiles(outDir, $"*{Constants.TestsContainerExtension}").ForEach(File.Delete);
-    }
-
     private sealed class BuildOutputRedirector : ProcessOutputRedirector
     {
         private readonly IBuildOutputSink _outputPane;
diff --git a/src/RustAnalyzer.TestAdapter/Cargo/ToolChainServiceExtensions.cs b/src/RustAnalyzer.TestAdapter/Cargo/ToolChainServiceExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -67,5 +68,17 @@ public static Task WriteTestContainerAsync(this PathEx @this, PathEx manifestPat
             ct);
     }
 
+    public static void CleanTestContainers(this PathEx @this, IEnumerable<PathEx> except)
+    {
+        if (!@this.DirectoryExists())
+        {
+            return;
+        }
+
+        Directory.EnumerateFiles(@this, $"*{Constants.TestsContainerExtension}")
+            .Where(f => !except.Any(c => c == (PathEx)f))
+            .ForEach(File.Delete);
+    }
+
     private static PathEx GetRustupPath() => (PathEx)Environment.GetEnvironmentVariable("USERPROFILE") + (PathEx)@".rustup";
 }
diff --git a/src/RustAnalyzer.TestAdapter/Common/IToolChainService.cs b/src/RustAnalyzer.TestAdapter/Common/IToolChainService.cs
@@ -20,7 +20,10 @@ public interface IToolChainService
 
     Task<Workspace> GetWorkspaceAsync(PathEx manifestPath, CancellationToken ct);
 
-    IAsyncEnumerable<TestSuiteInfo> GetTestSuiteInfoAsync(PathEx testContainerPath, string profile, CancellationToken ct);
+    /// <summary>
+    /// NOTE: This is shameful. Cannot pull in IAsyncEnumerable without getting into dependency hell.
+    /// </summary>
+    Task<IEnumerable<Task<TestSuiteInfo>>> GetTestSuiteInfoAsync(PathEx testContainerPath, string profile, CancellationToken ct);
 }
 
 public sealed class TestContainer
diff --git a/src/RustAnalyzer.TestAdapter/Common/TaskExtensions.cs b/src/RustAnalyzer.TestAdapter/Common/TaskExtensions.cs
@@ -1,3 +1,5 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace KS.RustAnalyzer.TestAdapter.Common;
@@ -10,4 +12,15 @@ public static void Forget(this Task @this)
     {
         @this.ConfigureAwait(false);
     }
+
+    public static async Task<IEnumerable<T>> ToTaskEnumerableAsync<T>(this IEnumerable<Task<T>> @this)
+    {
+        var ret = new ConcurrentBag<T>();
+        foreach (var t in @this)
+        {
+            ret.Add(await t);
+        }
+
+        return ret;
+    }
 }
diff --git a/src/RustAnalyzer.TestAdapter/TestDiscoverer.cs b/src/RustAnalyzer.TestAdapter/TestDiscoverer.cs
@@ -23,8 +23,6 @@ public class TestDiscoverer : BaseTestDiscoverer, ITestDiscoverer
     public override void DiscoverTests(IEnumerable<PathEx> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
     {
         var tl = logger.CreateTL();
-        SignupForAssemblyResolution(tl.L);
-
         var tasks = sources
             .GroupBy(s => s)
             .Select(async g => await DiscoverAndReportTestsFromOneSource(await g.Key.ReadTestContainerAsync(default), discoverySink, tl, default));
@@ -39,7 +37,7 @@ private async Task DiscoverAndReportTestsFromOneSource(TestContainer tc, ITestCa
         tl.L.WriteLine("DiscoverAndReportTestsFromOneSource starting with {0}", tc.ThisPath);
         try
         {
-            await foreach (var (_, tcs) in tc.DiscoverTestCasesFromOneSourceAsync(tl, ct))
+            foreach (var (_, tcs) in await tc.DiscoverTestCasesFromOneSourceAsync(tl, ct))
             {
                 tcs.ForEach(discoverySink.SendTestCase);
             }
diff --git a/src/RustAnalyzer.TestAdapter/TestDiscovererCommon.cs b/src/RustAnalyzer.TestAdapter/TestDiscovererCommon.cs
diff --git a/src/RustAnalyzer.TestAdapter/TestExecutor.cs b/src/RustAnalyzer.TestAdapter/TestExecutor.cs
diff --git a/src/TestProjects/integrationtests/integration_tests.rusttests b/src/TestProjects/integrationtests/integration_tests.rusttests
diff --git a/src/TestProjects/integrationtests/integration_tests_2.rusttests b/src/TestProjects/integrationtests/integration_tests_2.rusttests
diff --git a/src/TestProjects/run-integrationtests.ps1 b/src/TestProjects/run-integrationtests.ps1
diff --git a/src/TestProjects/workspace_with_tests/integrationtests.approved.txt b/src/TestProjects/workspace_with_tests/integrationtests.approved.txt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`[0] = {`
`2`		`- "Message": " Compiling pls_core_extras v0.1.0 (D:\\src\\dpt\\pls\\pls_core_extras)"`
	`2`	`+ "Message": " Compiling pls_core_extras v0.1.0 (file:///D:/src/dpt/pls/pls_core_extras)"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`[0] = {`
`2`		`- "Message": " Compiling tera v1.17.1"`
	`2`	`+ "Message": " Compiling tera v1.17.1 (https://github.com/rust-lang/crates.io-index)"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[0] = {`
	`2`	`+ "Message": " Compiling file:///D:/src/u/rlenvs/client-rust#gymnasium v0.1.0"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[0] = {`
	`2`	`+ "Message": " Compiling https://github.com/rust-lang/crates.io-index#futures-util v0.3.30"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public void IfNotParsableReturnAsIs()`
`30`	`30`	`[InlineData("CompilerArtifact1.json")]`
`31`	`31`	`[InlineData("CompilerArtifact2.json")]`
`32`	`32`	`[InlineData("CompilerArtifact3.json")]`
	`33`	`+ [InlineData("CompilerArtifact4.json")]`
	`34`	`+ [InlineData("CompilerArtifact5.json")]`
`33`	`35`	`public void ParseCompilerArtifiacts(string dataFile)`
`34`	`36`	`{`
`35`	`37`	`NamerFactory.AdditionalInformation = $"datafile-{dataFile}";`