Merge pull request #668 from Shopify/uk-remove-mixin-filtering

Author: paracycle

lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -375,29 +375,24 @@ def compile_mixins(tree, constant)
             Module != class_of(mod) || are_equal?(mod, singleton_class)
           end
 
-          mixin_locations = Trackers::Mixin.mixin_locations_for(constant)
-
-          add_mixins(tree, prepends.reverse, Trackers::Mixin::Type::Prepend, mixin_locations)
-          add_mixins(tree, includes.reverse, Trackers::Mixin::Type::Include, mixin_locations)
-          add_mixins(tree, extends.reverse, Trackers::Mixin::Type::Extend, mixin_locations)
+          add_mixins(tree, prepends.reverse, Trackers::Mixin::Type::Prepend)
+          add_mixins(tree, includes.reverse, Trackers::Mixin::Type::Include)
+          add_mixins(tree, extends.reverse, Trackers::Mixin::Type::Extend)
         end
 
         sig do
           params(
             tree: RBI::Tree,
             mods: T::Array[Module],
-            mixin_type: Trackers::Mixin::Type,
-            mixin_locations: T::Hash[Trackers::Mixin::Type, T::Hash[Module, T::Array[String]]]
+            mixin_type: Trackers::Mixin::Type
           ).void
         end
-        def add_mixins(tree, mods, mixin_type, mixin_locations)
+        def add_mixins(tree, mods, mixin_type)
           mods
             .select do |mod|
               name = name_of(mod)
 
-              name &&
-                !name.start_with?("T::") &&
-                mixed_in_by_gem?(mod, mixin_type, mixin_locations)
+              name && !name.start_with?("T::")
             end
             .map do |mod|
               add_to_symbol_queue(name_of(mod))

spec/tapioca/compilers/symbol_table_compiler_spec.rb

@@ -271,6 +271,9 @@ def hello; end
       RBI
 
       compiled = compile
+        .gsub(/^\s+include ::Minitest::Expectations\s/, "")
+        .gsub(/^\s+include ::JSON::Ext::Generator::GeneratorMethods::Object\s/, "")
+        .gsub(/^\s+include ::PP::ObjectMixin\s/, "")
 
       assert_includes(compiled, basic_object_output)
       assert_includes(compiled, object_output)
@@ -395,6 +398,7 @@ def bar; end
         class Array
           include ::Foo::Bar
           include ::Enumerable
+          include ::JSON::Ext::Generator::GeneratorMethods::Array
 
           def foo_int; end
         end
@@ -408,6 +412,7 @@ module Foo::Bar; end
 
         class Hash
           include ::Enumerable
+          include ::JSON::Ext::Generator::GeneratorMethods::Hash
           extend ::Foo::Bar
 
           def to_bar; end
@@ -419,7 +424,9 @@ def bar; end
 
         class String
           include ::Comparable
+          include ::JSON::Ext::Generator::GeneratorMethods::String
           include ::Foo::Bar
+          extend ::JSON::Ext::Generator::GeneratorMethods::String::Extend
 
           def to_foo(base = T.unsafe(nil)); end
         end