sorbet 0.5.5685 → 0.5.5730

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2899649daa3ba749810d9d63dbc4da32cfd7819c
-  data.tar.gz: 711df9bfc0fd46619ac0b7b4c97fa2b942936cdb
+  metadata.gz: d0274dfa532171030b9beff35bba55fb038eb1f6
+  data.tar.gz: 816a05fe5db48cce0c4f054f13caf39b266d5f47
 SHA512:
-  metadata.gz: cfdd17dc2023964a24250fdb895cd38731a8cef2c2c676bc71c34bf59f0b68ca587f508fe63a511b1bbfff8dbf115aa8e467547c81713215d43e1a849fb811f4
-  data.tar.gz: fa7d888f5d9be42bc53c36e181c9b614d7de5c15f5c3c11fe7484d0eb093d4e2e4335658c4240eb90e42e3e715f7f5882495dce1f7f1ee7609df5f703736e02c
+  metadata.gz: bf48e96a5c0dbfc554475fcdb48809517bb777033e8d9e836cfe7ed58a16f11d167c292ebba6bb14ea4eebc42378a575b88236ea308c0d72cfebf49cf812984b
+  data.tar.gz: f18c4ee66c85cebdd470809c59d32d5bc4cb0f142859b2d172cf3bf5b4158281f60970fe5ed84b9d5225308c7998ad9cdc232052014db9671a0a0a20795292ec

data/bin/srb

@@ -47,7 +47,7 @@ typecheck() {
   args=("$@")
   cache_dir="${XDG_CACHE_HOME:-$HOME/.cache}/sorbet/gem-rbis"
 
-  if [ -f Gemfile.lock ]; then
+  if [ -z "$SRB_SKIP_GEM_RBIS" ] && [ -f Gemfile.lock ]; then
     [ -d "$cache_dir" ] || mkdir -p "$cache_dir"
     cache_hash=$(compute_md5 Gemfile.lock | awk '{ print $1 }')
     cache_file="${cache_dir}/${cache_hash}"

data/lib/constant_cache.rb

@@ -97,7 +97,27 @@ class Sorbet::Private::ConstantLookupCache
 
     @all_constants.map do |_key, struct|
       next if struct.nil? || !Sorbet::Private::RealStdlib.real_is_a?(struct.const, Module) || struct.aliases.size < 2
-      ret[struct.primary_name] = struct.aliases.reject {|name| name == struct.primary_name}
+      if struct.owner != nil
+        ret[struct.primary_name] = struct.aliases.reject do |name|
+          # ignore the primary
+          next true if name == struct.primary_name
+
+          prefix, _, _ = name.rpartition('::')
+
+          # an alias that exists at the top-level
+          next false if prefix == ""
+
+          # if the prefix is the same syntactically, then this is a good alias
+          next false if prefix == struct.owner.primary_name
+
+          # skip the alias if the owner is the same
+          other_owner_const = Sorbet::Private::RealStdlib.real_const_get(Object, prefix, false)
+          struct.owner.const == other_owner_const
+        end
+      else
+        # top-level names
+        ret[struct.primary_name] = struct.aliases.reject {|name| name == struct.primary_name }
+      end
     end
     ret
   end
@@ -155,6 +175,7 @@ class Sorbet::Private::ConstantLookupCache
         if maybe_seen_already
           if nested_name != maybe_seen_already.primary_name
             maybe_seen_already.aliases << nested_name
+            maybe_seen_already.owner = owner
           end
           if maybe_seen_already.primary_name.nil? && Sorbet::Private::RealStdlib.real_is_a?(nested_constant, Module)
             realName = Sorbet::Private::RealStdlib.real_name(nested_constant)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet
 version: !ruby/object:Gem::Version
-  version: 0.5.5685
+  version: 0.5.5730
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-static
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5685
+        version: 0.5.5730
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5685
+        version: 0.5.5730
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement