steep 0.49.0 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0273968ec727f3b7c5c1007f9e27966c50ad7bc3128217a4ef30be4f97321037'
-  data.tar.gz: 195eb670673894e36af5e00ef911654f2a543c71e8de1d46c15e23035bef19c8
+  metadata.gz: 44df04a21f7dc9d7514ad6acb34549f40fe0b4d962840c29ced4ceca926fd000
+  data.tar.gz: 15ac298575e8af8d29c1b1ab5e2894f3e62677dedd58b166d147d3d1649026d3
 SHA512:
-  metadata.gz: '0908edc4a3221256f450c9fd945d7127bd9ece3fa0359b7da88be8cebea30f7c766e023b84527e89e8f0c7956752310a3b0e98343b8c4808bfde518a89284456'
-  data.tar.gz: 4004adb0d0e8f2e0cd2629cd7e0c2bd6513a3a48bbd96d1d77621bbe0979b73686ab9c8ad718e3243081fdf492ff9728b5bf6df8e7357e1b1cf810393dad264c
+  metadata.gz: cdc1e1dea1ef2aa9cebd6d40a850894340e2d0ed26f8a982c81c80d384522712c442a499ef12419b0b224cd1bb659944198b8dc897eea692e4d6c06284c86381
+  data.tar.gz: 22a8d55bd324e3527ffd2a8886bbf7fe28e766ab2dab1e175c43a08b37d256c647f39a05e7890ed5b2726934428bb303c1fe98c45ad07166df2fb2698cc835af

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 0.49.1 (2022-03-11)
+
+* Fix lambda typing ([\#506](https://github.com/soutaro/steep/pull/506))
+* Validate type descendants ([\#507](https://github.com/soutaro/steep/pull/507))
+* Fix print error with absolute path ([\#508](https://github.com/soutaro/steep/pull/508))
+* Skip non-target ruby code on `steep stats` ([\#509](https://github.com/soutaro/steep/pull/509))
+
 ## 0.49.0 (2022-03-08)
 
 * Better typing for `#flat_map` ([\#504](https://github.com/soutaro/steep/pull/504))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (0.49.0)
+    steep (0.49.1)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
@@ -24,7 +24,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/lib/steep/diagnostic/ruby.rb

@@ -669,6 +669,19 @@ module Steep
         end
       end
 
+      class ProcTypeExpected < Base
+        attr_reader :type
+
+        def initialize(node:, type:)
+          super(node: node)
+          @type = type
+        end
+
+        def header_line
+          "Proc type is expected but `#{type.to_s}` is specified"
+        end
+      end
+
       class UnsupportedSyntax < Base
         attr_reader :message
 

data/lib/steep/drivers/check.rb

@@ -214,8 +214,8 @@ module Steep
           total = errors.sum {|notification| notification[:diagnostics].size }
 
           errors.each do |notification|
-            path = project.relative_path(Pathname(URI.parse(notification[:uri]).path))
-            buffer = RBS::Buffer.new(name: path, content: path.read)
+            path = Pathname(URI.parse(notification[:uri]).path)
+            buffer = RBS::Buffer.new(name: project.relative_path(path), content: path.read)
             printer = DiagnosticPrinter.new(buffer: buffer, stdout: stdout)
 
             notification[:diagnostics].each do |diag|

data/lib/steep/services/type_check_service.rb

@@ -269,6 +269,8 @@ module Steep
       end
 
       def typecheck_source(path:, target: project.target_for_source_path(path), &block)
+        return unless target
+
         Steep.logger.tagged "#typecheck_source(path=#{path})" do
           Steep.measure "typecheck" do
             signature_service = signature_services[target.name]

data/lib/steep/signature/validator.rb

@@ -89,11 +89,7 @@ module Steep
         end
       end
 
-      def validate_type(type)
-        Steep.logger.debug "#{Location.to_string type.location}: Validating #{type}..."
-
-        validator.validate_type type, context: [RBS::Namespace.root]
-
+      def validate_type_application(type)
         name, type_params, type_args =
           case type
           when RBS::Types::ClassInstance
@@ -123,6 +119,17 @@ module Steep
             validate_type_application_constraints(type.name, type_params, type_args, location: type.location)
           end
         end
+
+        type.each_type do |child|
+          validate_type_application(child)
+        end
+      end
+
+      def validate_type(type)
+        Steep.logger.debug "#{Location.to_string type.location}: Validating #{type}..."
+
+        validator.validate_type type, context: [RBS::Namespace.root]
+        validate_type_application(type)
       end
 
       def ancestor_to_type(ancestor)

data/lib/steep/type_construction.rb

@@ -2727,10 +2727,24 @@ module Steep
       end
     end
 
+    def optional_proc?(type)
+      if type.is_a?(AST::Types::Union)
+        if type.types.size == 2
+          if type.types.find {|t| t.is_a?(AST::Types::Nil) }
+            if proc_type = type.types.find {|t| t.is_a?(AST::Types::Proc) }
+              proc_type
+            end
+          end
+        end
+      end
+    end
+
     def type_lambda(node, params_node:, body_node:, type_hint:)
       block_annotations = source.annotations(block: node, factory: checker.factory, current_module: current_namespace)
       params = TypeInference::BlockParams.from_node(params_node, annotations: block_annotations)
 
+      type_hint = deep_expand_alias(type_hint) if type_hint
+
       case type_hint
       when AST::Types::Proc
         params_hint = type_hint.type.params
@@ -2749,6 +2763,13 @@ module Steep
 
       block_constr.typing.add_context_for_body(node, context: block_constr.context)
 
+      default_proc_function =
+        Interface::Function.new(
+          params: Interface::Function::Params.empty,
+          return_type: AST::Builtin.any_type,
+          location: nil
+        )
+
       params.params.each do |param|
         _, block_constr = block_constr.synthesize(param.node, hint: param.type)
       end
@@ -2759,17 +2780,29 @@ module Steep
             case block_param_type
             when AST::Types::Proc
               Interface::Block.new(type: block_param_type.type, optional: false)
-            when AST::Types::Union
-              if block_param_type.types.size == 2
-                if block_param_type.types.find {|t| t.is_a?(AST::Types::Nil) }
-                  if proc_type = block_param_type.types.find {|t| t.is_a?(AST::Types::Proc) }
-                    Interface::Block.new(type: proc_type.type, optional: true)
-                  end
-                end
+            else
+              if proc_type = optional_proc?(block_param_type)
+                Interface::Block.new(type: proc_type.type, optional: true)
+              else
+                block_constr.typing.add_error(
+                  Diagnostic::Ruby::ProcTypeExpected.new(
+                    node: block_param.node,
+                    type: block_param_type
+                  )
+                )
+
+                Interface::Block.new(
+                  type: Interface::Function.new(
+                    params: Interface::Function::Params.empty,
+                    return_type: AST::Builtin.any_type,
+                    location: nil
+                  ),
+                  optional: false
+                )
               end
             end
           else
-            type_hint.block
+            block_hint
           end
         end
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.49.0"
+  VERSION = "0.49.1"
 end

data/smoke/diagnostics/proc_type_expected.rb

@@ -0,0 +1,3 @@
+-> (&block) do
+  # @type var block: Integer
+end

data/smoke/diagnostics/test_expectations.yml

@@ -332,6 +332,18 @@
     severity: ERROR
     message: Type `::Integer` does not have method `foo`
     code: Ruby::NoMethod
+- file: proc_type_expected.rb
+  diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 4
+      end:
+        line: 1
+        character: 10
+    severity: ERROR
+    message: Proc type is expected but `::Integer` is specified
+    code: Ruby::ProcTypeExpected
 - file: required_block_missing.rb
   diagnostics:
   - range:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.49.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -356,6 +356,7 @@ files:
 - smoke/diagnostics/method_return_type_annotation_mismatch.rb
 - smoke/diagnostics/missing_keyword.rb
 - smoke/diagnostics/no_method.rb
+- smoke/diagnostics/proc_type_expected.rb
 - smoke/diagnostics/required_block_missing.rb
 - smoke/diagnostics/return_type_mismatch.rb
 - smoke/diagnostics/test_expectations.yml