steep 0.42.0 → 0.43.0

data/lib/steep/type_inference/block_params.rb

@@ -61,7 +61,7 @@ module Steep
             return
           end
 
-          type = annotations.var_type(lvar: var.name)
+          type = annotations.var_type(lvar: var)
 
           case arg.type
           when :arg, :procarg0

data/lib/steep/type_inference/context.rb

@@ -78,6 +78,28 @@ module Steep
             end
           end
         end
+
+        def update(
+          instance_type: self.instance_type,
+          module_type: self.module_type,
+          implement_name: self.implement_name,
+          current_namespace: self.current_namespace,
+          const_env: self.const_env,
+          class_name: self.class_name,
+          instance_definition: self.instance_definition,
+          module_definition: self.module_definition
+        )
+          ModuleContext.new(
+            instance_type: instance_type,
+            module_type: module_type,
+            implement_name: implement_name,
+            current_namespace: current_namespace,
+            const_env: const_env,
+            class_name: class_name,
+            instance_definition: instance_definition,
+            module_definition: module_definition
+          )
+        end
       end
 
       attr_reader :call_context

data/lib/steep/type_inference/logic.rb

@@ -22,7 +22,7 @@ module Steep
           nodes.each do |node|
             case node.type
             when :lvar, :lvasgn
-              vars << node.children[0].name
+              vars << node.children[0]
             end
           end
 

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -159,16 +159,16 @@ module Steep
       def decompose_value(node)
         case node.type
         when :lvar
-          [node, Set[node.children[0].name]]
+          [node, Set[node.children[0]]]
         when :masgn
           lhs, rhs = node.children
-          lhs_vars = lhs.children.select {|m| m.type == :lvasgn }.map {|m| m.children[0].name }
+          lhs_vars = lhs.children.select {|m| m.type == :lvasgn }.map {|m| m.children[0] }
           val, vars = decompose_value(rhs)
           [val, vars + lhs_vars]
         when :lvasgn
           var, rhs = node.children
           val, vars = decompose_value(rhs)
-          [val, vars + [var.name]]
+          [val, vars + [var]]
         when :begin
           decompose_value(node.children.last)
         when :and

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.42.0"
+  VERSION = "0.43.0"
 end

data/smoke/implements/b.rb

@@ -0,0 +1,13 @@
+class B
+  Request = _ = Struct.new(:method, :path, keyword_init: true) do
+    # @implements Request
+
+    def post?
+      method == "POST"
+    end
+
+    def get?
+      method == "GET"
+    end
+  end
+end

data/smoke/implements/b.rbs

@@ -0,0 +1,12 @@
+class B
+  class Request
+    attr_reader method: String
+    attr_reader path: String
+
+    def initialize: (method: String, path: String) -> void
+
+    def post?: () -> bool
+
+    def get?: () -> bool
+  end
+end

data/smoke/regression/issue_328.rb

@@ -0,0 +1 @@
+["abc", "d", ""].to_h { |e| [e, e.size] }

data/smoke/regression/issue_332.rb

@@ -0,0 +1,11 @@
+module Issue332
+  module TimeDurationExtensions
+    def -(other)
+      if other.is_a?(Duration)
+        Time.now
+      else
+        super(other)
+      end
+    end
+  end
+end

data/smoke/regression/issue_332.rbs

@@ -0,0 +1,19 @@
+module Issue332
+  class Duration
+  end
+
+  interface _TimeDurationExtensions
+    def -: (Numeric other) -> Time
+         | (Time other) -> Float
+  end
+
+  module TimeDurationExtensions : _TimeDurationExtensions
+    def -: (Duration other) -> Time
+         | ...
+  end
+end
+
+class Time
+  prepend Issue332::TimeDurationExtensions
+end
+

data/smoke/regression/masgn.rb

@@ -0,0 +1,4 @@
+* = [1,2,3]
+*, a = [1,2,3]
+
+p a

data/smoke/regression/test_expectations.yml

@@ -1,4 +1,21 @@
 ---
+- file: issue_332.rb
+  diagnostics:
+  - range:
+      start:
+        line: 7
+        character: 8
+      end:
+        line: 7
+        character: 20
+    severity: ERROR
+    message: |-
+      Cannot find compatible overloading of method `-` of type `(::Object & ::Issue332::_TimeDurationExtensions & ::Issue332::TimeDurationExtensions)`
+      Method types:
+        def -: (::Issue332::Duration) -> ::Time
+             | (::Numeric) -> ::Time
+             | (::Time) -> ::Float
+    code: Ruby::UnresolvedOverloading
 - file: set_divide.rb
   diagnostics:
   - range:
@@ -41,3 +58,15 @@
     severity: ERROR
     message: Type `::String` does not have method `ggggg`
     code: Ruby::NoMethod
+- file: thread.rb
+  diagnostics:
+  - range:
+      start:
+        line: 6
+        character: 13
+      end:
+        line: 7
+        character: 3
+    severity: ERROR
+    message: The method cannot be called with a block
+    code: Ruby::UnexpectedBlockGiven

data/smoke/regression/thread.rb

@@ -0,0 +1,7 @@
+Thread.new do
+  Thread.stop
+end
+
+
+Thread.start do
+end

data/smoke/super/test_expectations.yml

@@ -55,7 +55,7 @@
         line: 26
         character: 11
     severity: ERROR
-    message: UnexpectedSuper
+    message: No superclass method `baz` defined
     code: Ruby::UnexpectedSuper
   - range:
       start:
@@ -65,15 +65,5 @@
         line: 28
         character: 9
     severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
-  - range:
-      start:
-        line: 28
-        character: 4
-      end:
-        line: 28
-        character: 9
-    severity: ERROR
-    message: UnexpectedSuper
+    message: No superclass method `baz` defined
     code: Ruby::UnexpectedSuper

data/steep.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_runtime_dependency "parser", ">= 2.7"
-  spec.add_runtime_dependency "ast_utils", ">= 0.4.0"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
-  spec.add_runtime_dependency "language_server-protocol", "~> 3.15.0.1"
+  spec.add_runtime_dependency "language_server-protocol", ">= 3.15", "< 4.0"
   spec.add_runtime_dependency "rbs", "~> 1.1.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
+  spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: ast_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +76,22 @@ dependencies:
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.0.1
+        version: '3.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.0.1
+        version: '3.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +120,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -385,6 +397,8 @@ files:
 - smoke/implements/Steepfile
 - smoke/implements/a.rb
 - smoke/implements/a.rbs
+- smoke/implements/b.rb
+- smoke/implements/b.rbs
 - smoke/implements/test_expectations.yml
 - smoke/initialize/Steepfile
 - smoke/initialize/a.rb
@@ -437,11 +451,17 @@ files:
 - smoke/regression/fun.rb
 - smoke/regression/fun.rbs
 - smoke/regression/hash.rb
+- smoke/regression/issue_328.rb
+- smoke/regression/issue_328.rbs
+- smoke/regression/issue_332.rb
+- smoke/regression/issue_332.rbs
+- smoke/regression/masgn.rb
 - smoke/regression/poly_new.rb
 - smoke/regression/poly_new.rbs
 - smoke/regression/range.rb
 - smoke/regression/set_divide.rb
 - smoke/regression/test_expectations.yml
+- smoke/regression/thread.rb
 - smoke/rescue/Steepfile
 - smoke/rescue/a.rb
 - smoke/rescue/test_expectations.yml