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

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ece8064
Updated swiftlint rules in dolors-default.sencil
evil159 Apr 4, 2017
8e2bc84
Updated swiftlint rules in colors-default.sencil
evil159 Apr 4, 2017
a44720b
Updated swiftlint rules in colors-swift3.sencil
evil159 Apr 4, 2017
ce80fc4
Updated swiftlint rules in default colors template test.
evil159 Apr 4, 2017
d60c0a2
Updated swiftlint rules in colors default context test template.
evil159 Apr 4, 2017
69287f2
Updated empty colors test template.
evil159 Apr 4, 2017
29fa26e
Updated text defaults colors test template.
evil159 Apr 4, 2017
c912893
Updated rawValue customName color test template.
evil159 Apr 4, 2017
65ef83f
Updated rawValue context defaults color test template.
evil159 Apr 4, 2017
75f316b
Updated rawValue empty colors text template.
evil159 Apr 4, 2017
d065389
Updated swift3 custom name color test template.
evil159 Apr 4, 2017
c12db79
Updated swift3 default test template.
evil159 Apr 4, 2017
fa3033c
Updated swift3 empty colors test template.
evil159 Apr 4, 2017
eb483b7
Updated swift3 text default color test template.
evil159 Apr 4, 2017
27c577d
Updated color templates to emit consistent swiftlint disable/enable r…
Apr 4, 2017
285e0a8
Updated changelog.
Apr 4, 2017
3bb8791
Corrected changeling entry format.
evil159 Apr 4, 2017
0ac1d63
Fixed changelog entry format.
evil159 Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


### Breaking Changes

Expand Down
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/default-context-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -61,3 +63,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/default-context-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -61,3 +63,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
2 changes: 2 additions & 0 deletions Tests/Expected/Colors/default-context-empty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,5 +19,6 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// No color found
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/default-context-text-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -76,3 +78,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/rawValue-context-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -48,3 +50,5 @@ extension Color {
self.init(rgbaValue: name.rawValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/rawValue-context-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -48,3 +50,5 @@ extension Color {
self.init(rgbaValue: name.rawValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
2 changes: 2 additions & 0 deletions Tests/Expected/Colors/rawValue-context-empty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,5 +19,6 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// No color found
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/swift3-context-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -61,3 +63,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/swift3-context-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -61,3 +63,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
2 changes: 2 additions & 0 deletions Tests/Expected/Colors/swift3-context-empty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,5 +19,6 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// No color found
4 changes: 4 additions & 0 deletions Tests/Expected/Colors/swift3-context-text-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

// swiftlint:disable file_length
// swiftlint:disable line_length
Expand Down Expand Up @@ -76,3 +78,5 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
4 changes: 4 additions & 0 deletions templates/colors-default.stencil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

{% if colors %}
{# Note: We don't use a UInt32 rawValue in this template so we can have multiple colors with the same rgbaValue #}
Expand Down Expand Up @@ -52,6 +54,8 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
{% else %}
// No color found
{% endif %}
4 changes: 4 additions & 0 deletions templates/colors-rawValue.stencil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

{% if colors %}
// swiftlint:disable file_length
Expand All @@ -42,6 +44,8 @@ extension Color {
self.init(rgbaValue: name.rawValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
{% else %}
// No color found
{% endif %}
4 changes: 4 additions & 0 deletions templates/colors-swift3.stencil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = NSColor
#endif

// swiftlint:disable operator_usage_whitespace
extension Color {
convenience init(rgbaValue: UInt32) {
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
Expand All @@ -18,6 +19,7 @@ extension Color {
self.init(red: red, green: green, blue: blue, alpha: alpha)
}
}
// swiftlint:enable operator_usage_whitespace

{% if colors %}
{# Note: We don't use a UInt32 rawValue in this template so we can have multiple colors with the same rgbaValue #}
Expand Down Expand Up @@ -52,6 +54,8 @@ extension Color {
self.init(rgbaValue: name.rgbaValue)
}
}
// swiftlint:enable file_length
// swiftlint:enable line_length
{% else %}
// No color found
{% endif %}