From 126a8b4474e9c260775a571804725316073a5db0 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Tue, 4 Dec 2012 23:01:44 -0600 Subject: [PATCH] Add option sp_after_oc_property --- src/options.cpp | 2 ++ src/options.h | 1 + src/space.cpp | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/src/options.cpp b/src/options.cpp index cf71f4e66d..d81e017329 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -482,6 +482,8 @@ void register_options(void) unc_add_option("sp_after_oc_msg_receiver", UO_sp_after_oc_msg_receiver, AT_IARF, "Add or remove space between the receiver and selector in a message.\n" "'[receiver selector ...]'"); + unc_add_option("sp_after_oc_property", UO_sp_after_oc_property, AT_IARF, + "Add or remove space after @property."); unc_add_option("sp_cond_colon", UO_sp_cond_colon, AT_IARF, "Add or remove space around the ':' in 'b ? t : f'"); diff --git a/src/options.h b/src/options.h index b8e6438f73..5db5d4aa3a 100644 --- a/src/options.h +++ b/src/options.h @@ -342,6 +342,7 @@ enum uncrustify_options UO_sp_before_oc_block_caret, UO_sp_after_oc_block_caret, UO_sp_after_oc_msg_receiver, + UO_sp_after_oc_property, UO_sp_cond_colon, UO_sp_cond_question, UO_sp_case_label, diff --git a/src/space.cpp b/src/space.cpp index 678c69dd7e..4de07685bb 100644 --- a/src/space.cpp +++ b/src/space.cpp @@ -1445,6 +1445,12 @@ static argval_t do_space(chunk_t *first, chunk_t *second, int& min_sp, bool comp return(cpd.settings[UO_sp_annotation_paren].a); } + if (first->type == CT_OC_PROPERTY) + { + log_rule("sp_after_oc_property"); + return(cpd.settings[UO_sp_after_oc_property].a); + } + for (idx = 0; idx < (int)ARRAY_SIZE(no_space_table); idx++) { if (((no_space_table[idx].first == CT_UNKNOWN) ||