Refactored a bit logic for result's format

Author: andrykonchin

lib/truffle/coverage.rb

@@ -31,7 +31,7 @@ def self.start(modes = UNDEFINED)
       raise 'cannot enable lines and oneshot_lines simultaneously'
     end
 
-    @lines = Primitive.as_boolean(options[:lines]) # presence of :lines affects `result`'s report format
+    @default_mode = (modes == UNDEFINED)
     Truffle::Coverage.enable
 
     nil
@@ -41,10 +41,11 @@ def self.result(stop: true, clear: true)
     result = peek_result
     Truffle::Coverage.disable if stop || clear
     Truffle::Coverage.enable if !stop && clear
-    # We have to wrap the coverage lines array in a hash with the :lines key if
-    # the :lines option was given
-    if @lines
-      result.transform_values! do |_,*lines_array|
+
+    # if there is only the default mode (:lines only) - return result as array per file,
+    # otherwise return result for each mode separately (e.g. for :branches, :methods, :lines)
+    if !@default_mode
+      result.transform_values! do |_, *lines_array|
         # need to add nil to the beginning of each lines array, because the
         # first line has index 1 and not 0
         { lines: lines_array.unshift(nil) }

spec/ruby/library/coverage/result_spec.rb

@@ -26,6 +26,41 @@
     }
   end
 
+  ruby_version_is "3.2" do
+    it 'returns results for each mode separately when enabled :all modes' do
+      Coverage.start(:all)
+      require @class_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @class_file => {
+          :lines => [
+            nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+          ],
+          :branches => {},
+          :methods => {
+            [SomeClass, :some_method, 6, 2, 11, 5] => 0
+          }
+        }
+      }
+    end
+
+    it 'returns results for each mode separately when enabled any mode explicitly' do
+      Coverage.start(lines: true)
+      require @class_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @class_file =>
+          {
+            :lines=> [
+              nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+            ]
+          }
+      }
+    end
+  end
+
   it 'no requires/loads should give empty hash' do
     Coverage.start
     result = Coverage.result

spec/tags/library/coverage/result_tags.txt

@@ -2,3 +2,4 @@ fails:Coverage.result second Coverage.start give exception
 fails:Coverage.result indicates support for different features
 fails:Coverage.result returns the correct results when eval coverage is enabled
 fails:Coverage.result returns the correct results when eval coverage is disabled
+fails:Coverage.result returns results for each mode separately when enabled :all modes