steep 0.22.0 → 0.28.0

data/lib/steep/type_inference/block_params.rb

@@ -56,6 +56,11 @@ module Steep
 
         node.children.each do |arg|
           var = arg.children.first
+
+          if var.is_a?(::AST::Node)
+            return
+          end
+
           type = annotations.var_type(lvar: var.name)
 
           case arg.type

data/lib/steep/type_inference/constant_env.rb

@@ -26,7 +26,7 @@ module Steep
             factory.type(constant.type)
           end
         rescue => exn
-          Steep.logger.error "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
+          Steep.logger.debug "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
           nil
         end
       end

data/lib/steep/type_inference/context.rb

@@ -70,6 +70,14 @@ module Steep
         def const_context
           const_env.context
         end
+
+        def class_variables
+          if module_definition
+            @class_variables ||= module_definition.class_variables.transform_values do |var_def|
+              var_def.type
+            end
+          end
+        end
       end
 
       attr_reader :method_context

data/lib/steep/type_inference/context_array.rb

@@ -35,12 +35,13 @@ module Steep
 
       def insert_context(range, context:, entry: self.root)
         entry.sub_entries.each do |sub|
-          next if sub.range.begin < range.begin && range.end <= sub.range.end
-          next if range.begin < sub.range.begin && sub.range.end <= range.end
+          next if sub.range.begin <= range.begin && range.end <= sub.range.end
+          next if range.begin <= sub.range.begin && sub.range.end <= range.end
           next if range.end <= sub.range.begin
           next if sub.range.end <= range.begin
 
-          raise "Range crossing: sub range=#{sub.range}, new range=#{range}"
+          Steep.logger.error { "Range crossing: sub range=#{sub.range}, new range=#{range}" }
+          raise
         end
 
         sup = entry.sub_entries.find do |sub|

data/lib/steep/type_inference/logic.rb

@@ -47,6 +47,37 @@ module Steep
             f.merge([node])
           ]
 
+        when :masgn
+          lhs, rhs = node.children
+
+          lt, lf = nodes(node: lhs)
+          rt, rf = nodes(node: rhs)
+
+          [
+            (lt + rt).merge([node]),
+            (lf + rf).merge([node])
+          ]
+
+        when :mlhs
+          nodes = [node]
+
+          node.children.each do |child|
+            case child.type
+            when :lvasgn
+              nodes << child
+            when :splat
+              if node.children[0].type == :lvasgn
+                nodes << child
+                nodes << child.children[0]
+              end
+            end
+          end
+
+          [
+            Result.new(nodes),
+            Result.new(nodes)
+          ]
+
         when :and
           lhs, rhs = node.children
 

data/lib/steep/typing.rb

@@ -126,6 +126,13 @@ module Steep
         end_pos = node.loc.end.begin_pos
         add_context(begin_pos..end_pos, context: context)
 
+      when :for
+        _, collection, _ = node.children
+
+        begin_pos = collection.loc.expression.end_pos
+        end_pos = node.loc.end.begin_pos
+
+        add_context(begin_pos..end_pos, context: context)
       else
         raise "Unexpected node for insert_context: #{node.type}"
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.22.0"
+  VERSION = "0.28.0"
 end

data/smoke/alias/a.rb

@@ -1,7 +1,7 @@
 # @type var x: foo
 x = ""
 
-# !expects ArgumentTypeMismatch: receiver=(::Integer | ::String), expected=::string, actual=::Integer
+# !expects* UnresolvedOverloading: receiver=(::String | ::Integer), method_name=+,
 x + 123
 
 # @type var y: bar

data/smoke/case/a.rb

@@ -1,6 +1,6 @@
 # @type var a: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::String] | ::Integer | ::String | nil)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::Array[::String] | nil | ::String)
 a = case 1
     when 2
       1

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/smoke/if/a.rb

@@ -13,7 +13,7 @@ else
   "baz"
 end
 
-# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=(::String | ::Integer)
 a = if z
       "foofoo"
     else

data/smoke/module/a.rb

@@ -13,7 +13,7 @@ module A
     # !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Integer
     s = n
 
-    # !expects NoMethodError: type=(::A & ::Object & ::_Each2[::Integer, ::A]), method=foo
+    # !expects NoMethodError: type=(::Object & ::_Each2[::Integer, ::A] & ::A), method=foo
     foo()
 
     n

data/smoke/rescue/a.rb

@@ -1,6 +1,6 @@
 # @type var a: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Integer)
 a = begin
       'foo'
     rescue
@@ -9,12 +9,12 @@ a = begin
 
 # @type var b: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Integer)
 b = 'foo' rescue 1
 
 # @type var c: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String | ::Symbol)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Symbol | ::Integer)
 c = begin
       'foo'
     rescue RuntimeError
@@ -23,18 +23,9 @@ c = begin
       1
     end
 
-# @type var d: Integer
-
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=::String
-d = begin
-      1
-    else
-      'foo'
-    end
-
 # @type var e: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Integer | ::Symbol)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Symbol | ::Integer)
 e = begin
       'foo'
     rescue RuntimeError

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.9.0"
+  spec.add_runtime_dependency "rbs", "~> 0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.12.0
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -374,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gradual Typing for Ruby