Skip to content

Fix/argument scoped modifiers #7

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
ruby3141 merged 2 commits into from
Feb 27, 2024
Merged

Fix/argument scoped modifiers #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18797df
fix Generator to properly handle argument modifiers with whitespaces
ruby3141 Feb 27, 2024
11a1969
make Generator to properly handle C#12 `scoped` argument modifier
ruby3141 Feb 27, 2024
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
5 changes: 3 additions & 2 deletions Devris.LibDevris.MethodSinter.Generator/SinteredMethodGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
Parameters = ((MethodDeclarationSyntax)gac.TargetNode).ParameterList.Parameters
.Select(p => new SinteredMethodData.MethodData.ParameterData
{
Modifier = p.Modifiers.ToString(),
Modifier = string.Join(" ", p.Modifiers),
Type = p.Type.ToString(),
ParameterName = p.Identifier.Text
}).ToImmutableArray(),
Expand Down Expand Up @@ -72,7 +72,8 @@ private void GenerateSintered(SourceProductionContext context, SinteredMethodDat
.Select(p => p.Modifier switch
{
"params" or "" => p.ParameterName,
"ref readonly" => $"in {p.ParameterName}",
"scoped ref" => $"ref {p.ParameterName}",
"scoped ref readonly" or "scoped in" or "ref readonly" => $"in {p.ParameterName}",
var mod => $"{mod} {p.ParameterName}"
});

Expand Down
4 changes: 2 additions & 2 deletions Devris.LibDevris.MethodSinter.Tests/FileScopedNamespaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void ComplexArgumentTest()
}

[SinteredMethod(nameof(ComplexArgumentTest))]
private partial void Test2_SinteredMethod(ref readonly TestStruct testStruct, [DisallowNull] StringBuilder? stringBuilder, params string[] strings);
private partial void Test2_SinteredMethod(scoped ref readonly TestStruct testStruct, [DisallowNull] StringBuilder? stringBuilder, params string[] strings);

[MethodFragment(nameof(ComplexArgumentTest))]
private void Test2_SetTestStruct(ref readonly TestStruct testStruct, StringBuilder? stringBuilder, IEnumerable<string> strings)
Expand All @@ -77,7 +77,7 @@ private void Test2_SetTestStruct(ref readonly TestStruct testStruct, StringBuild
}

[MethodFragment(nameof(ComplexArgumentTest))]
private void Test2_SetStringBuilderValue(ref readonly TestStruct testStruct, [DisallowNull] StringBuilder? stringBuilder, params string[] strings)
private void Test2_SetStringBuilderValue(scoped in TestStruct testStruct, [DisallowNull] StringBuilder? stringBuilder, params string[] strings)
{
stringBuilderValue = stringBuilder.ToString();
}
Expand Down