Skip to content

Fix greedy parsing of load directive part #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seesharper merged 1 commit into from
May 27, 2023
Merged

Fix greedy parsing of load directive part #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptFilesResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>())
{
Expand Down
10 changes: 7 additions & 3 deletions src/Dotnet.Script.Tests/ScriptFilesResolverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down