steep 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c290301da65ed473b092cd6c2ea39eebe02f566124a1fa32e0f420d290513cbf
-  data.tar.gz: ca4fca20e9f3f0b19c57b98d6cdfce0023aeeff8cd0fcd2ee0fc91346e5e0816
+  metadata.gz: '09e364b23ebecd35868dbde7ea09938fa8208219ee1fcd19a0faaa9a160f6aab'
+  data.tar.gz: c4374adcf1b0c54663e04380229322d9c07865fac69b1b74fa2eeabecd26cd7d
 SHA512:
-  metadata.gz: 76c3b0c76e303bcc558bf20efeebe3ddaa3caef432f5d325261261f6d8431f5bbd36bc44af9a4a4dd6a90f2db30ac35ca044181b25063890c0e68c5499d7792c
-  data.tar.gz: a5fa8fba718f599806d9d0ad62a66c138261469d41694bb39ebafe1b8736ad255e890c55f0e3b4f180f4e0212f0b65b31b5957b5c337cba42d1129b9e935e577
+  metadata.gz: e59635b6fba6e2dac0c7ba8fb12d9a4e4734ffd95a48b8af1cb2cdbb0a5280d660c46fbf724ea48a61247165319b448598f702d6ef0dbf78d28b78dcb7ba536c
+  data.tar.gz: 62ca2d4504a4d75922abf3b76def89f0146a298b3452a874d98a869fa3f39942984224324cdec93f7894918b4386a07aabb4a1be6f572bcbbb5d3081086b1cda

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## master
 
+## 0.27.0 (2020-08-31)
+
+* Make tuple types _covariant_ ([#195](https://github.com/soutaro/steep/pull/195))
+* Support `or_asgn`/`and_asgn` with `send` node lhs ([#194](https://github.com/soutaro/steep/pull/194))
+* Performance improvement ([#193](https://github.com/soutaro/steep/pull/193))
+* Add specialized versions of `#first` and `#last` on tuples ([#191](https://github.com/soutaro/steep/pull/191))
+* Typing bug fix on `[]` (empty array) ([#190](https://github.com/soutaro/steep/pull/190))
+* Earlier shutdown with interruption while `steep watch` ([#173](https://github.com/soutaro/steep/pull/173))
+
+## 0.26.0
+
+* Skipped
+
 ## 0.25.0 (2020-08-18)
 
 * Improve `op_send` typing ([#186](https://github.com/soutaro/steep/pull/186))

data/lib/steep/ast/types.rb

@@ -35,9 +35,11 @@ module Steep
           "masked(#{type}|#{mask})"
         end
 
-        def free_variables(set = Set.new)
-          type.free_variables(set)
-          mask.free_variables(set)
+        def free_variables
+          @fvs ||= Set.new.tap do |set|
+            set.merge(type.free_variables)
+            set.merge(mask.free_variables)
+          end
         end
 
         def each_type(&block)

data/lib/steep/ast/types/any.rb

@@ -26,9 +26,7 @@ module Steep
           "untyped"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [1]

data/lib/steep/ast/types/boolean.rb

@@ -26,9 +26,7 @@ module Steep
           "bool"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/ast/types/bot.rb

@@ -26,9 +26,7 @@ module Steep
           "⟘"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [2]

data/lib/steep/ast/types/class.rb

@@ -22,8 +22,8 @@ module Steep
           s.module_type or raise "Unexpected substitution: #{inspect}"
         end
 
-        def free_variables
-          Set.new
+        def free_variables()
+          @fvs = Set.new([self])
         end
 
         def level

data/lib/steep/ast/types/factory.rb

@@ -4,8 +4,14 @@ module Steep
       class Factory
         attr_reader :definition_builder
 
+        attr_reader :type_name_cache
+        attr_reader :type_cache
+
         def initialize(builder:)
           @definition_builder = builder
+
+          @type_name_cache = {}
+          @type_cache = {}
         end
 
         def type_name_resolver
@@ -13,7 +19,9 @@ module Steep
         end
 
         def type(type)
-          case type
+          ty = type_cache[type] and return ty
+
+          type_cache[type] = case type
           when RBS::Types::Bases::Any
             Any.new(location: nil)
           when RBS::Types::Bases::Class
@@ -144,14 +152,17 @@ module Steep
         end
 
         def type_name(name)
-          case
-          when name.class?
-            Names::Module.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          when name.interface?
-            Names::Interface.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          when name.alias?
-            Names::Alias.new(name: name.name, namespace: namespace(name.namespace), location: nil)
-          end
+          n = type_name_cache[name] and return n
+
+          type_name_cache[name] =
+            (case
+             when name.class?
+               Names::Module.new(name: name.name, namespace: namespace(name.namespace), location: nil)
+             when name.interface?
+               Names::Interface.new(name: name.name, namespace: namespace(name.namespace), location: nil)
+             when name.alias?
+               Names::Alias.new(name: name.name, namespace: namespace(name.namespace), location: nil)
+             end)
         end
 
         def type_name_1(name)
@@ -190,7 +201,7 @@ module Steep
           )
         end
 
-        def method_type(method_type, self_type:)
+        def method_type(method_type, self_type:, subst2: nil)
           fvs = self_type.free_variables()
 
           type_params = []
@@ -208,6 +219,7 @@ module Steep
             end
           end
           subst = Interface::Substitution.build(alpha_vars, alpha_types)
+          subst.merge!(subst2) if subst2
 
           type = Interface::MethodType.new(
             type_params: type_params,
@@ -332,7 +344,7 @@ module Steep
 
                 interface.methods[name] = Interface::Interface::Combination.overload(
                   method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|ty| ty.subst(subst) }
+                    method_type(type, self_type: self_type, subst2: subst)
                   end,
                   incompatible: name == :initialize || name == :new
                 )
@@ -353,9 +365,9 @@ module Steep
               definition.methods.each do |name, method|
                 interface.methods[name] = Interface::Interface::Combination.overload(
                   method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|type| type.subst(subst) }
+                    method_type(type, self_type: self_type, subst2: subst)
                   end,
-                  incompatible: method.attributes.include?(:incompatible)
+                  incompatible: false
                 )
               end
             end
@@ -379,9 +391,9 @@ module Steep
 
                 interface.methods[name] = Interface::Interface::Combination.overload(
                   method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|type| type.subst(subst) }
+                    method_type(type, self_type: self_type, subst2: subst)
                   end,
-                  incompatible: method.attributes.include?(:incompatible)
+                  incompatible: false
                 )
               end
             end
@@ -468,6 +480,36 @@ module Steep
                     incompatible: false
                   )
                 end
+
+                array_interface.methods[:first] = array_interface.methods[:first].yield_self do |first|
+                  Interface::Interface::Combination.overload(
+                    [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types[0] || AST::Builtin.nil_type,
+                        location: nil
+                      )
+                    ],
+                    incompatible: false
+                  )
+                end
+
+                array_interface.methods[:last] = array_interface.methods[:last].yield_self do |last|
+                  Interface::Interface::Combination.overload(
+                    [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types.last || AST::Builtin.nil_type,
+                        location: nil
+                      )
+                    ],
+                    incompatible: false
+                  )
+                end
               end
             end
 

data/lib/steep/ast/types/helper.rb

@@ -15,6 +15,12 @@ module Steep
             end || []
           end
         end
+
+        module NoFreeVariables
+          def free_variables()
+            @fvs ||= Set.new
+          end
+        end
       end
     end
   end

data/lib/steep/ast/types/instance.rb

@@ -22,8 +22,8 @@ module Steep
           s.instance_type or raise "Unexpected substitution: #{inspect}"
         end
 
-        def free_variables
-          Set.new
+        def free_variables()
+          @fvs = Set.new([self])
         end
 
         def to_s

data/lib/steep/ast/types/intersection.rb

@@ -57,10 +57,14 @@ module Steep
           "(#{types.map(&:to_s).sort.join(" & ")})"
         end
 
-        def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
-          end
+        def free_variables()
+          @fvs ||= begin
+                     set = Set.new
+                     types.each do |type|
+                       set.merge(type.free_variables)
+                     end
+                     set
+                   end
         end
 
         include Helper::ChildrenLevel

data/lib/steep/ast/types/literal.rb

@@ -29,9 +29,7 @@ module Steep
           value.inspect
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/ast/types/name.rb

@@ -11,9 +11,7 @@ module Steep
             @name = name
           end
 
-          def free_variables
-            Set.new
-          end
+          include Helper::NoFreeVariables
 
           def subst(s)
             self
@@ -41,7 +39,7 @@ module Steep
           alias eql? ==
 
           def hash
-            self.class.hash ^ name.hash ^ args.hash
+            @hash ||= self.class.hash ^ name.hash ^ args.hash
           end
 
           def to_s
@@ -57,14 +55,20 @@ module Steep
           end
 
           def subst(s)
-            self.class.new(location: location,
-                           name: name,
-                           args: args.map {|a| a.subst(s) })
+            if free_variables.intersect?(s.domain)
+              self.class.new(location: location,
+                             name: name,
+                             args: args.map {|a| a.subst(s) })
+            else
+              self
+            end
           end
 
           def free_variables
-            args.each.with_object(Set.new) do |type, vars|
-              vars.merge(type.free_variables)
+            @fvs ||= Set.new().tap do |set|
+              args.each do |type|
+                set.merge(type.free_variables)
+              end
             end
           end
 

data/lib/steep/ast/types/nil.rb

@@ -26,9 +26,7 @@ module Steep
           "nil"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/ast/types/proc.rb

@@ -36,8 +36,11 @@ module Steep
           "^#{params} -> #{return_type}"
         end
 
-        def free_variables
-          params.free_variables + return_type.free_variables
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            set.merge(params.free_variables)
+            set.merge(return_type.free_variables)
+          end
         end
 
         def level

data/lib/steep/ast/types/record.rb

@@ -26,12 +26,17 @@ module Steep
         end
 
         def to_s
-          "{ #{elements.map {|key, value| "#{key.inspect} => #{value}" }.join(", ")} }"
+          strings = elements.keys.sort.map do |key|
+            "#{key.inspect} => #{elements[key]}"
+          end
+          "{ #{strings.join(", ")} }"
         end
 
-        def free_variables
-          elements.each_value.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            elements.each_value do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

data/lib/steep/ast/types/self.rb

@@ -27,7 +27,7 @@ module Steep
         end
 
         def free_variables
-          Set.new
+          @fvs ||= Set.new([self])
         end
 
         def level

data/lib/steep/ast/types/top.rb

@@ -26,9 +26,7 @@ module Steep
           "⟙"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [2]

data/lib/steep/ast/types/tuple.rb

@@ -30,9 +30,11 @@ module Steep
           "[#{types.join(", ")}]"
         end
 
-        def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

data/lib/steep/ast/types/union.rb

@@ -11,6 +11,9 @@ module Steep
         end
 
         def self.build(types:, location: nil)
+          return AST::Types::Bot.new if types.empty?
+          return types.first if types.size == 1
+
           types.flat_map do |type|
             if type.is_a?(Union)
               type.types
@@ -29,7 +32,7 @@ module Steep
               type
             end
           end.compact.uniq.yield_self do |tys|
-            case tys.length
+            case tys.size
             when 0
               AST::Types::Bot.new
             when 1
@@ -61,8 +64,10 @@ module Steep
         end
 
         def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

data/lib/steep/ast/types/var.rb

@@ -44,8 +44,8 @@ module Steep
           end
         end
 
-        def free_variables
-          Set.new([name])
+        def free_variables()
+          @fvs ||= Set.new([name])
         end
 
         def level

data/lib/steep/ast/types/void.rb

@@ -26,9 +26,7 @@ module Steep
           "void"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

data/lib/steep/interface/method_type.rb

@@ -211,10 +211,10 @@ module Steep
         end
       end
 
-      def free_variables
-        Set.new.tap do |fvs|
+      def free_variables()
+        @fvs ||= Set.new.tap do |set|
           each_type do |type|
-            fvs.merge type.free_variables
+            set.merge(type.free_variables)
           end
         end
       end
@@ -224,14 +224,29 @@ module Steep
       end
 
       def subst(s)
-        self.class.new(
-          required: required.map {|t| t.subst(s) },
-          optional: optional.map {|t| t.subst(s) },
-          rest: rest&.subst(s),
-          required_keywords: required_keywords.transform_values {|t| t.subst(s) },
-          optional_keywords: optional_keywords.transform_values {|t| t.subst(s) },
-          rest_keywords: rest_keywords&.subst(s)
-        )
+        return self if s.empty?
+        return self if empty?
+        return self if free_variables.disjoint?(s.domain)
+
+        rs = required.map {|t| t.subst(s) }
+        os = optional.map {|t| t.subst(s) }
+        r = rest&.subst(s)
+        rk = required_keywords.transform_values {|t| t.subst(s) }
+        ok = optional_keywords.transform_values {|t| t.subst(s) }
+        k = rest_keywords&.subst(s)
+
+        if rs == required && os == optional && r == rest && rk == required_keywords && ok == optional_keywords && k == rest_keywords
+          self
+        else
+          self.class.new(
+            required: required.map {|t| t.subst(s) },
+            optional: optional.map {|t| t.subst(s) },
+            rest: rest&.subst(s),
+            required_keywords: required_keywords.transform_values {|t| t.subst(s) },
+            optional_keywords: optional_keywords.transform_values {|t| t.subst(s) },
+            rest_keywords: rest_keywords&.subst(s)
+          )
+        end
       end
 
       def size
@@ -557,14 +572,19 @@ module Steep
       end
 
       def subst(s)
-        self.class.new(
-          type: type.subst(s),
-          optional: optional
-        )
+        ty = type.subst(s)
+        if ty == type
+          self
+        else
+          self.class.new(
+            type: ty,
+            optional: optional
+          )
+        end
       end
 
-      def free_variables
-        type.free_variables
+      def free_variables()
+        @fvs ||= type.free_variables
       end
 
       def to_s
@@ -617,10 +637,20 @@ module Steep
       end
 
       def free_variables
-        (params.free_variables + (block&.free_variables || Set.new) + return_type.free_variables) - Set.new(type_params)
+        @fvs ||= Set.new.tap do |set|
+          set.merge(params.free_variables)
+          if block
+            set.merge(block.free_variables)
+          end
+          set.merge(return_type.free_variables)
+          set.subtract(type_params)
+        end
       end
 
       def subst(s)
+        return self if s.empty?
+        return self if free_variables.disjoint?(s.domain)
+
         s_ = s.except(type_params)
 
         self.class.new(

data/lib/steep/interface/substitution.rb

@@ -26,7 +26,32 @@ module Steep
       end
 
       def self.empty
-        new(dictionary: {}, instance_type: AST::Types::Instance.new, module_type: AST::Types::Class.new, self_type: AST::Types::Self.new)
+        new(dictionary: {},
+            instance_type: INSTANCE_TYPE,
+            module_type: CLASS_TYPE,
+            self_type: SELF_TYPE)
+      end
+
+      def empty?
+        dictionary.empty? &&
+          instance_type.is_a?(AST::Types::Instance) &&
+          module_type.is_a?(AST::Types::Class) &&
+          self_type.is_a?(AST::Types::Self)
+      end
+
+      INSTANCE_TYPE = AST::Types::Instance.new
+      CLASS_TYPE = AST::Types::Class.new
+      SELF_TYPE = AST::Types::Self.new
+
+      def domain
+        set = Set.new
+
+        set.merge(dictionary.keys)
+        set << INSTANCE_TYPE unless instance_type.is_a?(AST::Types::Instance)
+        set << CLASS_TYPE unless instance_type.is_a?(AST::Types::Class)
+        set << SELF_TYPE unless instance_type.is_a?(AST::Types::Self)
+
+        set
       end
 
       def to_s
@@ -81,6 +106,11 @@ module Steep
             raise "Duplicated key on merge!: #{key}, #{a}, #{b}"
           end
         end
+
+        @instance_type = instance_type.subst(s)
+        @module_type = module_type.subst(s)
+        @self_type = self_type.subst(s)
+
         self
       end
 
@@ -92,7 +122,7 @@ module Steep
       end
 
       def add!(v, ty)
-        merge!(Substitution.new(dictionary: { v => ty }, instance_type: nil, module_type: nil, self_type: nil))
+        merge!(Substitution.new(dictionary: { v => ty }, instance_type: instance_type, module_type: module_type, self_type: self_type))
       end
     end
   end

data/lib/steep/server/base_worker.rb

@@ -12,6 +12,7 @@ module Steep
         @project = project
         @reader = reader
         @writer = writer
+        @shutdown = false
       end
 
       def handle_request(request)
@@ -28,7 +29,7 @@ module Steep
           Steep.logger.formatter.push_tags(*tags)
           Steep.logger.tagged "background" do
             while job = queue.pop
-              handle_job(job)
+              handle_job(job) unless @shutdown
             end
           end
         end
@@ -38,11 +39,11 @@ module Steep
             reader.read do |request|
               case request[:method]
               when "shutdown"
-                # nop
+                @shutdown = true
               when "exit"
                 break
               else
-                handle_request(request)
+                handle_request(request) unless @shutdown
               end
             end
           ensure

data/lib/steep/server/master.rb

@@ -23,6 +23,7 @@ module Steep
         @signature_worker = signature_worker
         @code_workers = code_workers
         @worker_to_paths = {}
+        @shutdown = false
       end
 
       def start
@@ -59,7 +60,7 @@ module Steep
         end
 
         while job = queue.pop
-          writer.write(job)
+          writer.write(job) unless @shutdown
         end
 
         writer.io.close
@@ -154,6 +155,7 @@ module Steep
 
         when "shutdown"
           queue << { id: id, result: nil }
+          @shutdown = true
 
         when "exit"
           queue << nil

data/lib/steep/subtyping/check.rb

@@ -302,10 +302,9 @@ module Steep
           when relation.sub_type.is_a?(AST::Types::Tuple) && relation.super_type.is_a?(AST::Types::Tuple)
             if relation.sub_type.types.size >= relation.super_type.types.size
               pairs = relation.sub_type.types.take(relation.super_type.types.size).zip(relation.super_type.types)
-              results = pairs.flat_map do |t1, t2|
+              results = pairs.map do |t1, t2|
                 relation = Relation.new(sub_type: t1, super_type: t2)
-                [check(relation, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints),
-                 check(relation.flip, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints)]
+                check(relation, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints)
               end
 
               if results.all?(&:success?)

data/lib/steep/type_construction.rb

@@ -1800,13 +1800,34 @@ module Steep
         when :or_asgn, :and_asgn
           yield_self do
             asgn, rhs = node.children
-            type, constr = synthesize(rhs, hint: hint)
 
             case asgn.type
             when :lvasgn
+              type, constr = synthesize(rhs, hint: hint)
               constr.lvasgn(asgn, type)
             when :ivasgn
+              type, constr = synthesize(rhs, hint: hint)
               constr.ivasgn(asgn, type)
+            when :send
+              rhs_ = node.updated(:send,
+                                  [
+                                    asgn.children[0],
+                                    :"#{asgn.children[1]}=",
+                                    asgn.children[2],
+                                    rhs
+                                  ])
+              node_type = case node.type
+                          when :or_asgn
+                            :or
+                          when :and_asgn
+                            :and
+                          end
+              node_ = node.updated(node_type, [asgn, rhs_])
+
+              synthesize(node_, hint: hint)
+            else
+              Steep.logger.error { "#{node.type} with #{asgn.type} lhs is not supported"}
+              fallback_to_any(node)
             end
           end
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.25.0"
+  VERSION = "0.27.0"
 end

data/smoke/hash/d.rb

@@ -2,5 +2,5 @@
 
 params = { id: 30, name: "Matz" }
 
-# !expects IncompatibleAssignment: lhs_type={ :name => ::String, :id => ::Integer }, rhs_type={ :id => ::String, :name => ::String, :email => ::String }
+# !expects IncompatibleAssignment: lhs_type={ :id => ::Integer, :name => ::String }, rhs_type={ :email => ::String, :id => ::String, :name => ::String }
 params = { id: "30", name: "foo", email: "matsumoto@soutaro.com" }

data/steep.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.1"
   spec.add_runtime_dependency "language_server-protocol", "~> 3.14.0.2"
-  spec.add_runtime_dependency "rbs", "~> 0.10.0"
+  spec.add_runtime_dependency "rbs", "~> 0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com