Skip to content

Ordering of property declaration attributes (ObjC)#765

Merged
gmaurel merged 6 commits intouncrustify:masterfrom
Krizai:oc_property_ordering
Oct 3, 2016
Merged

Ordering of property declaration attributes (ObjC)#765
gmaurel merged 6 commits intouncrustify:masterfrom
Krizai:oc_property_ordering

Conversation

@Krizai
Copy link
Copy Markdown
Contributor

@Krizai Krizai commented Sep 23, 2016

Based on existing pull request ( #217 )
I've extracted the topic related stuff from it and added support for a few new attributes.

@mihaipopescu
Copy link
Copy Markdown
Collaborator

Nicely done! Still, in order to prove your changes are working the way you want they have to be covered by tests. Can you add some ?

@gmaurel
Copy link
Copy Markdown
Collaborator

gmaurel commented Sep 23, 2016

We really need somebody who handled the very numerous issues with ObjC.
Could you have a look on these?

@Krizai
Copy link
Copy Markdown
Contributor Author

Krizai commented Sep 23, 2016

A few fixes + test added

@Krizai
Copy link
Copy Markdown
Contributor Author

Krizai commented Sep 23, 2016

As for the issues - I don't promise anything, but will try to check.

@Krizai
Copy link
Copy Markdown
Contributor Author

Krizai commented Oct 2, 2016

Is it possible to merge this or do you want any more changes ?

@gmaurel gmaurel merged commit aa4c368 into uncrustify:master Oct 3, 2016
std::vector<ChunkGroup> ref_chunks; // retain, copy, assign, weak, strong, unsafe_unretained
std::vector<ChunkGroup> getter_chunks; // getter
std::vector<ChunkGroup> setter_chunks; // setter
std::vector<ChunkGroup> nullability_chunks; // nonnull/nullable
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing null_resettable

chunk_t *open_paren = NULL;
chunk_t *close_paren = NULL;

std::vector<ChunkGroup> thread_chunks; // atomic/nonatomic
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This group is also missing class property support

@Krizai
Copy link
Copy Markdown
Contributor Author

Krizai commented Nov 29, 2016

@daniel-beard Thank you! Will add.

@cheeseonhead
Copy link
Copy Markdown

cheeseonhead commented Jan 12, 2017

When used together with sp_after_comma=force there will be two spaces after the commas. I'm guessing you're adding the commas there by yourself, and I don't think that's required.

@property (nonatomic,  strong,  readonly) NSString * currentString;
@property (nonatomic,  assign) BOOL shouldNotifyDelegateOfHeightUpdate;

@daniel-beard
Copy link
Copy Markdown
Contributor

@Krizai null_unspecified is also a valid nullable annotation.

@Krizai Krizai mentioned this pull request May 5, 2017
@Krizai
Copy link
Copy Markdown
Contributor Author

Krizai commented May 8, 2017

@daniel-beard @cheeseonhead Please check the update

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants