The proposal uncrustify#477 is implemented.

It would be really nice to have a feature similar to nl_fdef_brace and nl_if_brace... [dataArray enumerateObjectsUsingBlock:^(dataType *data, NSUInteger idx, BOOL *stop) { // Do stuff! }]; ...to place the opening curly bracket with or without newline. The new option is: nl_oc_block_brace
bengardner · May 26, 2016 · 14ae8a5 · 14ae8a5
1 parent a094c39
commit 14ae8a5
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -4,13 +4,15 @@ Change highlights in uncrustify-0.xx (xxx 2016)
 New:
 
 New options:
+ - nl_oc_block_brace
  - nl_split_if_one_liner
  - nl_split_for_one_liner
  - nl_split_while_one_liner
  - nl_after_func_class_proto
  - nl_after_func_class_proto_group
 
 Bugfix:
+ - Proposal #477 is implemented
  - Issue #405 is fixed
  - Proposal #409 is implemented
  - Issue #481 is fixed

diff --git a/src/newlines.cpp b/src/newlines.cpp
@@ -2332,8 +2332,13 @@ void newlines_cleanup_braces(bool first)
 
          if ((pc->parent_type == CT_CLASS) && (pc->level == pc->brace_level))
          {
-            newlines_do_else(chunk_get_prev_nnl(pc),
-                             cpd.settings[UO_nl_class_brace].a);
+            newlines_do_else(chunk_get_prev_nnl(pc), cpd.settings[UO_nl_class_brace].a);
+         }
+
+         if (pc->parent_type == CT_OC_BLOCK_EXPR)
+         {
+            // issue # 477
+            newline_iarf_pair(chunk_get_prev(pc), pc, cpd.settings[UO_nl_oc_block_brace].a);
          }
 
          next = chunk_get_next_nnl(pc);
@@ -2439,7 +2444,7 @@ void newlines_cleanup_braces(bool first)
          {
             if ((pc->flags & PCF_ONE_LINER) == 0)
             {
-               /* Make sure the } is preceded by two newlines */
+               /* Make sure the brace is preceded by two newlines */
                prev = chunk_get_prev(pc);
                if (!chunk_is_newline(prev))
                {

diff --git a/src/options.cpp b/src/options.cpp
@@ -754,6 +754,8 @@ void register_options(void)
                   "Don't split one-line while statements - 'while(a) b++;'");
    unc_add_option("nl_oc_msg_leave_one_liner", UO_nl_oc_msg_leave_one_liner, AT_BOOL,
                   "Don't split one-line OC messages");
+   unc_add_option("nl_oc_block_brace", UO_nl_oc_block_brace, AT_IARF,
+                  "Add or remove newline between Objective-C block signature and '{'");
 
    unc_add_option("nl_start_of_file", UO_nl_start_of_file, AT_IARF,
                   "Add or remove newlines at the start of the file");

diff --git a/src/options.h b/src/options.h
@@ -628,6 +628,7 @@ enum uncrustify_options
    UO_nl_oc_msg_args,                 // Whether to put each OC message parameter on a separate line
                                       // See nl_oc_msg_leave_one_liner
    UO_nl_oc_msg_leave_one_liner,      // Don't split one-line OC messages
+   UO_nl_oc_block_brace,              // Add or remove newline between Objective-C block signature and '{'
 
    UO_pos_arith,                      // position of trailing/leading arithmetic ops
    UO_pos_assign,                     // position of trailing/leading =

diff --git a/tests/config/bug_i_477.cfg b/tests/config/bug_i_477.cfg
@@ -0,0 +1 @@
+nl_oc_block_brace = force
diff --git a/tests/input/oc/bug_i_477.m b/tests/input/oc/bug_i_477.m
@@ -0,0 +1,3 @@
+    [dataArray enumerateObjectsUsingBlock:^(dataType *data, NSUInteger idx, BOOL *stop) {
+         // Do stuff!
+     }];
diff --git a/tests/objective-c.test b/tests/objective-c.test
@@ -85,3 +85,5 @@
 
 50510  gh293.a.cfg                                  oc/gh293.m
 50511  gh293.b.cfg                                  oc/gh293.m
+
+50600  bug_i_477.cfg                                oc/bug_i_477.m
diff --git a/tests/output/oc/50600-bug_i_477.m b/tests/output/oc/50600-bug_i_477.m
@@ -0,0 +1,4 @@
+[dataArray enumerateObjectsUsingBlock:^(dataType *data, NSUInteger idx, BOOL *stop)
+ {
+         // Do stuff!
+ }];