mutant 0.11.5 → 0.11.8

data/lib/mutant/matcher/method/metaclass.rb

@@ -45,7 +45,7 @@ module Mutant
           end
 
           def metaclass_containing(node)
-            AST::FindMetaclassContaining.call(ast, node)
+            AST::FindMetaclassContaining.call(ast.node, node)
           end
 
           def line?(node)

data/lib/mutant/matcher/method.rb

@@ -99,6 +99,7 @@ module Mutant
           node = matched_node_path.last || return
 
           self.class::SUBJECT_CLASS.new(
+            config:     Subject::Config.parse(ast.comment_associations.fetch(node, [])),
             context:    context,
             node:       node,
             visibility: visibility
@@ -106,7 +107,7 @@ module Mutant
         end
 
         def matched_node_path
-          AST.find_last_path(ast, &method(:match?))
+          AST.find_last_path(ast.node, &method(:match?))
         end
         memoize :matched_node_path
 

data/lib/mutant/matcher.rb

@@ -26,7 +26,7 @@ module Mutant
     end
 
     def self.allowed_subject?(config, subject)
-      select_subject?(config, subject) && !ignore_subject?(config, subject)
+      select_subject?(config, subject) && !ignore_subject?(config, subject) && !subject.inline_disabled?
     end
     private_class_method :allowed_subject?
 

data/lib/mutant/mutation.rb

@@ -7,7 +7,7 @@ module Mutant
     include Concord::Public.new(:subject, :node)
 
     CODE_DELIMITER = "\0"
-    CODE_RANGE     = (0..4).freeze
+    CODE_RANGE     = (..4).freeze
 
     # Mutation identification code
     #

data/lib/mutant/mutator/node/arguments.rb

@@ -19,17 +19,27 @@ module Mutant
         end
 
         def emit_argument_presence
-          emit_type unless removed_block_arg?(EMPTY_ARRAY)
+          emit_type unless removed_block_arg?(EMPTY_ARRAY) || forward_arg?
 
-          Util::Array::Presence.call(children).each do |children|
-            unless removed_block_arg?(children) || (children.one? && n_mlhs?(children.first))
-              emit_type(*children)
+          children.each_with_index do |removed, index|
+            new_arguments = children.dup
+            new_arguments.delete_at(index)
+            unless n_forward_arg?(removed) || removed_block_arg?(new_arguments) || only_mlhs?(new_arguments)
+              emit_type(*new_arguments)
             end
           end
         end
 
-        def removed_block_arg?(children)
-          anonymous_block_arg? && children.none?(&ANONYMOUS_BLOCKARG_PRED)
+        def only_mlhs?(new_arguments)
+          new_arguments.one? && n_mlhs?(new_arguments.first)
+        end
+
+        def forward_arg?
+          children.last && n_forward_arg?(children.last)
+        end
+
+        def removed_block_arg?(new_arguments)
+          anonymous_block_arg? && new_arguments.none?(&ANONYMOUS_BLOCKARG_PRED)
         end
 
         def anonymous_block_arg?
@@ -47,7 +57,7 @@ module Mutant
         end
 
         def invalid_argument_replacement?(mutant, index)
-          n_arg?(mutant) && children[0...index].any?(&method(:n_optarg?))
+          n_arg?(mutant) && children[...index].any?(&method(:n_optarg?))
         end
 
         def emit_mlhs_expansion

data/lib/mutant/mutator/node/send/attribute_assignment.rb

@@ -7,7 +7,7 @@ module Mutant
         # Mutator for attribute assignments
         class AttributeAssignment < self
 
-          ATTRIBUTE_RANGE = (0..-2).freeze
+          ATTRIBUTE_RANGE = (..-2).freeze
 
           private_constant(*constants(false))
 

data/lib/mutant/mutator/node/send.rb

@@ -241,7 +241,9 @@ module Mutant
 
           argument = Mutant::Util.one(arguments)
 
-          emit_propagation(argument) unless n_kwargs?(argument)
+          return if n_kwargs?(argument) || n_forwarded_args?(argument)
+
+          emit_propagation(argument)
         end
 
         def mutate_receiver

data/lib/mutant/mutator/node/when.rb

@@ -22,7 +22,7 @@ module Mutant
 
         def mutate_conditions
           conditions = children.length - 1
-          children[0..-2].each_index do |index|
+          children[..-2].each_index do |index|
             delete_child(index) if conditions > 1
             mutate_child(index)
           end

data/lib/mutant/parser.rb

@@ -5,6 +5,13 @@ module Mutant
   class Parser
     include Adamantium, Equalizer.new
 
+    class AST
+      include Anima.new(
+        :node,
+        :comment_associations
+      )
+    end
+
     # Initialize object
     #
     # @return [undefined]
@@ -18,7 +25,18 @@ module Mutant
     #
     # @return [AST::Node]
     def call(path)
-      @cache[path] ||= Unparser.parse(path.read)
+      @cache[path] ||= parse(path.read)
+    end
+
+  private
+
+    def parse(source)
+      node, comments = Unparser.parse_with_comments(source)
+
+      AST.new(
+        node:                 node,
+        comment_associations: ::Parser::Source::Comment.associate_by_identity(node, comments)
+      )
     end
 
   end # Parser

data/lib/mutant/subject/config.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mutant
+  class Subject
+    class Config
+      include Adamantium, Anima.new(:inline_disable)
+
+      DEFAULT = new(inline_disable: false)
+
+      DISABLE_REGEXP = /(\s|^)mutant:disable(?:\s|$)/.freeze
+      SYNTAX_REGEXP  = /\A(?:#|=begin\n)/.freeze
+
+      def self.parse(comments)
+        new(
+          inline_disable: comments.any? { |comment| DISABLE_REGEXP.match?(comment_body(comment)) }
+        )
+      end
+
+      def self.comment_body(comment)
+        comment.text.sub(SYNTAX_REGEXP, '')
+      end
+      private_class_method :comment_body
+    end # Config
+  end # Subject
+end # Mutant

data/lib/mutant/subject.rb

@@ -4,7 +4,7 @@ module Mutant
   # Subject of a mutation
   class Subject
     include AbstractType, Adamantium, Enumerable
-    include Anima.new(:context, :node)
+    include Anima.new(:config, :context, :node)
 
     # Mutations for this subject
     #
@@ -19,6 +19,10 @@ module Mutant
     end
     memoize :mutations
 
+    def inline_disabled?
+      config.inline_disable
+    end
+
     # Source path
     #
     # @return [Pathname]

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.11.5'
+  VERSION = '0.11.8'
 end # Mutant

data/lib/mutant.rb

@@ -164,6 +164,7 @@ require 'mutant/loader'
 require 'mutant/context'
 require 'mutant/scope'
 require 'mutant/subject'
+require 'mutant/subject/config'
 require 'mutant/subject/method'
 require 'mutant/subject/method/instance'
 require 'mutant/subject/method/singleton'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.8
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -353,6 +353,7 @@ files:
 - lib/mutant/selector/expression.rb
 - lib/mutant/selector/null.rb
 - lib/mutant/subject.rb
+- lib/mutant/subject/config.rb
 - lib/mutant/subject/method.rb
 - lib/mutant/subject/method/instance.rb
 - lib/mutant/subject/method/metaclass.rb
@@ -385,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: ''