Code rafactoring. Use curly braces only for multi-line constructs

[skoshelev]

Related of changes on .editorconfig file

[KaranChadha10]

I've created a PR (#7664) to address this issue. Please review when possible. Thanks!