steep 0.20.0 → 0.25.0

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.20.0"
+  VERSION = "0.25.0"
 end

data/smoke/class/a.rbs

@@ -18,7 +18,6 @@ class D
   def foo: -> untyped
 end
 
-class E
-  def initialize: () -> untyped
+interface _E
   def foo: -> untyped
 end

data/smoke/class/f.rb

@@ -1,8 +1,10 @@
-# @type var e: E
+# @type var e: _E
 # @type var d: D
 
 e = (_ = nil)
 d = (_ = nil)
 
 e = d
+
+# !expects IncompatibleAssignment: lhs_type=::D, rhs_type=::_E
 d = e

data/steep.gemspec

@@ -28,18 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_development_dependency "bundler", ">= 1.13"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "racc", "~> 1.4"
-  spec.add_development_dependency "minitest-reporters", "~> 1.4.2"
-  spec.add_development_dependency "minitest-hooks", "~> 1.5.0"
-
   spec.add_runtime_dependency "parser", "~> 2.7.0"
   spec.add_runtime_dependency "ast_utils", "~> 0.3.0"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   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.6.0", '< 0.7.0'
+  spec.add_runtime_dependency "rbs", "~> 0.10.0"
 end

metadata

@@ -1,99 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: minitest-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -188,22 +104,16 @@ dependencies:
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -224,6 +134,7 @@ files:
 - bin/console
 - bin/setup
 - bin/smoke_runner.rb
+- bin/steep-prof
 - exe/steep
 - lib/steep.rb
 - lib/steep/annotation_parser.rb