steep 1.10.0.pre.1 → 1.10.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2233f51ac985ee697a7f3617582dc034f32b1cd3b0732a87b8184210f2c1d7b0
-  data.tar.gz: 1298685cafa59f5074afa950df4c1f14cff9a8b6be9b99b914902b37e537aad3
+  metadata.gz: d2f331bc22e08a6a06be70e413f4eb99361a2c868d6f38f1d4f05fc21778fc21
+  data.tar.gz: 3c6a8f14f8596926d4add8de3f7cdc72c27c6a47d90faadae4e4485c1f241dbc
 SHA512:
-  metadata.gz: 1cb518e2f5743330e58b0c6032ed99d22f29254b91d9c8e33e3bafc3cb1a9f46247f181ee5b9b078dba13768f675f03b1c2e8fb24b53609902d6534092625282
-  data.tar.gz: e26fde370f8d793b13138d71dc6295ffde59e781ed2d0a39cf73e639c8440517d7fa13586d871c9eab6880ae8864c31a711beb45c49280152416d0111935f3da
+  metadata.gz: 8e89df803b5c799cb50eb4a2e115f9dd189addfda847facfc87538a6cd46dd99fc87cff71a7c7939f97cce05a1e8b123b3ac289540c96ef6f23595bd2bea8a0a
+  data.tar.gz: 2e1844ebaf2e597b57bccf1b65bc3a97708e1f5b964daeb609fc4f692e4c92f64ca27f767ea4ac89178484c8ce8ca6d593d74117dfaff82dcf664874ca1495aa

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 1.10.0.pre.3 (2025-03-14)
+
+### Type checker core
+
+* Fix block type checking ([#1534](https://github.com/soutaro/steep/pull/1534))
+
+## 1.10.0.pre.2 (2025-03-14)
+
+### Type checker core
+
+* Fix `self` type handling at block-self-hint ([#1531](https://github.com/soutaro/steep/pull/1531))
+* Delay type variable resolution on method call with blocks ([#1530](https://github.com/soutaro/steep/pull/1530))
+* Fix type checking block calls on `untyped` receiver ([#1528](https://github.com/soutaro/steep/pull/1528))
+* Catch the message of VariableDuplicationError ([#1521](https://github.com/soutaro/steep/pull/1521))
+
 ## 1.10.0.pre.1 (2025-03-11)
 
 ### Type checker core

data/Rakefile

@@ -224,3 +224,26 @@ NOTES
     end
   end
 end
+
+namespace :rbs do
+  task :watch do
+    require "listen"
+    listener = Listen.to('test') do |modified, added, removed|
+      paths = (modified + added).map do
+        Pathname(_1).relative_path_from(Pathname.pwd)
+      end
+      sh "rbs-inline", "--opt-out", "--output=sig", *paths.map(&:to_s)
+    end
+    listener.start
+    begin
+      sleep
+    rescue Interrupt
+      listener.stop
+    end
+  end
+
+  task :generate do
+    sh "rbs-inline --opt-out --output=sig test"
+    sh "rbs-inline --opt-out --output=tmp/rbs-inline bin/generate-diagnostics-docs.rb"
+  end
+end

data/lib/steep/diagnostic/signature.rb

@@ -273,6 +273,30 @@ module Steep
         end
       end
 
+      class VariableDuplicationError < Base
+        attr_reader :type_name
+        attr_reader :variable_name
+        attr_reader :location
+
+        def initialize(type_name:, variable_name:, location:)
+          @type_name = type_name
+          @variable_name = variable_name
+          @location = location
+        end
+      end
+
+      class InstanceVariableDuplicationError < VariableDuplicationError
+        def header_line
+          "Duplicated instance variable name `#{variable_name}` in `#{type_name}`"
+        end
+      end
+
+      class ClassInstanceVariableDuplicationError < VariableDuplicationError
+        def header_line
+          "Duplicated class instance variable name `#{variable_name}` in `#{type_name}`"
+        end
+      end
+
       class ClassVariableDuplicationError < Base
         attr_reader :class_name
         attr_reader :other_class_name
@@ -581,6 +605,10 @@ module Steep
           Diagnostic::Signature::CyclicClassAliasDefinitionError.new(decl: error.alias_entry.decl)
         when RBS::TypeParamDefaultReferenceError
           Diagnostic::Signature::TypeParamDefaultReferenceError.new(error.type_param, location: error.location)
+        when RBS::InstanceVariableDuplicationError
+          Diagnostic::Signature::InstanceVariableDuplicationError.new(type_name: error.type_name, variable_name: error.variable_name, location: error.location)
+        when RBS::ClassInstanceVariableDuplicationError
+          Diagnostic::Signature::ClassInstanceVariableDuplicationError.new(type_name: error.type_name, variable_name: error.variable_name, location: error.location)
         else
           raise error
         end

data/lib/steep/source.rb

@@ -257,7 +257,7 @@ module Steep
         annot.line or next
 
         case node.type
-        when :def, :module, :class, :block, :ensure, :defs, :resbody
+        when :def, :module, :class, :block, :numblock, :ensure, :defs, :resbody
           location = node.loc
           location.line <= annot.line && annot.line < location.last_line
         else

data/lib/steep/type_construction.rb

@@ -3108,7 +3108,7 @@ module Steep
         body_node,
         block_params: params,
         block_param_hint: params_hint,
-        block_type_hint: return_hint,
+        block_next_type: return_hint,
         block_block_hint: block_hint,
         block_annotations: block_annotations,
         block_self_hint: self_hint,
@@ -3458,7 +3458,7 @@ module Steep
             block_annotations = source.annotations(block: node, factory: checker.factory, context: nesting)
             block_params or raise
 
-            constr = constr.synthesize_children(node.children[0])
+            constr = constr.synthesize_children(node.children[0], skips: [receiver])
 
             constr.type_block_without_hint(
               node: node,
@@ -4064,7 +4064,7 @@ module Steep
                 block_body,
                 block_params: block_params_,
                 block_param_hint: method_type.block.type.params,
-                block_type_hint: method_type.block.type.return_type,
+                block_next_type: method_type.block.type.return_type,
                 block_block_hint: nil,
                 block_annotations: block_annotations,
                 block_self_hint: method_type.block.self_type,
@@ -4119,6 +4119,15 @@ module Steep
 
                 fvs_.merge(method_type.type.params.free_variables) if method_type.type.params
                 fvs_.merge(method_type.block.type.params.free_variables) if method_type.block.type.params
+                (method_type.type.return_type.free_variables + method_type.block.type.return_type.free_variables).each do |var|
+                  if var.is_a?(Symbol)
+                    if constraints.unknown?(var)
+                      unless constraints.has_constraint?(var)
+                        fvs_.delete(var)
+                      end
+                    end
+                  end
+                end
 
                 constraints.solution(checker, variables: fvs_, context: ccontext)
               }
@@ -4130,7 +4139,7 @@ module Steep
                 block_constr = block_constr.update_type_env {|env| env.subst(s) }
                 block_constr = block_constr.update_context {|context|
                   context.with(
-                    self_type: method_type.block.self_type || context.self_type,
+                    self_type: context.self_type.subst(s),
                     type_env: context.type_env.subst(s),
                     block_context: context.block_context&.subst(s),
                     break_context: context.break_context&.subst(s)
@@ -4426,7 +4435,7 @@ module Steep
         block_body,
         block_params: block_params,
         block_param_hint: nil,
-        block_type_hint: nil,
+        block_next_type: nil,
         block_block_hint: nil,
         block_annotations: block_annotations,
         block_self_hint: nil,
@@ -4479,7 +4488,7 @@ module Steep
       end
     end
 
-    def for_block(body_node, block_params:, block_param_hint:, block_type_hint:, block_block_hint:, block_annotations:, node_type_hint:, block_self_hint:)
+    def for_block(body_node, block_params:, block_param_hint:, block_next_type:, block_block_hint:, block_annotations:, node_type_hint:, block_self_hint:)
       block_param_pairs = block_param_hint && block_params.zip(block_param_hint, block_block_hint, factory: checker.factory)
 
       # @type var param_types_hash: Hash[Symbol?, AST::Types::t]
@@ -4568,19 +4577,18 @@ module Steep
                    end
 
       block_context = TypeInference::Context::BlockContext.new(
-        body_type: block_annotations.block_type || block_type_hint
+        body_type: block_annotations.block_type
       )
       break_context = TypeInference::Context::BreakContext.new(
         break_type: break_type || AST::Builtin.any_type,
-        next_type: block_context.body_type || AST::Builtin.any_type
+        next_type: block_next_type || AST::Builtin.any_type
       )
 
-      self_type = block_annotations.self_type || block_self_hint || self.self_type
+      self_type = block_self_hint || self.self_type
       module_context = self.module_context
 
       if implements = block_annotations.implement_module_annotation
         module_context = default_module_context(implements.name, nesting: nesting)
-
         self_type = module_context.module_type
       end
 
@@ -4588,6 +4596,11 @@ module Steep
         self_type = annotation_self_type
       end
 
+      # self_type here means the top-level `self` type because of the `Interface::Builder` implementation
+      if self_type
+        self_type = expand_self(self_type)
+      end
+
       self.class.new(
         checker: checker,
         source: source,
@@ -4610,6 +4623,20 @@ module Steep
       if block_body
         body_type, _, context = synthesize(block_body, hint: block_context&.body_type || block_type_hint)
 
+        if annotated_body_type = block_context&.body_type
+          if result = no_subtyping?(sub_type: body_type, super_type: annotated_body_type)
+            typing.add_error(
+              Diagnostic::Ruby::BlockBodyTypeMismatch.new(
+                node: node,
+                expected: annotated_body_type,
+                actual: body_type,
+                result: result
+              )
+            )
+          end
+          body_type = annotated_body_type
+        end
+
         range = block_body.loc.expression.end_pos..node.loc.end.begin_pos
         typing.cursor_context.set(range, context)
 

data/lib/steep/type_inference/context.rb

@@ -155,6 +155,10 @@ module Steep
         @type_env = type_env
         @call_context = call_context
         @variable_context = variable_context
+
+        if self_type.free_variables.include?(AST::Types::Self.instance)
+          raise "Context#self_type cannot contain `self`"
+        end
       end
 
       def with(method_context: self.method_context,

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.10.0.pre.1"
+  VERSION = "1.10.0.pre.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre.1
+  version: 1.10.0.pre.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 bindir: exe
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser