feat: Improve formatting of lambda expressions #1066

Rudomitori · 2023-12-10T09:18:17Z

Rudomitori · 2023-12-10T09:19:08Z

Examples from #672

#672 (comment)

Source

Formatted

builder.Entity<IdentityUserToken<string>>(b =>
{
    b.HasKey(
        l =>
            new
            {
                l.UserId,
                l.LoginProvider,
                l.Name
            }
    );
    b.ToTable("AspNetUserTokens");
});

table.PrimaryKey(
    "PK_AspNetUserTokens",
    x =>
        new
        {
            x.UserId,
            x.LoginProvider,
            x.Name
        }
);

builder.Entity<IdentityUserToken<string>>(b =>
{
    b.HasKey(l => new
    {
        l.UserId,
        l.LoginProvider,
        l.Name
    });
    b.ToTable("AspNetUserTokens");
});

table.PrimaryKey(
    "PK_AspNetUserTokens",
    x => new
    {
        x.UserId,
        x.LoginProvider,
        x.Name
    }
);

#672 (comment)

Source

Formatted

builder.Entity<EntityWithThreeProperties>(e =>
{
    e.HasIndex(
        t =>
            new
            {
                t.X,
                t.Y,
                t.Z
            },
        "IX_unspecified"
    );
    e.HasIndex(
            t =>
                new
                {
                    t.X,
                    t.Y,
                    t.Z
                },
            "IX_empty"
        )
        .IsDescending();
    e.HasIndex(
            t =>
                new
                {
                    t.X,
                    t.Y,
                    t.Z
                },
            "IX_all_ascending"
        )
        .IsDescending(false, false, false);
    e.HasIndex(
            t =>
                new
                {
                    t.X,
                    t.Y,
                    t.Z
                },
            "IX_all_descending"
        )
        .IsDescending(true, true, true);
    e.HasIndex(
            t =>
                new
                {
                    t.X,
                    t.Y,
                    t.Z
                },
            "IX_mixed"
        )
        .IsDescending(false, true, false);
});

builder.Entity<EntityWithThreeProperties>(e =>
{
    e.HasIndex(
        t => new
        {
            t.X,
            t.Y,
            t.Z
        },
        "IX_unspecified"
    );
    e.HasIndex(
            t => new
            {
                t.X,
                t.Y,
                t.Z
            },
            "IX_empty"
        )
        .IsDescending();
    e.HasIndex(
            t => new
            {
                t.X,
                t.Y,
                t.Z
            },
            "IX_all_ascending"
        )
        .IsDescending(false, false, false);
    e.HasIndex(
            t => new
            {
                t.X,
                t.Y,
                t.Z
            },
            "IX_all_descending"
        )
        .IsDescending(true, true, true);
    e.HasIndex(
            t => new
            {
                t.X,
                t.Y,
                t.Z
            },
            "IX_mixed"
        )
        .IsDescending(false, true, false);
});

#672 (comment)

I think, it can be better

Source

Formatted

class ClassName
{
    void MethodName()
    {
        var searchRequest = new SearchDescriptor<ElasticsearchProduct>().WithAggregations(
            o =>
                o.WithFilter(
                    key,
                    f =>
                        f.WithFilter(fd => filter)
                            .WithAggregations(
                                ad =>
                                    ad.WithTerm(
                                        key,
                                        cd =>
                                            cd.WithField(facetField).WithSize(MaximumCategoryFacets)
                                    )
                            )
                )
        );
    }
}

class ClassName
{
    void MethodName()
    {
        var searchRequest = new SearchDescriptor<ElasticsearchProduct>().WithAggregations(o =>
            o.WithFilter(
                key,
                f =>
                    f.WithFilter(fd => filter)
                        .WithAggregations(ad =>
                            ad.WithTerm(
                                key,
                                cd => cd.WithField(facetField).WithSize(MaximumCategoryFacets)
                            )
                        )
            )
        );
    }
}

Rudomitori · 2023-12-10T09:19:41Z

Example from #766

Source

Formatted

var affectedRows = await _dbContext.SomeEntities
    .Where(x => x.id == command.EntityId)
    .Where(authFilter)
    .ExecuteUpdateAsync(
        x => 
            x.SetProperty(x => x.Name, x => command.NewName)
                .SetProperty(x => x.Title, x => command.NewTItle)
                .SetProperty(x => x.Count, x => x.Command.NewCount)
    );

var affectedRows = await _dbContext
    .SomeEntities
    .Where(x => x.id == command.EntityId)
    .Where(authFilter)
    .ExecuteUpdateAsync(x =>
        x.SetProperty(x => x.Name, x => command.NewName)
            .SetProperty(x => x.Title, x => command.NewTItle)
            .SetProperty(x => x.Count, x => x.Command.NewCount)
    );

Rudomitori · 2023-12-10T09:20:06Z

Examples from #836

#836 (comment)

Source

Formatted

table.Where(
    t =>
        t.SomeLongColumn == Guid.Parse("a112c293-5a3a-ed11-9db1-000d3a24f3d4")
        || t.OtherLongColumn == Guid.Parse("a112c293-5a3a-ed11-9db1-000d3a24f3d4")
);

table.Where(t =>
    t.SomeLongColumn == Guid.Parse("a112c293-5a3a-ed11-9db1-000d3a24f3d4")
    || t.OtherLongColumn == Guid.Parse("a112c293-5a3a-ed11-9db1-000d3a24f3d4")
);

#836 (comment)

Source

Formatted

await client
    .For<Country>()
    .Key(id)
    .Select(
        c =>
            new
            {
              c.Mim_CountryId,
              c.Mim_Name,
              c.Mim_Code
            }
    )
    .FindEntryAsync();

await client
    .For<Country>()
    .Key(id)
    .Select(c => new
    {
        c.Mim_CountryId,
        c.Mim_Name,
        c.Mim_Code
    })
    .FindEntryAsync();

Rudomitori · 2023-12-10T09:20:36Z

Example from #451

Source

Formatted

var y = someList.Where(
    o =>
        someLongValue_______________________
        && theseShouldNotIndent_________________
        && theseShouldNotIndent_________________
            > butThisOneShould_________________________________________
);

var y = someList.Where(o =>
    someLongValue_______________________
    && theseShouldNotIndent_________________
    && theseShouldNotIndent_________________
        > butThisOneShould_________________________________________
);

shocklateboy92

Thanks for the PR. The code looks mostly good, but I do have a minor reservation about the new formatting.

Please let me know what you think about the case I commented on.

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChain_PropertiesConsistent.test

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/VariableDeclarations.test

jods4 · 2023-12-13T22:40:06Z

@Rudomitori Thank you! 🧡
This is a great improvement for code that has lots of lambdas.
I'm looking forward to the next release!

jods4 · 2023-12-17T12:16:25Z

What happened to this? I don't see the merge commit on main anymore, did you force push a revert?

Rudomitori · 2023-12-17T12:42:30Z

@belav, is there something wrong with this PR? I have free time these days, and can try to fix it, or at least discuss it

belav · 2023-12-17T17:15:13Z

@belav, is there something wrong with this PR? I have free time these days, and can try to fix it, or at least discuss it

Not at all, sorry I should have said something here and not just on discord. I pulled it out of main a couple of times now to release a 0.26.X version, I am trying to stick to only bug fix types changes until 0.27.0

I'll have it back in main shortly.

# Conflicts: # Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test

belav · 2023-12-17T17:30:25Z

@Rudomitori I also ran this change against a repo full of test code, and it looks there is one bug it introduces, otherwise I agree that this is a great improvement!

private static readonly ModelBinderProviderCollection _providers =
    CreateDefaultCollection();

// formats as
private static readonly ModelBinderProviderCollection _providers = CreateDefaultCollection(

);

From https://github.com/belav/csharpier-repos/pull/96/files, there appear to be a few variations of this extra blank line, but they are probably all the same issue.

Rudomitori · 2023-12-18T10:50:08Z

I've created an issue for the bugs introduced by this PR

* fix: Bug with empty argument list * fix: Incorrect formatting of lambdas with nested lambdas Group id used in ArgumentListLikeSyntax was not unique and the nested lambda overrode the state of the parent lambda * style: Use switch expression instead of statement * fix: Second bug in 1077 Closes #1077

feat: Improve formatting of lambda expressions

717dfc9

#766 #836 #672

Merge branch 'main' into feature/lambda_breaks

a9373e8

shocklateboy92 approved these changes Dec 11, 2023

View reviewed changes

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChain_PropertiesConsistent.test Show resolved Hide resolved

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/VariableDeclarations.test Show resolved Hide resolved

Merge branch 'main' into feature/lambda_breaks

26010e6

shocklateboy92 enabled auto-merge (squash) December 12, 2023 22:26

shocklateboy92 merged commit 433ceee into belav:main Dec 12, 2023
3 checks passed

belav pushed a commit that referenced this pull request Dec 14, 2023

feat: Improve formatting of lambda expressions (#1066)

5a937a7

belav pushed a commit that referenced this pull request Dec 16, 2023

feat: Improve formatting of lambda expressions (#1066)

a7d151d

belav pushed a commit that referenced this pull request Dec 17, 2023

feat: Improve formatting of lambda expressions (#1066)

76c2f73

# Conflicts: # Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test

Rudomitori mentioned this pull request Dec 18, 2023

Bugs caused by new formatting of lambda expressions #1077

Closed

belav added this to the 0.27.0 milestone Jan 17, 2024

Rudomitori mentioned this pull request Jan 24, 2024

Incorrect formatting for simple lambda expression with comment #1147

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Improve formatting of lambda expressions #1066

feat: Improve formatting of lambda expressions #1066

Rudomitori commented Dec 10, 2023

Rudomitori commented Dec 10, 2023

Rudomitori commented Dec 10, 2023

Rudomitori commented Dec 10, 2023

Rudomitori commented Dec 10, 2023

shocklateboy92 left a comment

jods4 commented Dec 13, 2023

jods4 commented Dec 17, 2023

Rudomitori commented Dec 17, 2023

belav commented Dec 17, 2023

belav commented Dec 17, 2023

Rudomitori commented Dec 18, 2023

feat: Improve formatting of lambda expressions #1066

feat: Improve formatting of lambda expressions #1066

Conversation

Rudomitori commented Dec 10, 2023

Rudomitori commented Dec 10, 2023

Examples from #672

#672 (comment)

#672 (comment)

#672 (comment)

Rudomitori commented Dec 10, 2023

Example from #766

Rudomitori commented Dec 10, 2023

Examples from #836

#836 (comment)

#836 (comment)

Rudomitori commented Dec 10, 2023

Example from #451

shocklateboy92 left a comment

Choose a reason for hiding this comment

jods4 commented Dec 13, 2023

jods4 commented Dec 17, 2023

Rudomitori commented Dec 17, 2023

belav commented Dec 17, 2023

belav commented Dec 17, 2023

Rudomitori commented Dec 18, 2023