steep 1.10.0.pre.2 → 1.10.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd3b63cbd4f85f05eb3643505e5bff6c4a6d6a1384959c3a0660153030e9449
-  data.tar.gz: b4afe185ffc5f9e0907e97b2f6a60638b887dcecb8b8b57992d8a652b63d94f7
+  metadata.gz: d2f331bc22e08a6a06be70e413f4eb99361a2c868d6f38f1d4f05fc21778fc21
+  data.tar.gz: 3c6a8f14f8596926d4add8de3f7cdc72c27c6a47d90faadae4e4485c1f241dbc
 SHA512:
-  metadata.gz: 2060d786b8adf7d3876f3168f3fea26e999f6f4445cf8c109032e73ddcb99f2e4483706a4aedd1a61a9eb480cb9f42bcaea941f41d9ea9f843b84bcfa7cef3da
-  data.tar.gz: 875d9870e9c6082b428636b9e70c9e794008feb35b25a040aa608893e70bac5021f5cd4f0d9b44064f07851c134b17a148377906df0e90c547cf8359b01e9972
+  metadata.gz: 8e89df803b5c799cb50eb4a2e115f9dd189addfda847facfc87538a6cd46dd99fc87cff71a7c7939f97cce05a1e8b123b3ac289540c96ef6f23595bd2bea8a0a
+  data.tar.gz: 2e1844ebaf2e597b57bccf1b65bc3a97708e1f5b964daeb609fc4f692e4c92f64ca27f767ea4ac89178484c8ce8ca6d593d74117dfaff82dcf664874ca1495aa

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
-## 3.10.0.pre.2 (2025-03-14)
+## 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
 

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,
@@ -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,
@@ -4435,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,
@@ -4488,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]
@@ -4577,11 +4577,11 @@ 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_self_hint || self.self_type
@@ -4623,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre.2
+  version: 1.10.0.pre.3
 platform: ruby
 authors:
 - Soutaro Matsumoto