Skip to content

Objective-C boxed array @[] and @catch formatting#1638

Merged
gmaurel merged 29 commits intouncrustify:masterfrom
nivekkagicom:boxed_and_catch
Feb 26, 2018
Merged

Objective-C boxed array @[] and @catch formatting#1638
gmaurel merged 29 commits intouncrustify:masterfrom
nivekkagicom:boxed_and_catch

Conversation

@nivekkagicom
Copy link
Copy Markdown
Contributor

add sp_inside_square_oc_array for formatting boxed array "@[ @3 ]" vs "@[@3]"
add sp_oc_catch_paren like sp_catch_paren except for Objective-C "@catch"
add sp_oc_catch_brace like sp_catch_brace except for Objective-C "@catch"
add sp_oc_brace_catch like sp_brace_catch except for Objective-C "@catch"
add nl_oc_catch_brace like nl_catch_brace except for Objective-C "@catch"
add nl_oc_brace_catch like nl_brace_catch except for Objective-C "@catch"

* 'master' of https://github.com/uncrustify/uncrustify:
  fix problem that caused newlines between function prototypes: return type was not marked with ‘FUNC_PROTO’ parent type
  Some littles changes after the comment
  Add a cli test for that
  Adopt UT test 10051 Thanks to Kalyana Chakravarthi
  Test data: using the option -L A will show the first line is cut
  not "FATAL" as error but "WARNING"
  The logger has not enough memory to store a long message, which will be unproperly cut. An fatal error message will be produced.
* 'master' of https://github.com/uncrustify/uncrustify:
  Adopt UT test 10056 Thanks to satish puppala
  Adopt UT test 10066 Thanks to satish puppala
  Adopt UT test 10076 Thanks to satish puppala
…atch_brace, sp_oc_brace_catch, nl_oc_catch_brace and nl_oc_brace_catch
@gmaurel
Copy link
Copy Markdown
Collaborator

gmaurel commented Feb 26, 2018

Fine. Thanks for it.

@gmaurel gmaurel merged commit c415c84 into uncrustify:master Feb 26, 2018
@nivekkagicom nivekkagicom deleted the boxed_and_catch branch July 21, 2018 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants