Commit Graph

582 Commits

Author SHA1 Message Date
Norio Nomura 363bcf5c73 Merge branch 'master' into swift3.0
* master:
  add empty changelog section
  update Releasing.md with `brew bump-formula-pr`
  0.13.1: Heavy Cycle
  remove unused function dictFromKeyValuePairs
  add tests for reporterFromString(_:)
  small refactoring of SwitchCaseOnNewlineRule.swift

# Conflicts:
#	Source/SwiftLintFramework/Extensions/File+Cache.swift
#	Source/SwiftLintFramework/Rules/SwitchCaseOnNewlineRule.swift
2016-11-30 22:33:16 +09:00
Norio Nomura b7862b9f6a Merge commit 'e0cafea80ffba746a103d8d5a25be8fcd0993c81' into swift3.0
* commit 'e0cafea80ffba746a103d8d5a25be8fcd0993c81':
  remove unnecessary file.invalidateCache()
  add changelog entry for #893
  fix up indentation in MarkRule.swift
  omit self if it can be inferred
  Corrections for mark rule
  Update regex part to be more precise.
  Add autocorrection to MarkRule

# Conflicts:
#	Source/SwiftLintFramework/Rules/ConditionalReturnsOnNewline.swift
#	Source/SwiftLintFramework/Rules/MarkRule.swift
#	Source/SwiftLintFramework/Rules/StatementPositionRule.swift
2016-11-30 22:26:51 +09:00
Norio Nomura 48b25b6aab Merge commit '83830861d6c6b7fee3218461f699c7d3b457bf2a' into swift3.0
* commit '83830861d6c6b7fee3218461f699c7d3b457bf2a':
  refactor isPrivateLevel(identifier:)
  refactor nameStrippingLeadingUnderscoreIfPrivate
  combine changelog entries for #781 and #831
  Add support for filePrivate and open in rules

# Conflicts:
#	Source/SwiftLintFramework/Extensions/String+SwiftLint.swift
#	Source/SwiftLintFramework/Rules/MissingDocsRule.swift
2016-11-30 20:16:47 +09:00
Norio Nomura 20a597e683 Merge commit 'b9ac89376d7aad517ef215c400c04b90bb3d2ee9' into swift3.0
* commit 'b9ac89376d7aad517ef215c400c04b90bb3d2ee9':
  fix some issues with ExplicitInitRule.swift

# Conflicts:
#	Source/SwiftLintFramework/Rules/ExplicitInitRule.swift
2016-11-30 20:08:16 +09:00
Norio Nomura 0f203bf32d Merge commit '60852d7b5746f789f28d8e292c40fc629f8f7969' into swift3.0
* commit '60852d7b5746f789f28d8e292c40fc629f8f7969':
  Fix ValidIBInspectable rule implementation
2016-11-30 19:42:46 +09:00
Norio Nomura 191e022ca2 Merge commit 'e63c6ce4172f201554ab70c0e4fec694d82d8f60' into swift3.0
* commit 'e63c6ce4172f201554ab70c0e4fec694d82d8f60':
  Use severityConfiguration in rules == function
2016-11-30 19:41:44 +09:00
Norio Nomura f1e7311575 Fix trailing_comma violations 2016-11-30 19:41:28 +09:00
Norio Nomura 84ca11b6aa Merge commit 'b22d1a93c93537acde79a2496031012489fe270d' into swift3.0
* commit 'b22d1a93c93537acde79a2496031012489fe270d':
  Updating CHANGELOG entry
  Updates existing code to respect TrailingCommaRule
  Add configuration to enforce/forbid trailing comma
  Fixing rebase
  Addded TrailingCommaRule
2016-11-30 19:38:31 +09:00
Norio Nomura 06e0e83ad4 Merge commit 'ad019afd7124c07ef34fb22e6165976116202477' into swift3.0
* commit 'ad019afd7124c07ef34fb22e6165976116202477':
  move #872 fix to appropriate changelog section
  closure_spacing accepts empty bodies with a space

# Conflicts:
#	Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift
2016-11-30 19:18:27 +09:00
Norio Nomura b94f2cc292 Merge commit '0dc882b0801c03fcc52d7c4eed72fa5f68f32370' into swift3.0
* commit '0dc882b0801c03fcc52d7c4eed72fa5f68f32370':
  Improving comma rule to support expressions that begin with the comma (fixes a gap when there are consecutive comma violations)
  Improving comma rule to support expressions that begin with the comma (fixes a gap when there are consecutive comma violations)

# Conflicts:
#	Source/SwiftLintFramework/Rules/CommaRule.swift
2016-11-30 19:14:41 +09:00
Norio Nomura 63a2b207b4 Merge commit 'e65437cd7a7a1e97f68ddb62d572952d74fa3876' into swift3.0
* commit 'e65437cd7a7a1e97f68ddb62d572952d74fa3876':
  Fixing #878
  `switch_case_on_newline` should ignore trailing comments

# Conflicts:
#	Source/SwiftLintFramework/Rules/SwitchCaseOnNewlineRule.swift
2016-11-30 19:08:05 +09:00
Norio Nomura 1d7fbe17eb Merge commit '3ce57ba71ac2167d44aae39095475669bb5ec98c' into swift3.0
* commit '3ce57ba71ac2167d44aae39095475669bb5ec98c':
  Add NimbleOperatorRule
2016-11-30 18:50:24 +09:00
Norio Nomura 7c12a63e8f Merge commit '58eb0f69c4055bb2cb89b3df278eca6ce0fb1c34' into swift3.0
* commit '58eb0f69c4055bb2cb89b3df278eca6ce0fb1c34':
  generally clean up usage of swiftlint comment commands
  update README to reflect the ability to specify multiple rules in commands
  add changelog entry
  allow specifying multiple rule identifiers in comment commands

# Conflicts:
#	Source/SwiftLintFramework/Extensions/NSRegularExpression+SwiftLint.swift
#	Source/SwiftLintFramework/Models/Command.swift
#	Source/SwiftLintFramework/Rules/LegacyNSGeometryFunctionsRule.swift
#	Tests/SwiftLintFrameworkTests/ConfigurationTests.swift
#	Tests/SwiftLintFrameworkTests/IntegrationTests.swift
2016-11-30 18:42:40 +09:00
Norio Nomura 636efb5b14 Merge commit 'aeb5d7ae442d6b590e7693a7214098a9328f951a' into swift3.0
* commit 'aeb5d7ae442d6b590e7693a7214098a9328f951a':
  Updating changelog
  Updating regex after PR feedback
  Adding SyntacticSugar rule

# Conflicts:
#	Source/SwiftLintFramework/Extensions/File+Cache.swift
2016-11-30 18:10:10 +09:00
Norio Nomura e922e08c5b Merge commit '6ffab45c2b6ee9c3532afa2f647d34daf320be1d' into swift3.0
* commit '6ffab45c2b6ee9c3532afa2f647d34daf320be1d':
  Fix severity configuration in ColonRule

# Conflicts:
#	Source/SwiftLintFramework/Rules/ColonRule.swift
2016-11-30 17:44:49 +09:00
Norio Nomura b9426fb78e Merge commit '487f8cccdfe27771f6cd9ec46470a3b3578eaec4' into swift3.0
* commit '487f8cccdfe27771f6cd9ec46470a3b3578eaec4':
  fix changelog entry: weak rule isn't opt-in
  minor WeakDelegateRule formatting
  fix up changelog entry
  [weak_delegate] Better code style for testing string matching
  Thinking back about it, WeakDelegate rule should in fact maybe not be Opt-In, but rather enabled by default
  Additional code comments
  [New Rule] weak_delegate
2016-11-30 17:27:44 +09:00
Norio Nomura 7593deff3f Merge commit 'b591ec71085572825616e9ac0ed15450198b52bb' into swift3.0
* commit 'b591ec71085572825616e9ac0ed15450198b52bb':
  minor Tests comment formatting
  ValidIBInspectableRule formatting
  fix typo in OverriddenSuperCallRule file name

# Conflicts:
#	Source/SwiftLintFramework/Rules/ValidIBInspectableRule.swift
2016-11-30 17:14:40 +09:00
Norio Nomura 5d1a3c225a Merge commit '4072ca298193bac6c1d068c2fa6eba5ea82fc99d' into swift3.0
* commit '4072ca298193bac6c1d068c2fa6eba5ea82fc99d':
  OverriddenSuperCallRule formatting
  comment indentation
  ClosureSpacingRule formatting

# Conflicts:
#	Source/SwiftLintFramework/Rules/ClosureSpacingRule.swift
#	Source/SwiftLintFramework/Rules/LegacyCGGeometryFunctionsRule.swift
#	Source/SwiftLintFramework/Rules/OverridenSuperCallRule.swift
2016-11-30 14:57:08 +09:00
Norio Nomura 5b41474f56 Merge commit '1f98e72e179f07947ecf2679a685dac7255d50f3' into swift3.0
* commit '1f98e72e179f07947ecf2679a685dac7255d50f3':
  small formatting fixes to ImplicitGetterRule

# Conflicts:
#	Source/SwiftLintFramework/Rules/ImplicitGetterRule.swift
2016-11-30 14:35:25 +09:00
Norio Nomura 397b3ad8fc Merge commit '1151c1883100fc2c65450a9266a06e0c9a4c83b3' into swift3.0
* commit '1151c1883100fc2c65450a9266a06e0c9a4c83b3':
  Updating changelog
  Rewriting rule to deal with nested structures
  Add ImplicitGetterRule
2016-11-30 14:14:24 +09:00
Norio Nomura abecb87672 Merge commit 'aa520f35481c7a83f9c94f217d48919bd37432fa' into swift3.0
* commit 'aa520f35481c7a83f9c94f217d48919bd37432fa':
  make minor changes to tests for ACL or reusing existing constants

# Conflicts:
#	Tests/SwiftLintFrameworkTests/TestHelpers.swift
2016-11-30 13:01:00 +09:00
Norio Nomura aaf008c527 Merge commit '8f140ffdfe13c4f17398aa2d1256e2ed95bfdfe6' into swift3.0
* commit '8f140ffdfe13c4f17398aa2d1256e2ed95bfdfe6':
  improve debugging failing tests due to mismatched violation locations
  fix MarkRule edge cases

# Conflicts:
#	Source/SwiftLintFramework/Rules/MarkRule.swift
2016-11-30 12:54:47 +09:00
JP Simard 7d94f2b461 small refactoring of SwitchCaseOnNewlineRule.swift 2016-11-28 22:59:04 -08:00
JP Simard ed70259198 remove unnecessary file.invalidateCache()
this is already called in Linter.correct() if corrections were applied
2016-11-28 22:43:02 -08:00
JP Simard 0b39dec1b0 fix up indentation in MarkRule.swift 2016-11-28 22:30:31 -08:00
JP Simard 99005133de Merge pull request #893 from kohtenko/master
Add autocorrection to MarkRule
2016-11-28 22:28:25 -08:00
JP Simard 4bb23dd75a omit self if it can be inferred 2016-11-28 22:18:56 -08:00
JP Simard 83830861d6 Merge pull request #905 from marcelofabri/swift3-acls
Add support for Swift 3 ACLs (open & fileprivate) in existing rules
2016-11-28 22:02:55 -08:00
JP Simard d9287ba38f refactor isPrivateLevel(identifier:) 2016-11-28 21:51:42 -08:00
JP Simard 3863e542c1 fix some issues with ExplicitInitRule.swift
- didn't compile with Xcode 7.3.1
- had some function signature formatting inconsistent with codebase
2016-11-28 21:41:09 -08:00
Daniel Duan 7d4e0aed94 Fix ValidIBInspectable rule implementation
1. `NSNumber` is not IB-inspectable at all.
2. Explicitly typed `Optional`s and `ImplicitlyUnwrappedOptional`s aren't
   supported by `@IBInspectable`, reference type or not.
2016-11-28 17:36:39 -08:00
Oleg Kokhtenko 57d8ece116 Corrections for mark rule 2016-11-28 09:40:05 +01:00
Oleg Kokhtenko 92c586e79b Update regex part to be more precise. 2016-11-28 09:38:36 +01:00
Oleg Kokhtenko 96a9fe398c Add autocorrection to MarkRule 2016-11-28 09:38:36 +01:00
Marcelo Fabri fd71465cd2 Add support for filePrivate and open in rules
Fixes #781 and #831
2016-11-27 16:26:41 -02:00
Marcelo Fabri 6a8ebe61c6 Use severityConfiguration in rules == function 2016-11-26 23:50:52 -02:00
Marcelo Fabri d8fd865491 Updates existing code to respect TrailingCommaRule 2016-11-25 23:52:07 -02:00
Marcelo Fabri 3bacc80fc7 Add configuration to enforce/forbid trailing comma 2016-11-25 23:51:25 -02:00
Marcelo Fabri 8464a71095 Addded TrailingCommaRule 2016-11-25 20:56:46 -02:00
JP Simard ad019afd71 Merge pull request #879 from marcelofabri/closure_spacing_empty_body
closure_spacing accepts empty bodies with a space
2016-11-25 14:18:54 -08:00
JP Simard 0dc882b080 Merge pull request #876 from sadefigu/CommaRuleImpromentConsecutiveViolations
Comma rule does not get triggered in all situations
2016-11-25 14:12:39 -08:00
JP Simard e65437cd7a Merge pull request #877 from marcelofabri/switch_case_on_newline-comment
`switch_case_on_newline` bugfixes
2016-11-25 14:11:06 -08:00
Marcelo Fabri 4ed50c2411 closure_spacing accepts empty bodies with a space 2016-11-25 19:42:31 -02:00
Marcelo Fabri b2f16eead5 Fixing #878 2016-11-25 19:41:17 -02:00
Marcelo Fabri 6b50062cd0 switch_case_on_newline should ignore trailing comments
Fixes #874
2016-11-25 19:41:17 -02:00
Marcelo Fabri 0c5ff7f7b5 Add NimbleOperatorRule
Fixes #881
2016-11-25 13:31:06 -08:00
JP Simard e93eee31e7 generally clean up usage of swiftlint comment commands
used within the codebase itself.
2016-11-25 13:10:38 -08:00
JP Simard aeb5d7ae44 Merge pull request #896 from realm/jp-syntatic-sugar-rule
Add SyntacticSugarRule
2016-11-25 12:51:40 -08:00
JP Simard 6ffab45c2b Merge pull request #880 from marcelofabri/colon-rule-error-severity
Fix severity configuration in ColonRule
2016-11-25 12:38:41 -08:00
Marcelo Fabri 30c978c8f5 Updating regex after PR feedback 2016-11-25 12:25:10 -08:00