steep 0.43.0 → 0.45.0

data/lib/steep/typing.rb

@@ -102,13 +102,20 @@ module Steep
     end
 
     def block_range(node)
-      send_node, args_node, _ = node.children
-      begin_pos = if send_node.type != :lambda && args_node.loc.expression
-                    args_node.loc.expression.end_pos
-                  else
-                    node.loc.begin.end_pos
-                  end
-      end_pos = node.loc.end.begin_pos
+      case node.type
+      when :block
+        send_node, args_node, _ = node.children
+        begin_pos = if send_node.type != :lambda && args_node.loc.expression
+                      args_node.loc.expression.end_pos
+                    else
+                      node.loc.begin.end_pos
+                    end
+        end_pos = node.loc.end.begin_pos
+      when :numblock
+        send_node, _ = node.children
+        begin_pos = node.loc.begin.end_pos
+        end_pos = node.loc.end.begin_pos
+      end
 
       begin_pos..end_pos
     end
@@ -139,21 +146,39 @@ module Steep
         add_context(begin_pos..end_pos, context: context)
 
       when :def, :defs
-        args_node = case node.type
-                    when :def
-                      node.children[1]
-                    when :defs
-                      node.children[2]
-                    end
-        body_begin_pos = if args_node.loc.expression
-                           args_node.loc.expression.end_pos
-                         else
-                           node.loc.name.end_pos
-                         end
-        body_end_pos = node.loc.end.begin_pos
-        add_context(body_begin_pos..body_end_pos, context: context)
+        if node.children.last
+          args_node =
+            case node.type
+            when :def
+              node.children[1]
+            when :defs
+              node.children[2]
+            end
+
+          body_begin_pos =
+            case
+            when node.loc.assignment
+              # endless def
+              node.loc.assignment.end_pos
+            when args_node.loc.expression
+              # with args
+              args_node.loc.expression.end_pos
+            else
+              # without args
+              node.loc.name.end_pos
+            end
+
+          body_end_pos =
+            if node.loc.end
+              node.loc.end.begin_pos
+            else
+              node.loc.expression.end_pos
+            end
+
+          add_context(body_begin_pos..body_end_pos, context: context)
+        end
 
-      when :block
+      when :block, :numblock
         range = block_range(node)
         add_context(range, context: context)
 

data/lib/steep/version.rb

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

data/sig/steep/type_inference/send_args.rbs

@@ -0,0 +1,42 @@
+module Steep
+  type node = untyped
+
+  module TypeInference
+    class SendArgs
+      class PositionalArgs
+      end
+
+      class KeywordArgs
+        type value = ArgTypePairs | UnexpectedKeyword | MissingKeyword
+
+        class ArgTypePairs
+        end
+
+        class UnexpectedKeyword
+        end
+
+        class MissingKeyword
+        end
+
+        def consume: () -> [value, self]?
+
+        def consume_keys: (Array[Symbol], node: node) -> [AST::Types::t | UnexpectedKeyword, self]
+      end
+
+
+      type error = Diagnostics::Ruby::IncompatibleArguments
+                 | Diagnostics::Ruby::UnexpectedBlockGiven
+                 | Diagnostics::Ruby::RequiredBlockMissing
+
+      type arg = PositionalArgs::NodeParamPair
+               | PositionalArgs::NodeTypePair
+               | PositionalArgs::SplatArg
+               | PositionalArgs::UnexpectedArg
+               | KeywordArgs::ArgTypePairs
+               | KeywordArgs::SplatArg
+               | KeywordArgs::UnexpectedKeyword
+
+      def each_arg: (TypeConstruction) { (arg, TypeConstruction) -> TypeConstruction } -> Array[error]
+    end
+  end
+end

data/smoke/array/test_expectations.yml

@@ -16,9 +16,9 @@
                | (::int, ::int, ::Integer) -> ::Integer
                | (::int, ::int, ::Array[::Integer]) -> ::Array[::Integer]
                | (::int, ::int, nil) -> nil
-               | (::Range[::Integer], ::Integer) -> ::Integer
-               | (::Range[::Integer], ::Array[::Integer]) -> ::Array[::Integer]
-               | (::Range[::Integer], nil) -> nil
+               | (::Range[(::Integer | nil)], ::Integer) -> ::Integer
+               | (::Range[(::Integer | nil)], ::Array[::Integer]) -> ::Array[::Integer]
+               | (::Range[(::Integer | nil)], nil) -> nil
     code: Ruby::UnresolvedOverloading
   - range:
       start:

data/smoke/block/c.rb

@@ -7,4 +7,3 @@ end
 
 OptionalBlock.new.optional_block()
 OptionalBlock.new.optional_block() { :foo }
-

data/smoke/class/test_expectations.yml

@@ -4,20 +4,20 @@
   - range:
       start:
         line: 8
-        character: 9
+        character: 10
       end:
         line: 8
-        character: 12
+        character: 11
     severity: ERROR
-    message: Method parameters are incompatible with declaration `() -> ::String`
-    code: Ruby::MethodArityMismatch
+    message: The method parameter is incompatible with the declaration `() -> ::String`
+    code: Ruby::MethodParameterMismatch
   - range:
       start:
         line: 13
-        character: 2
+        character: 6
       end:
-        line: 15
-        character: 5
+        line: 13
+        character: 10
     severity: ERROR
     message: |-
       Cannot allow method body have type `::Integer` because declared as type `::String`
@@ -29,10 +29,10 @@
   - range:
       start:
         line: 22
-        character: 2
+        character: 11
       end:
-        line: 24
-        character: 5
+        line: 22
+        character: 14
     severity: ERROR
     message: |-
       Cannot allow method body have type `::String` because declared as type `::Integer`
@@ -113,8 +113,5 @@
         line: 10
         character: 11
     severity: ERROR
-    message: |-
-      Cannot find method `initialize` of type `::IncompatibleChild` with compatible arity
-      Method types:
-        def initialize: (name: ::String) -> untyped
-    code: Ruby::IncompatibleArguments
+    message: 'More keyword arguments are required: name'
+    code: Ruby::InsufficientKeywordArguments

data/smoke/const/test_expectations.yml

@@ -26,16 +26,6 @@
     severity: ERROR
     message: Cannot detect the type of the expression
     code: Ruby::FallbackAny
-  - range:
-      start:
-        line: 8
-        character: 7
-      end:
-        line: 8
-        character: 8
-    severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
   - range:
       start:
         line: 14

data/smoke/diagnostics-rbs/mixin-class-error.rbs

@@ -0,0 +1,6 @@
+class Foo
+end
+
+class Bar
+  include Foo
+end

data/smoke/diagnostics-rbs/test_expectations.yml

@@ -229,3 +229,15 @@
     severity: ERROR
     message: Cannot find type `ZZZ`
     code: RBS::UnknownTypeName
+- file: mixin-class-error.rbs
+  diagnostics:
+  - range:
+      start:
+        line: 5
+        character: 2
+      end:
+        line: 5
+        character: 13
+    severity: ERROR
+    message: Cannot include a class `::Foo` in the definition of `::Bar`
+    code: RBS::MixinClassError

data/smoke/diagnostics-ruby-unsat/Steepfile

@@ -0,0 +1,5 @@
+target :test do
+  typing_options :strict
+  check "*.rb"
+  signature "*.rbs"
+end

data/smoke/diagnostics-ruby-unsat/a.rbs

@@ -0,0 +1,3 @@
+class UnsatisfiableConstraint
+  def foo: [A, B] (A) { (A) -> void } -> B
+end

data/smoke/diagnostics-ruby-unsat/test_expectations.yml

@@ -0,0 +1,27 @@
+---
+- file: unsatisfiable_constraint.rb
+  diagnostics:
+  - range:
+      start:
+        line: 3
+        character: 0
+      end:
+        line: 6
+        character: 3
+    severity: ERROR
+    message: |-
+      Unsatisfiable constraint `::Array[untyped] <: A(2) <: ::String` is generated through (A(2)) { (A(2)) -> void } -> B(3)
+        ::Array[untyped] <: ::String
+          ::Object <: ::String
+            ::BasicObject <: ::String
+    code: Ruby::UnsatisfiableConstraint
+  - range:
+      start:
+        line: 5
+        character: 4
+      end:
+        line: 5
+        character: 7
+    severity: ERROR
+    message: Type `::String` does not have method `foo`
+    code: Ruby::NoMethod

data/smoke/{diagnostics → diagnostics-ruby-unsat}/unsatisfiable_constraint.rb

@@ -1,4 +1,3 @@
-
 test = UnsatisfiableConstraint.new
 
 test.foo([]) do |x|

data/smoke/diagnostics/a.rbs

@@ -13,10 +13,6 @@ end
 class UnknownConstantAssigned
 end
 
-class UnsatisfiableConstraint
-  def foo: [A, B] (A) { (A) -> void } -> B
-end
-
 class UnexpectedKeyword
   def foo: (foo: Integer) -> void
 end

data/smoke/diagnostics/different_method_parameter_kind.rb

@@ -0,0 +1,9 @@
+class DifferentMethodParameterKind
+  # @type method foo: (Integer, String) -> void
+  def foo(a = 0, *b)
+  end
+
+  # @type method bar: (name: String, size: Integer) -> void
+  def bar(name: "foo", **rest)
+  end
+end

data/smoke/diagnostics/method_arity_mismatch.rb

@@ -1,6 +1,6 @@
 class MethodArityMismatch
-  # @type method foo: () -> void
-  def foo(x)
+  # @type method foo: (name: String) -> void
+  def foo()
 
   end
 

data/smoke/diagnostics/method_parameter_mismatch.rb

@@ -0,0 +1,10 @@
+class MethodParameterMismatch
+  # @type method foo: (?String, *Integer) -> void
+  def foo(a, b)
+  end
+
+  # @type method bar: (?name: String) -> void
+  def self.bar(name:)
+
+  end
+end

data/smoke/diagnostics/test_expectations.yml

@@ -63,6 +63,52 @@
           ::Object <: ::Integer
             ::BasicObject <: ::Integer
     code: Ruby::BreakTypeMismatch
+- file: different_method_parameter_kind.rb
+  diagnostics:
+  - range:
+      start:
+        line: 3
+        character: 10
+      end:
+        line: 3
+        character: 15
+    severity: ERROR
+    message: The method parameter has different kind from the declaration `(::Integer,
+      ::String) -> void`
+    code: Ruby::DifferentMethodParameterKind
+  - range:
+      start:
+        line: 3
+        character: 17
+      end:
+        line: 3
+        character: 19
+    severity: ERROR
+    message: The method parameter has different kind from the declaration `(::Integer,
+      ::String) -> void`
+    code: Ruby::DifferentMethodParameterKind
+  - range:
+      start:
+        line: 7
+        character: 10
+      end:
+        line: 7
+        character: 21
+    severity: ERROR
+    message: 'The method parameter has different kind from the declaration `(size:
+      ::Integer, name: ::String) -> void`'
+    code: Ruby::DifferentMethodParameterKind
+  - range:
+      start:
+        line: 7
+        character: 23
+      end:
+        line: 7
+        character: 29
+    severity: ERROR
+    message: 'The method parameter has different kind from the declaration `(size:
+      ::Integer, name: ::String) -> void`'
+    code: Ruby::DifferentMethodParameterKind
 - file: else_on_exhaustive_case.rb
   diagnostics:
   - range:
@@ -96,16 +142,23 @@
   - range:
       start:
         line: 1
-        character: 6
+        character: 11
       end:
         line: 1
-        character: 8
+        character: 12
     severity: ERROR
-    message: |-
-      Cannot find method `at` of type `::Array[::Integer]` with compatible arity
-      Method types:
-        def at: (::int) -> (::Integer | nil)
-    code: Ruby::IncompatibleArguments
+    message: Unexpected positional argument
+    code: Ruby::UnexpectedPositionalArgument
+  - range:
+      start:
+        line: 1
+        character: 13
+      end:
+        line: 1
+        character: 14
+    severity: ERROR
+    message: Unexpected positional argument
+    code: Ruby::UnexpectedPositionalArgument
 - file: incompatible_assignment.rb
   diagnostics:
   - range:
@@ -160,9 +213,10 @@
         character: 9
       end:
         line: 3
-        character: 12
+        character: 11
     severity: ERROR
-    message: Method parameters are incompatible with declaration `() -> void`
+    message: 'Method parameters are incompatible with declaration `(name: ::String)
+      -> void`'
     code: Ruby::MethodArityMismatch
   - range:
       start:
@@ -179,10 +233,10 @@
   - range:
       start:
         line: 3
-        character: 2
+        character: 6
       end:
-        line: 5
-        character: 5
+        line: 3
+        character: 9
     severity: ERROR
     message: |-
       Cannot allow method body have type `::String` because declared as type `::Integer`
@@ -202,6 +256,41 @@
     severity: ERROR
     message: Cannot find implementation of method `::MethodDefinitionMissing#foo`
     code: Ruby::MethodDefinitionMissing
+- file: method_parameter_mismatch.rb
+  diagnostics:
+  - range:
+      start:
+        line: 3
+        character: 10
+      end:
+        line: 3
+        character: 11
+    severity: ERROR
+    message: The method parameter is incompatible with the declaration `(?::String,
+      *::Integer) -> void`
+    code: Ruby::MethodParameterMismatch
+  - range:
+      start:
+        line: 3
+        character: 13
+      end:
+        line: 3
+        character: 14
+    severity: ERROR
+    message: The method parameter is incompatible with the declaration `(?::String,
+      *::Integer) -> void`
+    code: Ruby::MethodParameterMismatch
+  - range:
+      start:
+        line: 7
+        character: 15
+      end:
+        line: 7
+        character: 20
+    severity: ERROR
+    message: 'The method parameter is incompatible with the declaration `(?name: ::String)
+      -> void`'
+    code: Ruby::MethodParameterMismatch
 - file: method_return_type_annotation_mismatch.rb
   diagnostics:
   - range:
@@ -224,13 +313,13 @@
   - range:
       start:
         line: 1
-        character: 23
+        character: 19
       end:
         line: 1
         character: 32
     severity: ERROR
-    message: 'Cannot omit required keywords: `foo`'
-    code: Ruby::MissingKeyword
+    message: 'More keyword arguments are required: foo'
+    code: Ruby::InsufficientKeywordArguments
 - file: no_method.rb
   diagnostics:
   - range:
@@ -335,25 +424,13 @@
   - range:
       start:
         line: 1
-        character: 26
-      end:
-        line: 1
-        character: 45
-    severity: ERROR
-    message: 'Cannot specify unexpected keyword arguments: `bar`'
-    code: Ruby::UnexpectedKeyword
-- file: unexpected_splat.rb
-  diagnostics:
-  - range:
-      start:
-        line: 1
-        character: 13
+        character: 36
       end:
         line: 1
-        character: 18
+        character: 39
     severity: ERROR
-    message: Hash splat is given with object other than `Hash[X, Y]`
-    code: Ruby::UnexpectedSplat
+    message: Unexpected keyword argument
+    code: Ruby::UnexpectedKeywordArgument
 - file: unexpected_yield.rb
   diagnostics:
   - range:
@@ -436,32 +513,6 @@
              | (::Rational) -> ::Rational
              | (::Complex) -> ::Complex
     code: Ruby::UnresolvedOverloading
-- file: unsatisfiable_constraint.rb
-  diagnostics:
-  - range:
-      start:
-        line: 4
-        character: 0
-      end:
-        line: 7
-        character: 3
-    severity: ERROR
-    message: |-
-      Unsatisfiable constraint `::Array[untyped] <: A(1) <: ::String` is generated through (A(1)) { (A(1)) -> void } -> B(2)
-        ::Array[untyped] <: ::String
-          ::Object <: ::String
-            ::BasicObject <: ::String
-    code: Ruby::UnsatisfiableConstraint
-  - range:
-      start:
-        line: 6
-        character: 4
-      end:
-        line: 6
-        character: 7
-    severity: ERROR
-    message: Type `::String` does not have method `foo`
-    code: Ruby::NoMethod
 - file: unsupported_syntax.rb
   diagnostics:
   - range: