Avoid changing API

Author: cyberdelia

lib/simplecov/lines_classifier.rb

@@ -12,12 +12,12 @@ class LinesClassifier
     COMMENT_LINE = /^\s*#/.freeze
     WHITESPACE_OR_COMMENT_LINE = Regexp.union(WHITESPACE_LINE, COMMENT_LINE)
 
-    def self.no_cov_block
+    def self.no_cov_line
       /^(\s*)#(\s*)(:#{SimpleCov.nocov_token}:)/o
     end
 
-    def self.no_cov_line
-      /#(\s*)(:#{SimpleCov.nocov_token}:)(\s*)$/o
+    def self.no_cov_inline
+      /\S.*#\s*:#{SimpleCov.nocov_token}:\s*$/o
     end
 
     def self.no_cov_line?(line)
@@ -27,8 +27,8 @@ def self.no_cov_line?(line)
       false
     end
 
-    def self.no_cov_block?(line)
-      no_cov_block.match?(line)
+    def self.no_cov_inline?(line)
+      no_cov_inline.match?(line)
     rescue ArgumentError
       # E.g., line contains an invalid byte sequence in UTF-8
       false
@@ -45,10 +45,10 @@ def classify(lines)
       skipping = false
 
       lines.map do |line|
-        if self.class.no_cov_block?(line)
+        if self.class.no_cov_line?(line)
           skipping = !skipping
           NOT_RELEVANT
-        elsif skipping || self.class.no_cov_line?(line) || self.class.whitespace_line?(line)
+        elsif skipping || self.class.no_cov_inline?(line) || self.class.whitespace_line?(line)
           NOT_RELEVANT
         else
           RELEVANT