Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Swiftlint rules in color templates #32

Merged
merged 18 commits into from
Apr 5, 2017
Merged

Swiftlint rules in color templates #32

merged 18 commits into from
Apr 5, 2017

Conversation

evil159
Copy link
Contributor

@evil159 evil159 commented Apr 4, 2017

There was inconsistency in swiftlint rules: file_length, and line_length were disabled but not enabled back(probably not a big deal, just a minor thing).
Another thing was that vertical alignment of variables inside Color extension initialiser caused swiftlint to emit a warning based on operator_usage_whitespace rule, fixed it by disabling this rule for the Color extension.

@djbe
Copy link
Member

djbe commented Apr 4, 2017

Hi,

Thank you for the contribution!

A quick tip for those failing tests: you can run them locally using either the xcode project (use the CMD + U shortcut), or in terminal using rake xcode:test.
Also, please add a changelog entry, using the same formatting as the other entries.

@evil159
Copy link
Contributor Author

evil159 commented Apr 4, 2017

Thanks for the tip 👍🏻

CHANGELOG.md Outdated
@@ -6,7 +6,7 @@

### Bug Fixes

_None_
* Fixed `swiftlint` warnings in generated color extensions
Copy link
Member

Choose a reason for hiding this comment

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

Please use the same format as the other entries:

  • credit yourself
  • add a link to this PR
  • a . at the end of the sentence and 2 spaces

Copy link
Member

@djbe djbe left a comment

Choose a reason for hiding this comment

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

Please fix the changelog entry format. Other than that, this LGTM.

@djbe djbe added this to the SwiftGen 4.2.1 milestone Apr 4, 2017
CHANGELOG.md Outdated
@@ -6,7 +6,9 @@

### Bug Fixes

_None_
* Fixed `swiftlint` warnings in generated color extensions.
[Roman Laitarenko](https://github.com/evil159)
Copy link
Member

Choose a reason for hiding this comment

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

Hate to be nitpicky here, but please indent the username and PR links.

@djbe djbe merged commit b020e67 into SwiftGen:master Apr 5, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants