Entities passed into queries with [Data] cannot come before a normal Entity parameter

[LilithSilver]

Consider this query:

[Query]
private static void Test([Data] in Entity inEntity, in Entity queryEntity)
{
    // Does not compile!
}

The source-generated code looks like this:

public static void TestQuery(World world, in Arch.Core.Entity @inentity)
{
    if (!ReferenceEquals(_Test_Initialized, world))
    {
        _Test_Query = world.Query(in Test_QueryDescription);
        _Test_Initialized = world;
    }

    foreach (ref var chunk in _Test_Query.GetChunkIterator())
    {
        var chunkSize = chunk.Size;
        ref var entityFirstElement = ref chunk.Entity(0);
        foreach (var entityIndex in chunk)
        {
            ref readonly var inentity = ref Unsafe.Add(ref entityFirstElement, entityIndex); // Incorrectly named variable!
            Test(in @inentity, in @queryentity);
        }
    }
}

Note that the variable that should be called queryentity is actually called inentity, which conflicts with the method signature and produces an error (and queryentity isn't created).

The workaround is to ensure the regular Entity comes before the [Data] entity:

[Query]
private static void Test(in Entity queryEntity, [Data] in Entity inEntity)
{
    // Compiles!
}

But the order should not matter, hence the issue.

Similarly, the following will also fail, since it once again assumes the [Data] parameter is a real query entity:

[Query]
private static void Test([Data] in Entity inEntity)
{
    // Does not compile!
}

[mikhail-dcl]

I stumbled upon the same, and I'd like to propose modifying the AppendQueryMethod accordingly:

// Check for entity param
        var entityParam = methodSymbol.Parameters.FirstOrDefault(symbol => symbol.Type.Name.Equals("Entity") 
                                                                           && symbol.GetAttributes().All(data => !data.AttributeClass.Name.Contains("Data")));

        var entity = entityParam != null;

        var queryData = methodSymbol.GetAttributeData("Query");
        bool isParallel = (bool)(queryData.NamedArguments.FirstOrDefault(d => d.Key == "Parallel").Value.Value ?? false);

        // Get attributes
        var attributeData = methodSymbol.GetAttributeData("All");
        var anyAttributeData = methodSymbol.GetAttributeData("Any");
        var noneAttributeData = methodSymbol.GetAttributeData("None");
        var exclusiveAttributeData = methodSymbol.GetAttributeData("Exclusive");
        
        // Get params / components except those marked with data or entities. 
        var components = methodSymbol.Parameters.ToList();
        components.RemoveAll(symbol => symbol.Type.Name.Equals("Entity"));                                                // Remove entities 
        components.RemoveAll(symbol => symbol.GetAttributes().Any(data => data.AttributeClass.Name.Contains("Data")));    // Remove data annotated params