steep 0.44.1 → 0.47.1

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.44.1"
+  VERSION = "0.47.1"
 end

data/lib/steep.rb

@@ -1,11 +1,11 @@
 require "steep/version"
 
 require "pathname"
-require "parser/ruby27"
+require "parser/ruby30"
+require "active_support"
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/string/inflections"
 require "logger"
-require "active_support/tagged_logging"
 require "rainbow"
 require "listen"
 require 'language_server-protocol'
@@ -21,6 +21,7 @@ require "terminal-table"
 
 require "rbs"
 
+require "steep/equatable"
 require "steep/method_name"
 require "steep/ast/types/helper"
 require "steep/ast/types/any"
@@ -77,6 +78,7 @@ require "steep/type_inference/context"
 require "steep/type_inference/context_array"
 require "steep/type_inference/send_args"
 require "steep/type_inference/block_params"
+require "steep/type_inference/method_params"
 require "steep/type_inference/constant_env"
 require "steep/type_inference/type_env"
 require "steep/type_inference/local_variable_type_env"
@@ -211,7 +213,7 @@ module Steep
     end
 
     def percentile(p)
-      slowests(count - count * p / 100r).last&.last || 0
+      slowests([count * p / 100r, 1].max).last&.last || 0
     end
   end
 

data/sample/Steepfile

@@ -1,6 +1,13 @@
-target :app do
-  check "lib"
+D = Steep::Diagnostic
+
+target :lib do
   signature "sig"
 
-  library "set", "pathname"
+  check "lib"                       # Directory name
+
+  # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
+  # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
+  # configure_code_diagnostics do |hash|             # You can setup everything yourself
+  #   hash[D::Ruby::NoMethod] = :information
+  # end
 end

data/smoke/alias/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/and/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/array/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 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/Steepfile

@@ -1,6 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
-end
 
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
+end

data/smoke/block/c.rb

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

data/smoke/case/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/class/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

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/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/diagnostics/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 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 `(name:
+      ::String, size: ::Integer) -> 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 `(name:
+      ::String, size: ::Integer) -> 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:

data/smoke/diagnostics-rbs/Steepfile

@@ -2,7 +2,7 @@ all_sigs = Pathname.glob("*.rbs")
 
 all_sigs.each do |path|
   target path.basename(".rbs").to_s.to_sym do
-    typing_options :strict
     signature path.to_s
+    configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
   end
 end

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-rbs-duplicated/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/diagnostics-ruby-unsat/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/dstr/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/ensure/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/ensure/test_expectations.yml

@@ -32,10 +32,10 @@
   - range:
       start:
         line: 13
-        character: 0
+        character: 4
       end:
-        line: 18
-        character: 3
+        line: 13
+        character: 7
     severity: ERROR
     message: |-
       Cannot allow method body have type `::Integer` because declared as type `::String`

data/smoke/enumerator/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/enumerator/test_expectations.yml

@@ -102,7 +102,7 @@
       Cannot find compatible overloading of method `with_object` of type `::Enumerator[::Integer, ::Array[::Integer]]`
       Method types:
         def with_object: [U] (U) { (::Integer, U) -> untyped } -> U
-                       | [U] (U) -> ::Enumerator[[::Integer, U], ::Array[::Integer]]
+                       | [U] (U) -> ::Enumerator[[::Integer, U], U]
     code: Ruby::UnresolvedOverloading
   - range:
       start:

data/smoke/extension/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/extension/e.rbs

@@ -3,5 +3,5 @@ class NumberLike
 end
 
 class Integer
-  overload def `+`: (NumberLike) -> NumberLike
+  def `+`: (NumberLike) -> NumberLike | ...
 end

data/smoke/hash/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/hello/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end

data/smoke/if/Steepfile

@@ -1,5 +1,6 @@
 target :test do
-  typing_options :strict
   check "*.rb"
   signature "*.rbs"
+
+  configure_code_diagnostics(Steep::Diagnostic::Ruby.all_error)
 end