Use block_brace_style instead of brace_style

The latter may be interpreted as applicable to any kind of braces

GitOrigin-RevId: 94860a07937eb661fa6e111b90cb8cbf59431048

java/java-tests/testData/codeStyle/jsonExport.json

@@ -45,8 +45,8 @@
       "blank_lines_before_imports": 1,
       "blank_lines_before_method_body": 0,
       "blank_lines_before_package": 0,
+      "block_brace_style": "end_of_line",
       "block_comment_at_first_column": true,
-      "brace_style": "end_of_line",
       "call_parameters_new_line_after_left_paren": false,
       "call_parameters_right_paren_on_new_line": false,
       "call_parameters_wrap": "on_every_item",

java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java

@@ -106,7 +106,7 @@ public class JavaCodeStyleSettingsTest extends CodeStyleTestCase {
       LanguageCodeStyleSettingsProvider.forLanguage(JavaLanguage.INSTANCE).getPropertyMapper(settings);
     setSimple(mapper, "align_group_field_declarations", "true");
     setSimple(mapper, "blank_lines_after_class_header", "1");
-    setSimple(mapper, "brace_style", "next_line");
+    setSimple(mapper, "block_brace_style", "next_line");
     setSimple(mapper, "indent_size", "2");
     setSimple(mapper, "doc_align_param_comments", "true");
     setList(mapper, "imports_layout",

platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java

@@ -334,6 +334,7 @@ public class CommonCodeStyleSettings {
   @Retention(RetentionPolicy.RUNTIME)
   public @interface BraceStyleConstant {}
 
+  @Property(externalName = "block_brace_style")
   @BraceStyleConstant public int BRACE_STYLE = END_OF_LINE;
   @BraceStyleConstant public int CLASS_BRACE_STYLE = END_OF_LINE;
   @BraceStyleConstant public int METHOD_BRACE_STYLE = END_OF_LINE;