Merge pull request #724 from atifaziz/fix/bug-720

seesharper · web-flow · commit 703d0fab36ef · 2023-05-27T18:42:58.000+02:00
Fix greedy parsing of load directive part
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptFilesResolver.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptFilesResolver.cs
@@ -61,7 +61,7 @@ private void Process(string csxFile, HashSet<string> result)
 
         private static string[] GetLoadDirectives(string content)
         {
-            var matches = Regex.Matches(content, @"^\s*#load\s*""\s*(.+)\s*""", RegexOptions.Multiline);
+            var matches = Regex.Matches(content, @"^\s*#load\s*""\s*(.+?)\s*""", RegexOptions.Multiline);
             List<string> result = new List<string>();
             foreach (var match in matches.Cast<Match>())
             {
diff --git a/src/Dotnet.Script.Tests/ScriptFilesResolverTests.cs b/src/Dotnet.Script.Tests/ScriptFilesResolverTests.cs
@@ -21,11 +21,15 @@ public void ShouldOnlyResolveRootScript()
             Assert.Contains(files, f => f.Contains("Foo.csx"));
             Assert.Contains(files, f => !f.Contains("Bar.csx"));
         }
-        [Fact]
-        public void ShouldResolveLoadedScriptInRootFolder()
+
+        [Theory]
+        [InlineData("#load \"Bar.csx\"")]
+        // See: https://github.com/dotnet-script/dotnet-script/issues/720 (1)
+        [InlineData("#load \"Bar.csx\"\n\n\"Hello world\".Dump();")]
+        public void ShouldResolveLoadedScriptInRootFolder(string rootScriptContent)
         {
             using var rootFolder = new DisposableFolder();
-            var rootScript = WriteScript("#load \"Bar.csx\"", rootFolder.Path, "Foo.csx");
+            var rootScript = WriteScript(rootScriptContent, rootFolder.Path, "Foo.csx");
             WriteScript(string.Empty, rootFolder.Path, "Bar.csx");
             var scriptFilesResolver = new ScriptFilesResolver();
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private void Process(string csxFile, HashSet<string> result)`
`61`	`61`
`62`	`62`	`private static string[] GetLoadDirectives(string content)`
`63`	`63`	`{`
`64`		`- var matches = Regex.Matches(content, @"^\s#load\s""\s(.+)\s""", RegexOptions.Multiline);`
	`64`	`+ var matches = Regex.Matches(content, @"^\s#load\s""\s(.+?)\s""", RegexOptions.Multiline);`
`65`	`65`	`List<string> result = new List<string>();`
`66`	`66`	`foreach (var match in matches.Cast<Match>())`
`67`	`67`	`{`