Skip to content
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.

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

Allow collection expressions with CreateCompilation #71134

Merged
merged 3 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ static void Main()
static T F<T>(T t) => t;
}
""";
var comp = CreateCompilation(new[] { source, s_collectionExtensions });
var comp = CreateCompilation([source, s_collectionExtensions]);
comp.VerifyEmitDiagnostics(
// 0.cs(5,9): error CS0411: The type arguments for method 'Program.F<T>(T)' cannot be inferred from the usage. Try specifying the type arguments explicitly.
// F([1, 2]).Report();
Expand Down Expand Up @@ -467,7 +467,7 @@ static void Main()
}
}
""";
var comp = CreateCompilation(new[] { source, s_collectionExtensions });
var comp = CreateCompilation([source, s_collectionExtensions]);
comp.VerifyEmitDiagnostics(
// 0.cs(6,25): error CS9174: Cannot initialize type 'IEnumerable' with a collection expression because the type is not constructible.
// IEnumerable a = [1];
Expand Down Expand Up @@ -503,7 +503,7 @@ static void Main()
}
""";
CompileAndVerify(
new[] { source, s_collectionExtensions },
[source, s_collectionExtensions],
expectedOutput: "(System.Int32[]) [], (System.Collections.Generic.List<System.Int32>) [], (System.Collections.Generic.List<System.Int32>) [], (System.Int32[]) [], (System.Int32[]) [], ");
}

Expand All @@ -530,7 +530,7 @@ static void Main()
}
""";
CompileAndVerify(
new[] { source, s_collectionExtensions },
[source, s_collectionExtensions],
expectedOutput: "(<>z__ReadOnlyArray<System.Int32>) [1], (System.Collections.Generic.List<System.Int32>) [2], (System.Collections.Generic.List<System.Int32>) [3], (<>z__ReadOnlyArray<System.Int32>) [4], (<>z__ReadOnlyArray<System.Int32>) [5], ");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4635,7 +4635,7 @@ class C
var pathMap = ImmutableArray.Create(new KeyValuePair<string, string>(pathPrefix, @"\_/"));

var comp = CreateCompilation(
new[] { (source, path), s_attributesSource },
[(source, path), s_attributesSource],
parseOptions: RegularWithInterceptors,
options: TestOptions.DebugExe.WithSourceReferenceResolver(
new SourceFileResolver(ImmutableArray<string>.Empty, null, pathMap)));
Expand Down
31 changes: 31 additions & 0 deletions src/Compilers/Test/Core/CollectionBuilderAttribute.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if !NET8_0_OR_GREATER
Copy link
Member

@333fred 333fred Dec 15, 2023

Choose a reason for hiding this comment

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

Just to make sure that we don't run afoul of any weird situations (such as razor test dependencies), we should typeforward in an #else: https://github.com/dotnet/roslyn/blob/main/docs/Target%20Framework%20Strategy.md#pattern-for-types #Resolved

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the pointer. That's a useful doc


namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
public sealed class CollectionBuilderAttribute : Attribute
{
public CollectionBuilderAttribute(Type builderType, string methodName)
{
BuilderType = builderType;
MethodName = methodName;
}

public Type BuilderType { get; }
public string MethodName { get; }
}
}

#else

using System.Runtime.CompilerServices;

#pragma warning disable RS0016 // Add public types and members to the declared API (this is a supporting forwarder for an internal polyfill API)
[assembly: TypeForwardedTo(typeof(CollectionBuilderAttribute))]
#pragma warning restore RS0016 // Add public types and members to the declared API

#endif
17 changes: 15 additions & 2 deletions src/Compilers/Test/Utilities/CSharp/CSharpTestSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#nullable disable

using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis.Text;
Expand All @@ -19,7 +19,8 @@ namespace Microsoft.CodeAnalysis.CSharp.Test.Utilities
/// Represents the source code used for a C# test. Allows us to have single helpers that enable all the different ways
/// we typically provide source in testing.
/// </summary>
public readonly struct CSharpTestSource
[System.Runtime.CompilerServices.CollectionBuilder(typeof(CSharpTestSourceBuilder), nameof(CSharpTestSourceBuilder.Create))]
public readonly struct CSharpTestSource : IEnumerable<CSharpTestSource>
{
public static CSharpTestSource None => new CSharpTestSource(null);

Expand Down Expand Up @@ -83,5 +84,17 @@ public SyntaxTree[] GetSyntaxTrees(CSharpParseOptions parseOptions, string sourc
public static implicit operator CSharpTestSource(List<SyntaxTree> source) => new CSharpTestSource(source.ToArray());
public static implicit operator CSharpTestSource(ImmutableArray<SyntaxTree> source) => new CSharpTestSource(source.ToArray());
public static implicit operator CSharpTestSource(CSharpTestSource[] source) => new CSharpTestSource(source);

// Dummy IEnumerable support to satisfy the collection expression and CollectionBuilder requirements
IEnumerator<CSharpTestSource> IEnumerable<CSharpTestSource>.GetEnumerator() => throw new NotImplementedException();
IEnumerator IEnumerable.GetEnumerator() => throw new NotImplementedException();

internal static class CSharpTestSourceBuilder
Copy link
Member

@333fred 333fred Dec 15, 2023

Choose a reason for hiding this comment

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

Why does this need to be a separate type? Why not just make it a static member on this type? #WontFix

Copy link
Member Author

Choose a reason for hiding this comment

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

It does not need to be a separate type, but it is customary for the collection and the collection builder to be different types, and I think it makes sense. See all the collection tests

Copy link
Member

Choose a reason for hiding this comment

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

but it is customary for the collection and the collection builder to be different types

This is a brand new pattern, there's no "customary" at all 😆. I'd just as soon keep it simpler.

Copy link
Member Author

Choose a reason for hiding this comment

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

All our collection builder tests beg to differ. The spec also calls out two different concepts: a "collection type" and a "builder type". It is clearer not to blend them and doesn't seem "simpler".
In any case, this seems a nitpick/preference, not a reason to hold this change up. Thanks

{
public static CSharpTestSource Create(ReadOnlySpan<CSharpTestSource> source)
{
return source.ToArray();
}
}
}
}