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

Add superfluous_disable_command SwiftLint exception #83

Merged
merged 3 commits into from
Oct 10, 2017
Merged

Add superfluous_disable_command SwiftLint exception #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d84a614
Prefix all `swiftlint:disable` with `superfluous_disable_command` to …
Oct 10, 2017
3b1c729
CHANGELOG entry
Oct 10, 2017
152d89b
Cleanup the annotations now that the bug about superfluous_disable_co…
AliSoftware Oct 10, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
* Documentation: Fix link to generated XCAssets example.
[Alvar Hansen](https://github.com/allu22)
[#80](https://github.com/SwiftGen/templates/pull/80)
* SwiftLint rules: Disabled the `superfluous_disable_command` rule
for all `swiftlint:disable` exceptions in all templates.
[Olivier Halligon](https://github.com/AliSoftware)
[SwiftGen/SwiftGen#334](https://github.com/SwiftGen/SwiftGen/issues/334)
[#83](https://github.com/SwiftGen/templates/pull/83)

### Breaking Changes

Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-swift3-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import UIKit
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-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 @@
enum ColorName { }
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-swift3-context-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
enum ColorName { }
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-swift4-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import UIKit
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-swift4-context-defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
enum ColorName { }
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/literals-swift4-context-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
enum ColorName { }
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable identifier_name line_length type_body_length
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift2-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias XCTColor = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift2-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 = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift2-context-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift3-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias XCTColor = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 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 = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift3-context-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift4-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias XCTColor = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift4-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 = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Colors/swift4-context-multiple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Color = UIColor
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable operator_usage_whitespace
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift2-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift2-context-defaults-preservepath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift2-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 Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift3-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift3-context-defaults-preservepath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/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 Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift4-context-defaults-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift4-context-defaults-preservepath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
typealias Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Fonts/swift4-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 Font = UIFont
#endif

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

struct FontConvertible {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift2-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift2-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import CustomSegue
import LocationPicker

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift2-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift2-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift3-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift3-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import CustomSegue
import LocationPicker

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift3-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift3-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift4-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift4-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import CustomSegue
import LocationPicker

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift4-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import UIKit
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-iOS/swift4-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomSegue
import LocationPicker
import SlackTextViewController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift2-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions .../Expected/Storyboards-macOS/swift2-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import FadeSegue

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift2-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift2-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift3-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions .../Expected/Storyboards-macOS/swift3-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import FadeSegue

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift3-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift3-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift4-context-all-customname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions .../Expected/Storyboards-macOS/swift4-context-all-ignore-module-need-extra-definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import FadeSegue

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift4-context-all-ignore-module.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Foundation
import Cocoa
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
1 change: 1 addition & 0 deletions Tests/Expected/Storyboards-macOS/swift4-context-all.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Cocoa
import FadeSegue
import PrefsWindowController

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

protocol StoryboardType {
Expand Down
Loading