Merge pull request #321 from waf/fix-relative-path-files-passed-as-lo…

…ad-scripts Fix CSX loading using relative paths from command line
waf · Nov 17, 2023 · d56d924 · d56d924
2 parents ba21d40 + e073462
commit d56d924
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/CSharpRepl.Services/Roslyn/Scripting/ScriptRunner.cs b/CSharpRepl.Services/Roslyn/Scripting/ScriptRunner.cs
@@ -61,6 +61,7 @@ public ScriptRunner(
         );
         this.scriptOptions = ScriptOptions.Default
             .WithMetadataResolver(metadataResolver)
+            .WithSourceResolver(compilationOptions.SourceReferenceResolver)
             .WithReferences(referenceAssemblyService.LoadedImplementationAssemblies)
             .WithAllowUnsafe(compilationOptions.AllowUnsafe)
             .WithLanguageVersion(LanguageVersion.Preview)

diff --git a/CSharpRepl.Tests/ReadEvalPrintLoopTests.cs b/CSharpRepl.Tests/ReadEvalPrintLoopTests.cs
@@ -119,6 +119,24 @@ await repl.RunAsync(new Configuration(
         Assert.Contains(@"""Hello World""", console.AnsiConsole.Output);
     }
 
+    [Fact]
+    public async Task RunAsync_LoadScriptByFilePath_RunsScript()
+    {
+        prompt
+            .ReadLineAsync()
+            .Returns(
+                new PromptResult(true, "exit", default)
+            );
+
+        await repl.RunAsync(new Configuration(
+            loadScript: "#load \"Data/LoadScript.csx\""
+        ));
+
+        Assert.DoesNotContain("Exception", console.AnsiConsole.Output);
+        Assert.DoesNotContain("CS1504", console.AnsiConsole.Output);
+        Assert.DoesNotContain("Could not find file", console.AnsiConsole.Output);
+    }
+
     [Fact]
     public async Task RunAsync_Reference_AddsReference()
     {