Commit Graph

7 Commits

Author SHA1 Message Date
Norio Nomura 6fc48e34fd Merge commit 'bdeeac6b4c9e20847878b148ecaebf1efeec7a74' into swift3.0
* commit 'bdeeac6b4c9e20847878b148ecaebf1efeec7a74':
  simplify disable in HTMLReporter
  sort master rule list
  fix some older changelog formatting inconsistencies
  exclude test resources from linting

# Conflicts:
#	Source/SwiftLintFramework/Reporters/HTMLReporter.swift
2016-11-30 14:36:56 +09:00
JP Simard bdeeac6b4c simplify disable in HTMLReporter 2016-11-25 11:32:26 -08:00
Norio Nomura 40828dff03 Merge branch 'master' into swift3.0
* master: (41 commits)
  Fix formatting in CHANGELOG.md
  release 0.13.0
  Update CHANGELOG.md
  Fix check for trailing whitespace to return early
  Fix checks for some inline comments
  Replace check for comments to use SyntaxKind
  Add configuration for trailing_whitespace to ignore comments
  Unwanted space removed
  - Lint issues fixed
  Updated HTML Reporter
  PR feedback
  Add check on autocorrect for disabled range
  Use `utf8.count` instead of `utf16.count` to byte range
  Re-write `ExplicitInitRule` to `ASTRule`
  added ExplicitInitRule
  Updated CHANGELOG
  HTML Reporter added
  HTML Reporter added
  Adds information about SwiftLint plugin for AppCode into README.md
  added reasons why a new rule should be opt in
  ...

# Conflicts:
#	Source/SwiftLintFramework/Extensions/File+SwiftLint.swift
#	Source/SwiftLintFramework/Extensions/Structure+SwiftLint.swift
#	Source/SwiftLintFramework/Rules/ColonRule.swift
#	Source/SwiftLintFramework/Rules/CommaRule.swift
#	Source/SwiftLintFramework/Rules/LegacyCGGeometryFunctionsRule.swift
#	Source/SwiftLintFramework/Rules/LegacyConstantRule.swift
#	Source/SwiftLintFramework/Rules/LegacyConstructorRule.swift
#	Source/SwiftLintFramework/Rules/LegacyNSGeometryFunctionsRule.swift
#	Source/SwiftLintFramework/Rules/LineLengthRule.swift
#	Source/SwiftLintFramework/Rules/OperatorFunctionWhitespaceRule.swift
#	Source/SwiftLintFramework/Rules/ReturnArrowWhitespaceRule.swift
#	Source/SwiftLintFramework/Rules/RuleConfigurations/StatementPositionConfiguration.swift
#	Source/SwiftLintFramework/Rules/StatementPositionRule.swift
#	Source/SwiftLintFramework/Rules/TrailingWhitespaceRule.swift
#	Tests/SwiftLintFramework/RuleConfigurationTests.swift
2016-11-04 21:40:56 +09:00
Johnykutty Mathew 757ca5bc04 Unwanted space removed 2016-11-03 17:10:55 +05:30
Johnykutty Mathew e0627a3063 - Lint issues fixed 2016-11-02 14:38:09 +05:30
Johnykutty Mathew af7404aa3d Updated HTML Reporter 2016-11-01 20:00:31 +05:30
Johnykutty Mathew 6fb7ca1246 HTML Reporter added 2016-10-27 18:11:20 +05:30