Merge pull request #978 from realm/jp-one-char-fix

fix specifying multiple rule identifiers in comment commands
realm · Dec 13, 2016 · 1bafa99 · 1bafa99
2 parents 11bfa93 + 177e055
commit 1bafa99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,7 +66,7 @@
   empty parentheses after method call when using trailing closures.  
   [Marcelo Fabri](https://github.com/marcelofabri)
   [#885](https://github.com/realm/SwiftLint/issues/885)
-  
+
 * Add `closure_parameter_position` rule that validates that closure
   parameters are in the same line as the opening brace.  
   [Marcelo Fabri](https://github.com/marcelofabri)
@@ -97,6 +97,10 @@
   [Marcelo Fabri](https://github.com/marcelofabri)
   [#940](https://github.com/realm/SwiftLint/issues/940)
 
+* Fix specifying multiple rule identifiers in comment commands.  
+  [JP Simard](https://github.com/jpsim)
+  [#976](https://github.com/realm/SwiftLint/issues/976)
+
 ## 0.13.2: Light Cycle
 
 ##### Breaking

diff --git a/Source/SwiftLintFramework/Extensions/File+SwiftLint.swift b/Source/SwiftLintFramework/Extensions/File+SwiftLint.swift
@@ -40,7 +40,7 @@ extension File {
             return []
         }
         let contents = self.contents.bridge()
-        return matchPattern("swiftlint:(enable|disable)(:previous|:this|:next)?\\ [^\\s]+",
+        return matchPattern("swiftlint:(enable|disable)(:previous|:this|:next)?\\ [^\\n]+",
             withSyntaxKinds: [.comment]).flatMap { range in
                 return Command(string: contents, range: range)
             }.flatMap { command in

diff --git a/Tests/SwiftLintFrameworkTests/RulesTests.swift b/Tests/SwiftLintFrameworkTests/RulesTests.swift
@@ -187,7 +187,8 @@ class RulesTests: XCTestCase {
         verifyRule(MarkRule.description, commentDoesntViolate: false)
     }
 
-// swiftlint:disable:this todo FIXME: https://github.com/jpsim/SourceKitten/issues/269
+// swiftlint:disable:next todo
+// FIXME: https://github.com/jpsim/SourceKitten/issues/269
 //    func testMissingDocs() {
 //        verifyRule(MissingDocsRule.description)
 //    }
@@ -362,7 +363,8 @@ class RulesTests: XCTestCase {
         verifyRule(TypeNameRule.description)
     }
 
-// swiftlint:disable:this todo FIXME: https://github.com/jpsim/SourceKitten/issues/269
+// swiftlint:disable:next todo
+// FIXME: https://github.com/jpsim/SourceKitten/issues/269
 //    func testValidDocs() {
 //        verifyRule(ValidDocsRule.description)
 //    }