languages: Fix indentation for if/else statements in C/C++ without braces

[errmayank]

Closes #41179

Release Notes:

• Fixed indentation for if/else statements in C/C++ without braces

[teowelton]

Hey!

I was also working on this today, but forgot to comment on the issue, so no worries at all. I would just like to point out that this applies to C++ as well (as the original example showed).

Also, feel free to let me know if there was an error in what I was doing, but I ended up solving this by just modifying this:

zed/crates/languages/src/cpp/config.toml

Line 7 in aa61f25

{ pattern = "^\\s*else\\s*$", valid_after = ["if"] }

To be:

{ pattern = "^\\s*else\\b", valid_after = ["if"] }

(for both C & C++), thus not needing to modify indents.scm at all, and passing all tests.

Thoughts?

[errmayank]

Hey @teowelton, I tested your way and it works great, thanks!

I've also updated this PR as it requires minimal changes that way.

I would just like to point out that this applies to C++ as well (as the original example showed).

Yeah, I was hoping to create a separate PR for C++ but maybe you can do that?

[teowelton]

Yeah, I was hoping to create a separate PR for C++ but maybe you can do that?

I think that in this case having both in the same PR is much cleaner, since they fall under the same issue. The solution is the same too, simply modifying the config.toml file for C++ instead of C:

zed/crates/languages/src/cpp/config.toml

Line 7 in d887e20

{ pattern = "^\\s*else\\s*$", valid_after = ["if"] }

[errmayank]

@teowelton makes sense