lib/tapioca/dsl/compilers/state_machines.rb in tapioca-0.15.1 vs lib/tapioca/dsl/compilers/state_machines.rb in tapioca-0.16.0

@@ -157,11 +157,11 @@
         class << self
           extend T::Sig
 
           sig { override.returns(T::Enumerable[Module]) }
           def gather_constants
-            all_classes.select { |mod| mod < ::StateMachines::InstanceMethods }
+            all_classes.select { |mod| ::StateMachines::InstanceMethods > mod }
           end
         end
 
         private
 
@@ -229,15 +229,15 @@
         def define_state_accessor(instance_module, machine, state_type)
           attribute = machine.attribute.to_s
           instance_module.create_method(
             attribute,
             return_type: state_type,
-          )
+          ) if ::StateMachines::HelperModule === machine.owner_class.instance_method(attribute).owner
           instance_module.create_method(
             "#{attribute}=",
             parameters: [create_param("value", type: state_type)],
             return_type: state_type,
-          )
+          ) if ::StateMachines::HelperModule === machine.owner_class.instance_method("#{attribute}=").owner
         end
 
         sig { params(instance_module: RBI::Module, machine: ::StateMachines::Machine).void }
         def define_state_predicate(instance_module, machine)
           instance_module.create_method(