steep 0.22.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1008a3723d59bab0d00afb4b385ee2752d8679461416eba84e48cc9ae479b0a4
-  data.tar.gz: 58c470fe9d8c619d9d0767a392ab6557b6dc50b007c6c99ff6ad27a79a88ecd4
+  metadata.gz: 8e15a2388cd89e6b169243007211840853be8c126e035f7aa6434b00258e1087
+  data.tar.gz: e3bb8c7a1d816cb2667e7dc977f5e3155bcb9444e995a210bd58dc716a6a71b7
 SHA512:
-  metadata.gz: 6f1074ca3634f9df53f361f78a4838912cb7420918f72afdb08e49ab9d64bbe97177780a54648526ff3947b36ab2f0fb2fec3fce73ed97ce0b835359c81ff52d
-  data.tar.gz: b1c5b3fb447832fb648a56b4d827592ba0ddd719e384795786e27201a32305ce36a0d93edde61c94a311708599dd7090359bc1f15ae04ef0fa3717bd897cb580
+  metadata.gz: fb77f06dcef27e222984269a637966fa581cd78b3157c31a71793e8447f7059467140b7bb3f8f3e7f059a37492c9988f428234011ff7b3f7133a627f60a63cf4
+  data.tar.gz: 9319aebc6f74f89d055098312f460b2ed86ae9cfcd5c17bd21425c69e3ebe8838dffa3f4db9c99bc23bbc4657e4ee9f453bf1a2b3b7e4afe1531c0ba0ccb386c

data/CHANGELOG.md

@@ -2,6 +2,51 @@
 
 ## master
 
+## 0.28.0 (2020-09-17)
+
+* Fix typing case-when with empty body ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix lvasgn typing with `void` type hint ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix subtype checking between type variables and union types ([#200](https://github.com/soutaro/steep/pull/200))
+* Support endless range ([#200](https://github.com/soutaro/steep/pull/200))
+* Fix optarg, kwoptarg typing ([#202](https://github.com/soutaro/steep/pull/202))
+* Better union/intersection types ([#204](https://github.com/soutaro/steep/pull/204))
+* Fix generic method instantiation ([#205](https://github.com/soutaro/steep/pull/205))
+* Fix module typing ([#206](https://github.com/soutaro/steep/pull/206))
+* Fix shutdown problem ([#209](https://github.com/soutaro/steep/pull/209))
+* Update RBS to 0.12.0 ([#210](https://github.com/soutaro/steep/pull/210))
+* Improve processing singleton class decls without RBS ([#211](https://github.com/soutaro/steep/pull/211))
+* Improve processing block parameter with masgn ([#212](https://github.com/soutaro/steep/pull/212))
+
+## 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))
+* Improve `op_asgn` typing ([#189](https://github.com/soutaro/steep/pull/189))
+* Better multi-assignment support ([#183](https://github.com/soutaro/steep/pull/183), [#184](https://github.com/soutaro/steep/pull/184))
+* Support for loop and class variables ([#182](https://github.com/soutaro/steep/pull/182))
+* Fix tuple typing ([#181](https://github.com/soutaro/steep/pull/181))
+
+## 0.24.0 (2020-08-11)
+
+* Update RBS to 0.10 ([#180](https://github.com/soutaro/steep/pull/180))
+
+## 0.23.0 (2020-08-06)
+
+* Fix literal typing with hint ([#179](https://github.com/soutaro/steep/pull/179))
+* Fix literal type subtyping ([#178](https://github.com/soutaro/steep/pull/178))
+
 ## 0.22.0 (2020-08-03)
 
 * Improve signature validation ([#175](https://github.com/soutaro/steep/pull/175), [#177](https://github.com/soutaro/steep/pull/177))
@@ -51,7 +96,7 @@
 
 * Fix constant resolution ([#143](https://github.com/soutaro/steep/pull/143))
 * Fix RBS diagnostics line number in LSP ([#142](https://github.com/soutaro/steep/pull/142))
-* Fix crash caused by hover on `def` in LSP ([#140](https://github.com/soutaro/steep/pull/140)) 
+* Fix crash caused by hover on `def` in LSP ([#140](https://github.com/soutaro/steep/pull/140))
 
 ## 0.16.0 (2020-05-19)
 

data/bin/smoke_runner.rb

@@ -19,8 +19,6 @@ Expectation = Struct.new(:line, :message, :path, :starts) do
   attr_accessor :prefix_test
 end
 
-allowed_paths = []
-
 failed = false
 
 ARGV.each do |arg|
@@ -29,12 +27,13 @@ ARGV.each do |arg|
 
   rb_files = []
   expectations = []
-
+  allowed_paths = []
+  
   dir.children.each do |file|
     if file.extname == ".rb"
       buffer = ::Parser::Source::Buffer.new(file.to_s)
       buffer.source = file.read
-      parser = ::Parser::Ruby25.new
+      parser = ::Parser::Ruby27.new
 
       _, comments, _ = parser.tokenize(buffer)
       comments.each do |comment|

data/lib/steep.rb

@@ -1,7 +1,7 @@
 require "steep/version"
 
 require "pathname"
-require "parser/ruby25"
+require "parser/ruby27"
 require "ast_utils"
 require "active_support/core_ext/object/try"
 require "logger"

data/lib/steep/ast/builtin.rb

@@ -15,12 +15,8 @@ module Steep
           Types::Name::Instance.new(name: module_name, args: args)
         end
 
-        def class_type(constructor: nil)
-          Types::Name::Class.new(name: module_name, constructor: constructor)
-        end
-
         def module_type
-          Types::Name::Module.new(name: module_name)
+          Types::Name::Singleton.new(name: module_name)
         end
 
         def instance_type?(type, args: nil)
@@ -36,22 +32,8 @@ module Steep
           end
         end
 
-        NONE = ::Object.new
-
-        def class_type?(type, constructor: NONE)
-          if type.is_a?(Types::Name::Class)
-            unless constructor.equal?(NONE)
-              type.name == module_name && type.name.constructor == constructor
-            else
-              type.name == module_name
-            end
-          else
-            false
-          end
-        end
-
         def module_type?(type)
-          if type.is_a?(Types::Name::Module)
+          if type.is_a?(Types::Name::Singleton)
             type.name == module_name
           else
             false

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
@@ -36,7 +44,7 @@ module Steep
             Var.new(name: type.name, location: nil)
           when RBS::Types::ClassSingleton
             type_name = type_name(type.name)
-            Name::Class.new(name: type_name, location: nil, constructor: nil)
+            Name::Singleton.new(name: type_name, location: nil)
           when RBS::Types::ClassInstance
             type_name = type_name(type.name)
             args = type.args.map {|arg| type(arg) }
@@ -94,7 +102,7 @@ module Steep
             RBS::Types::Bases::Nil.new(location: nil)
           when Var
             RBS::Types::Variable.new(name: type.name, location: nil)
-          when Name::Class, Name::Module
+          when Name::Singleton
             RBS::Types::ClassSingleton.new(name: type_name_1(type.name), location: nil)
           when Name::Instance
             RBS::Types::ClassInstance.new(
@@ -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, overwrite: true) if subst2
 
           type = Interface::MethodType.new(
             type_params: type_params,
@@ -288,7 +300,7 @@ module Steep
         def expand_alias(type)
           unfolded = case type
                      when AST::Types::Name::Alias
-                       unfolded = unfold(type.name)
+                       unfold(type.name)
                      else
                        type
                      end
@@ -301,6 +313,7 @@ module Steep
         end
 
         def interface(type, private:, self_type: type)
+          Steep.logger.debug { "Factory#interface: #{type}, private=#{private}, self_type=#{self_type}" }
           type = expand_alias(type)
 
           case type
@@ -328,14 +341,15 @@ module Steep
               )
 
               definition.methods.each do |name, method|
-                next if method.private? && !private
+                Steep.logger.tagged "method = #{name}" do
+                  next if method.private? && !private
 
-                interface.methods[name] = Interface::Interface::Combination.overload(
-                  method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|ty| ty.subst(subst) }
-                  end,
-                  incompatible: name == :initialize || name == :new
-                )
+                  interface.methods[name] = Interface::Interface::Entry.new(
+                    method_types: method.method_types.map do |type|
+                      method_type(type, self_type: self_type, subst2: subst)
+                    end
+                  )
+                end
               end
             end
 
@@ -351,16 +365,15 @@ 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) }
-                  end,
-                  incompatible: method.attributes.include?(:incompatible)
+                interface.methods[name] = Interface::Interface::Entry.new(
+                  method_types: method.method_types.map do |type|
+                    method_type(type, self_type: self_type, subst2: subst)
+                  end
                 )
               end
             end
 
-          when Name::Class, Name::Module
+          when Name::Singleton
             Interface::Interface.new(type: self_type, private: private).tap do |interface|
               definition = definition_builder.build_singleton(type_name_1(type.name))
 
@@ -377,11 +390,10 @@ module Steep
               definition.methods.each do |name, method|
                 next if !private && method.private?
 
-                interface.methods[name] = Interface::Interface::Combination.overload(
-                  method.method_types.map do |type|
-                    method_type(type, self_type: self_type) {|type| type.subst(subst) }
-                  end,
-                  incompatible: method.attributes.include?(:incompatible)
+                interface.methods[name] = Interface::Interface::Entry.new(
+                  method_types: method.method_types.map do |type|
+                    method_type(type, self_type: self_type, subst2: subst)
+                  end
                 )
               end
             end
@@ -404,7 +416,25 @@ module Steep
                 Interface::Interface.new(type: self_type, private: private).tap do |interface|
                   common_methods = Set.new(interface1.methods.keys) & Set.new(interface2.methods.keys)
                   common_methods.each do |name|
-                    interface.methods[name] = Interface::Interface::Combination.union([interface1.methods[name], interface2.methods[name]])
+                    types1 = interface1.methods[name].method_types
+                    types2 = interface2.methods[name].method_types
+
+                    if types1 == types2
+                      interface.methods[name] = interface1.methods[name]
+                    else
+                      method_types = {}
+
+                      types1.each do |type1|
+                        types2.each do |type2|
+                          type = type1 | type2 or next
+                          method_types[type] = true
+                        end
+                      end
+
+                      unless method_types.empty?
+                        interface.methods[name] = Interface::Interface::Entry.new(method_types: method_types.keys)
+                      end
+                    end
                   end
                 end
               end
@@ -415,11 +445,8 @@ module Steep
               interfaces = type.types.map {|ty| interface(ty, private: private, self_type: self_type) }
               interfaces.inject do |interface1, interface2|
                 Interface::Interface.new(type: self_type, private: private).tap do |interface|
-                  all_methods = Set.new(interface1.methods.keys) + Set.new(interface2.methods.keys)
-                  all_methods.each do |name|
-                    methods = [interface1.methods[name], interface2.methods[name]].compact
-                    interface.methods[name] = Interface::Interface::Combination.intersection(methods)
-                  end
+                  interface.methods.merge!(interface1.methods)
+                  interface.methods.merge!(interface2.methods)
                 end
               end
             end
@@ -430,8 +457,8 @@ module Steep
               array_type = Builtin::Array.instance_type(element_type)
               interface(array_type, private: private, self_type: self_type).tap do |array_interface|
                 array_interface.methods[:[]] = array_interface.methods[:[]].yield_self do |aref|
-                  Interface::Interface::Combination.overload(
-                    type.types.map.with_index {|elem_type, index|
+                  Interface::Interface::Entry.new(
+                    method_types: type.types.map.with_index {|elem_type, index|
                       Interface::MethodType.new(
                         type_params: [],
                         params: Interface::Params.new(required: [AST::Types::Literal.new(value: index)],
@@ -444,14 +471,13 @@ module Steep
                         return_type: elem_type,
                         location: nil
                       )
-                    } + aref.types,
-                    incompatible: false
+                    } + aref.method_types
                   )
                 end
 
                 array_interface.methods[:[]=] = array_interface.methods[:[]=].yield_self do |update|
-                  Interface::Interface::Combination.overload(
-                    type.types.map.with_index {|elem_type, index|
+                  Interface::Interface::Entry.new(
+                    method_types: type.types.map.with_index {|elem_type, index|
                       Interface::MethodType.new(
                         type_params: [],
                         params: Interface::Params.new(required: [AST::Types::Literal.new(value: index), elem_type],
@@ -464,8 +490,35 @@ module Steep
                         return_type: elem_type,
                         location: nil
                       )
-                    } + update.types,
-                    incompatible: false
+                    } + update.method_types
+                  )
+                end
+
+                array_interface.methods[:first] = array_interface.methods[:first].yield_self do |first|
+                  Interface::Interface::Entry.new(
+                    method_types: [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types[0] || AST::Builtin.nil_type,
+                        location: nil
+                      )
+                    ]
+                  )
+                end
+
+                array_interface.methods[:last] = array_interface.methods[:last].yield_self do |last|
+                  Interface::Interface::Entry.new(
+                    method_types: [
+                      Interface::MethodType.new(
+                        type_params: [],
+                        params: Interface::Params.empty,
+                        block: nil,
+                        return_type: type.types.last || AST::Builtin.nil_type,
+                        location: nil
+                      )
+                    ]
                   )
                 end
               end
@@ -481,8 +534,8 @@ module Steep
 
               interface(hash_type, private: private, self_type: self_type).tap do |hash_interface|
                 hash_interface.methods[:[]] = hash_interface.methods[:[]].yield_self do |ref|
-                  Interface::Interface::Combination.overload(
-                    type.elements.map {|key_value, value_type|
+                  Interface::Interface::Entry.new(
+                    method_types: type.elements.map {|key_value, value_type|
                       key_type = Literal.new(value: key_value, location: nil)
                       Interface::MethodType.new(
                         type_params: [],
@@ -496,14 +549,13 @@ module Steep
                         return_type: value_type,
                         location: nil
                       )
-                    } + ref.types,
-                    incompatible: false
+                    } + ref.method_types
                   )
                 end
 
                 hash_interface.methods[:[]=] = hash_interface.methods[:[]=].yield_self do |update|
-                  Interface::Interface::Combination.overload(
-                    type.elements.map {|key_value, value_type|
+                  Interface::Interface::Entry.new(
+                    method_types: type.elements.map {|key_value, value_type|
                       key_type = Literal.new(value: key_value, location: nil)
                       Interface::MethodType.new(
                         type_params: [],
@@ -517,8 +569,7 @@ module Steep
                         return_type: value_type,
                         location: nil
                       )
-                    } + update.types,
-                    incompatible: false
+                    } + update.method_types
                   )
                 end
               end
@@ -534,8 +585,8 @@ module Steep
                 location: nil
               )
 
-              interface.methods[:[]] = Interface::Interface::Combination.overload([method_type], incompatible: false)
-              interface.methods[:call] = Interface::Interface::Combination.overload([method_type], incompatible: false)
+              interface.methods[:[]] = Interface::Interface::Entry.new(method_types: [method_type])
+              interface.methods[:call] = Interface::Interface::Entry.new(method_types: [method_type])
             end
 
           else