Skip to content

Allow empty file-level directive values #51078

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

Open
wants to merge 1 commit into
base: release/10.0.1xx
Choose a base branch
from
+54 −2
Open

Allow empty file-level directive values #51078

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
12 changes: 10 additions & 2 deletions src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,12 +1738,20 @@ private static (string, string?)? ParseOptionalTwoParts(in ParseContext context,
return context.Diagnostics.AddError<(string, string?)?>(context.SourceFile, context.Info.Span, string.Format(CliCommandStrings.InvalidDirectiveName, directiveKind, separator));
}

var secondPart = i < 0 ? [] : context.DirectiveText.AsSpan((i + 1)..).TrimStart();
if (i < 0 || secondPart.IsWhiteSpace())
if (i < 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: if I reviewed the original implementation of this method today, I would say to rename this to separatorIndex. As this isn't a loop variable, and its scope is quite broad, encountering this as the first line of the "Files changed", feels a bit opaque :)

{
return (firstPart.ToString(), null);
}

var secondPart = context.DirectiveText.AsSpan((i + 1)..).TrimStart();
if (secondPart.IsWhiteSpace())
{
Debug.Assert(secondPart.Length == 0,
"We have trimmed the second part, so if it's white space, it should be actually empty.");

return (firstPart.ToString(), string.Empty);
}

return (firstPart.ToString(), secondPart.ToString());
}

Expand Down
44 changes: 44 additions & 0 deletions test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,50 @@ public void Directives_EmptyName(
expectedWildcardPattern: RunFileTests.DirectiveError("/app/Program.cs", 1, CliCommandStrings.MissingDirectiveName, directive));
}

[Theory]
[InlineData("")]
[InlineData(" ")]
public void Directives_EmptyValue(string value)
{
VerifyConversion(
inputCSharp: $"""
#:property TargetFramework={value}
#:property Prop1={value}
#:sdk First@{value}
#:sdk Second@{value}
#:package P1@{value}
""",
expectedProject: """
<Project Sdk="First/">

<Sdk Name="Second" Version="" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishAot>true</PublishAot>
<PackAsTool>true</PackAsTool>
<TargetFramework></TargetFramework>
<Prop1></Prop1>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="P1" Version="" />
</ItemGroup>

</Project>

""",
expectedCSharp: "");

VerifyConversionThrows(
inputCSharp: $"""
#:project{value}
""",
expectedWildcardPattern: RunFileTests.DirectiveError("/app/Program.cs", 1, CliCommandStrings.MissingDirectiveName, "project"));
}

[Fact]
public void Directives_MissingPropertyValue()
{
Expand Down
Loading